v3.0.5

optyfr · Aug 15, 2024 · c240591 · c240591
1 parent 6835126
commit c240591
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 40 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '21.0.3'
+        java-version: '21.0.4'
 
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
@@ -62,8 +62,6 @@ jobs:
 
     - name: JPackage RPM with Gradle
       run: ./gradlew jpackage -PtargetPlatform=linux-x64 -PinstallerType=rpm
-      env:
-        JAVA_OPTS: -Dbadass.jlink.jpackage.home=${{env.JDK14}}
 
     - name: Releasing RPM
       uses: ncipollo/release-action@v1
@@ -147,7 +145,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '21.0.3'
+        java-version: '21.0.4'
 
     - name: JPackage MSI with Gradle
       run: ./gradlew build jpackage -PtargetPlatform=win -PinstallerType=msi
@@ -176,11 +174,11 @@ jobs:
         replacesArtifacts: true
         token: ${{ secrets.GITHUB_TOKEN }}
 
-  build_macos:
+  build_macos_x64:
     env:
       beta: ${{contains(github.ref, 'beta')}}
     needs: build_windows
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
 
     - id: get_version
@@ -193,15 +191,13 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '21.0.3'
+        java-version: '21.0.4'
 
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 
     - name: JPackage DMG with Gradle
       run: ./gradlew jpackage -PtargetPlatform=macos-x64 -PinstallerType=dmg
-      env:
-        JAVA_OPTS: -Dbadass.jlink.jpackage.home=${{env.JDK14}}
 
     - name: Releasing DMG
       uses: ncipollo/release-action@v1
@@ -215,3 +211,41 @@ jobs:
         replacesArtifacts: true
         token: ${{ secrets.GITHUB_TOKEN }}
 
+  build_macos_aarch64:
+    env:
+      beta: ${{contains(github.ref, 'beta')}}
+    needs: build_windows
+    runs-on: macos-latest
+    steps:
+
+    - id: get_version
+      uses: battila7/get-version-action@v2
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      with:
+        submodules: true
+
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '21.0.4'
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: JPackage DMG with Gradle
+      run: ./gradlew jpackage -PtargetPlatform=macos-aarch64 -PinstallerType=dmg
+
+    - name: Releasing DMG
+      uses: ncipollo/release-action@v1
+      with:
+        artifacts: "build/installer/*"
+        draft: false
+        prerelease: ${{ env.beta }}
+        allowUpdates: true
+        omitBodyDuringUpdate: true
+        omitNameDuringUpdate: true
+        replacesArtifacts: true
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 ### Fixed
 
+## [3.0.5]
+### Added/Changed
+- macos arm (aarch64) build
+
+### Fixed
+- add extra check for valid folder setting when importing dat
+- fix macos intel (x64) build
+- generate right version for assets
+
+### Changed
+- update jdk to 21.0.4+7
+
+
 ## [3.0.4]
 ### Fixed
 - nullpointer on messages with FullServer
@@ -528,8 +541,9 @@ dir but one is not present (should be green)
 Initial release
 
 
-[Unreleased]: https://github.com/optyfr/JRomManager/compare/3.0.4...HEAD
-[3.0.3]: https://github.com/optyfr/JRomManager/compare/3.0.3...3.0.4
+[Unreleased]: https://github.com/optyfr/JRomManager/compare/3.0.5...HEAD
+[3.0.5]: https://github.com/optyfr/JRomManager/compare/3.0.4...3.0.5
+[3.0.4]: https://github.com/optyfr/JRomManager/compare/3.0.3...3.0.4
 [3.0.3]: https://github.com/optyfr/JRomManager/compare/3.0.2...3.0.3
 [3.0.2]: https://github.com/optyfr/JRomManager/compare/3.0.1...3.0.2
 [3.0.1]: https://github.com/optyfr/JRomManager/compare/3.0.0...3.0.1

diff --git a/build.gradle b/build.gradle
@@ -605,8 +605,8 @@ def arch = DefaultNativePlatform.currentArchitecture
 
 distributions {
 	main {
-        distributionBaseName = 'JRomManager'
-       	distributionClassifier = 'nogui-noarch'
+	        distributionBaseName = 'JRomManager'
+	       	distributionClassifier = 'nogui-noarch'
 		contents {
 			from (configurations.noarchConfig) {
 				into('lib')
@@ -636,17 +636,17 @@ distributions {
 		}
 	}
 	win {
-        distributionBaseName = 'JRomManager'
-        if(arch.isI386())
-        	distributionClassifier = 'win-x32'
-        else if(arch.isAmd64())
-        	distributionClassifier = 'win-x64'
-        else if(arch.isArm32())
-        	distributionClassifier = 'win-arm32'
-        else if(arch.isArm64())
-        	distributionClassifier = 'win-arm64'
-        else
-        	distributionClassifier = 'win-'+arch.getName()
+	        distributionBaseName = 'JRomManager'
+	        if(arch.isI386())
+	        	distributionClassifier = 'win-x32'
+	        else if(arch.isAmd64())
+	        	distributionClassifier = 'win-x64'
+	        else if(arch.isArm32())
+	        	distributionClassifier = 'win-arm32'
+	        else if(arch.isArm64())
+	        	distributionClassifier = 'win-arm64'
+	        else
+	        	distributionClassifier = 'win-'+arch.getName()
 		contents {
 			from (configurations.jlinkConfig) {
 				into('lib')
@@ -673,17 +673,17 @@ distributions {
 		}
 	}
 	linux {
-        distributionBaseName = 'JRomManager'
-        if(arch.isI386())
-        	distributionClassifier = 'linux-x32'
-        else if(arch.isAmd64())
-        	distributionClassifier = 'linux-x64'
-        else if(arch.isArm32())
-        	distributionClassifier = 'linux-arm32'
-        else if(arch.isArm64())
-        	distributionClassifier = 'linux-arm64'
-        else
-        	distributionClassifier = 'linux-'+arch.getName()
+	        distributionBaseName = 'JRomManager'
+	        if(arch.isI386())
+	        	distributionClassifier = 'linux-x32'
+	        else if(arch.isAmd64())
+	        	distributionClassifier = 'linux-x64'
+	        else if(arch.isArm32())
+	        	distributionClassifier = 'linux-arm32'
+	        else if(arch.isArm64())
+	        	distributionClassifier = 'linux-arm64'
+	        else
+	        	distributionClassifier = 'linux-'+arch.getName()
 		contents {
 			from (configurations.jlinkConfig) {
 				into('lib')
@@ -751,6 +751,12 @@ else if (os.isWindows()) {
 	winDistZip.dependsOn extractDaemonWin
 	build.dependsOn winDistZip
 }
+else {
+	linuxDistTar.enabled = false
+	linuxDistZip.enabled = false
+	winDistZip.enabled = false
+	winDistTar.enabled = false
+}
 
 task aggregatedJavadocs(type: Javadoc, description: 'Generate javadocs from all child projects as if it was a single project', group: 'Documentation') {
 	destinationDir = file("$buildDir/docs/javadoc")
@@ -895,13 +901,16 @@ jlink {
 		args = ['--workpath','%HOMEPATH%/.jrommanager']
 	}
 	targetPlatform("win") {
-		jdkHome = jdkDownload("https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_windows_hotspot_21.0.3_9.zip")
+		jdkHome = jdkDownload("https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.4_7.zip")
 	}
 	targetPlatform("linux-x64") {
-		jdkHome = jdkDownload("https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz")
+		jdkHome = jdkDownload("https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz")
 	}
 	targetPlatform("macos-x64") {
-		jdkHome = jdkDownload("https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_mac_hotspot_21.0.3_9.tar.gz")
+		jdkHome = jdkDownload("https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_mac_hotspot_21.0.4_7.tar.gz")
+	}
+	targetPlatform("macos-aarch64") {
+		jdkHome = jdkDownload("https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.4_7.tar.gz")
 	}
 	jpackage {
 		installerType = project.findProperty('installerType') // we will pass this from the command line (example: -PinstallerType=msi)

diff --git a/changelogs/3.0.5.md b/changelogs/3.0.5.md
@@ -0,0 +1,10 @@
+### Added/Changed
+- macos arm (aarch64) build
+
+### Fixed
+- add extra check for valid folder setting when importing dat
+- fix macos intel (x64) build
+- generate right version for assets
+
+### Changed
+- update jdk to 21.0.4+7
diff --git a/dist/ver.properties b/dist/ver.properties
@@ -1,3 +1,3 @@
 Specification-Version=3.0
-Implementation-Version=0
+Implementation-Version=5
 Commons-Daemon-Version=1.3.3
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21.0.3_9-jdk
+FROM eclipse-temurin:21.0.4_7-jdk
 
 LABEL org.opencontainers.image.description "Docker image of JRomManager (with JDK 21)"
 LABEL org.opencontainers.image.source https://github.com/optyfr/JRomManager