Skip to content

Commit

Permalink
Version 0.10.
Browse files Browse the repository at this point in the history
  • Loading branch information
kreinhard committed Nov 13, 2018
1 parent 96542a3 commit 351d54c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ allprojects {
apply plugin: 'maven'

group = 'de.micromata.merlin'
version = '0.10-SNAPSHOT'
version = '0.10'
}

subprojects {
Expand Down
6 changes: 3 additions & 3 deletions merlin-desktop-installer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ Contains resources and scripts for building new releases of Merlin's desktop app
1. Create new tag, e. g. `v0.9`.
7. Upload to SourceForge
1. Publish to new Folder 0.9
1. `Install4j/Merlin/merlin_macos_v_9.dmg` (mark as default for MacOS)
2. `Install4j/Merlin/merlin_unix_0_9.sh` (mark as default for Linux)
3. `Install4j/Merlin/merlin_windows_x64_0_9.exe` (mark as default for Windows)
1. `Install4j/Merlin/merlin-macos-v_9.dmg` (mark as default for MacOS)
2. `Install4j/Merlin/merlin-unix-0_9.sh` (mark as default for Linux)
3. `Install4j/Merlin/merlin-windows-0_9.exe` (mark as default for Windows)
4. `merlin-server/build/distributions/merlin-server-0.9.zip` (mark as default for all others)
2. Testing
8. Enable update mechanism
Expand Down
4 changes: 2 additions & 2 deletions merlin-desktop-installer/merlin.install4j
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<install4j version="7.0.8" transformSequenceNumber="7">
<directoryPresets config="./resources" />
<application name="Merlin" distributionSourceDir="" applicationId="5115-4774-2533-4349" mediaDir="../../Install4j/Merlin" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="merlin" publisher="Micromata GmbH" publisherWeb="www.micromata.de" version="0.10dev" allPathsRelative="true" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" macVolumeId="4356b34315fd64b9" javaMinVersion="9" javaMaxVersion="" allowBetaVM="false" jdkMode="jdk" jdkName="JDK 1.8">
<application name="Merlin" distributionSourceDir="" applicationId="5115-4774-2533-4349" mediaDir="../../Install4j/Merlin" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="merlin" publisher="Micromata GmbH" publisherWeb="www.micromata.de" version="0.10" allPathsRelative="true" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" macVolumeId="4356b34315fd64b9" javaMinVersion="9" javaMaxVersion="" allowBetaVM="false" jdkMode="jdk" jdkName="JDK 1.8">
<languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
<principalLanguage id="en" customLocalizationFile="" />
<additionalLanguages>
Expand Down Expand Up @@ -100,7 +100,7 @@
</iconImageFiles>
</launcher>
</launchers>
<installerGui installerType="1" addOnAppId="" suggestPreviousLocations="true" autoUpdateDescriptorUrl="https://github.com/kreinhard/merlin/raw/master/merlin-desktop-installer/updates.xml" useAutoUpdateBaseUrl="true" autoUpdateBaseUrl="https://sourceforge.net/projects/merlinrunner/files/0.9/">
<installerGui installerType="1" addOnAppId="" suggestPreviousLocations="true" autoUpdateDescriptorUrl="https://github.com/kreinhard/merlin/raw/master/merlin-desktop-installer/updates.xml" useAutoUpdateBaseUrl="true" autoUpdateBaseUrl="https://sourceforge.net/projects/merlinrunner/files/0.10/">
<staticMembers script="" />
<customCode />
<autoUpdate useMinUpdatableVersion="false" minUpdatableVersion="" useMaxUpdatableVersion="false" maxUpdatableVersion="">
Expand Down
6 changes: 3 additions & 3 deletions merlin-desktop-installer/updates.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<updateDescriptor baseUrl="https://sourceforge.net/projects/merlinrunner/files/0.9/">
<entry targetMediaFileId="61" updatableVersionMin="" updatableVersionMax="" fileName="merlin_macos_0_9.dmg" newVersion="0.9" newMediaFileId="61" fileSize="69648519" md5Sum="c181cebdf6338160e48ba6105ee61e1f" bundledJre="" archive="false" singleBundle="true">
<entry targetMediaFileId="61" updatableVersionMin="" updatableVersionMax="" fileName="merlin-macos-0_10dev.dmg" newVersion="0.10dev" newMediaFileId="61" fileSize="62451847" md5Sum="30d310807da4000e4f3951cfdf1dd983" bundledJre="" archive="false" singleBundle="true">
<comment language="en" />
<comment language="de" />
</entry>
<entry targetMediaFileId="587" updatableVersionMin="" updatableVersionMax="" fileName="merlin_windows-x64_0_9.exe" newVersion="0.9" newMediaFileId="587" fileSize="76198912" md5Sum="6a17debedafb9c42468dc4fbf7155ca0" bundledJre="" archive="false" singleBundle="false">
<entry targetMediaFileId="587" updatableVersionMin="" updatableVersionMax="" fileName="merlin-windows-0_10dev.exe" newVersion="0.10dev" newMediaFileId="587" fileSize="69043728" md5Sum="c8b4476c29dcb7d2440f857edec1ce0a" bundledJre="" archive="false" singleBundle="false">
<comment language="en" />
<comment language="de" />
</entry>
<entry targetMediaFileId="715" updatableVersionMin="" updatableVersionMax="" fileName="merlin_unix_0_9.sh" newVersion="0.9" newMediaFileId="715" fileSize="78882486" md5Sum="6332aa8e4e43fc36d28ce2edaf9404ea" bundledJre="" archive="false" singleBundle="false">
<entry targetMediaFileId="715" updatableVersionMin="" updatableVersionMax="" fileName="merlin-linux-0_10dev.sh" newVersion="0.10dev" newMediaFileId="715" fileSize="71683722" md5Sum="a2c71402c0b03bf51847b2d1f0e12935" bundledJre="" archive="false" singleBundle="false">
<comment language="en" />
<comment language="de" />
</entry>
Expand Down

0 comments on commit 351d54c

Please sign in to comment.