Fix launcher Java detection

.github/workflows/release.yml

@@ -1,15 +1,19 @@
 name: Release
-on: [workflow_dispatch] # Manual trigger
+on: [ workflow_dispatch ] # Manual trigger
 jobs:
   buildJava:
-    runs-on: ubuntu-20.04
-    container:
-      image: openjdk:17-jdk
-      options: --user root
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew build publish --stacktrace
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'microsoft'
+          java-version: 17
+          cache: 'gradle'
+      - uses: gradle/actions/wrapper-validation@v3
+      - name: Grant execute permission for Gradle wrapper
+        run: chmod +x ./gradlew
+      - run: ./gradlew assemble publish --stacktrace
         env:
           MAVEN_URL: ${{ secrets.NEW_MAVEN_URL }}
           MAVEN_USERNAME: ${{ secrets.NEW_MAVEN_USERNAME }}
@@ -24,21 +28,22 @@ jobs:
     strategy:
       matrix:
         target: [ x86_64, i686, aarch64 ]
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       # TODO: Fix macOS in future
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: rustup target add ${{ matrix.target }}-pc-windows-msvc
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'microsoft'
           java-version: '17'
-      - uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew build copyForNative
+          cache: 'gradle'
+      - uses: gradle/actions/wrapper-validation@v3
+      - run: ./gradlew assemble copyForNative
       - name: Run Cargo
         run: cargo build --release --target ${{ matrix.target }}-pc-windows-msvc
         working-directory: ./native
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: Artifacts ${{ matrix.target }}
           path: target/${{ matrix.target }}-pc-windows-msvc/release/quilt-installer.exe

.github/workflows/test.yml

@@ -1,31 +1,34 @@
 name: Test
-on: [push, pull_request]
+on: [ push, pull_request ]
 jobs:
   build:
-    strategy:
-      matrix:
-        java: [17-jdk]
-    runs-on: ubuntu-20.04
-    container:
-      image: openjdk:${{ matrix.java }}
-      options: --user root
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew build test --stacktrace
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'microsoft'
+          java-version: 17
+          cache: 'gradle'
+      - uses: gradle/actions/wrapper-validation@v3
+      - name: Grant execute permission for Gradle wrapper
+        run: chmod +x ./gradlew
+      - run: ./gradlew build --stacktrace
+
   buildNatives:
     strategy:
       matrix:
         target: [ x86_64, i686, aarch64 ]
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       # TODO: Fix macOS in future
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: '17'
-      - uses: gradle/wrapper-validation-action@v1
+          distribution: 'microsoft'
+          java-version: 17
+          cache: 'gradle'
+      - uses: gradle/actions/wrapper-validation@v3
       - run: ./gradlew build copyForNative --stacktrace
       - run: rustup target add ${{ matrix.target }}-pc-windows-msvc
       - name: Run Cargo

CHANGELOG.md

@@ -0,0 +1,3 @@
+# 0.9.2
+
+- Fix download URLs for Java 21 runtime

build.gradle.kts

@@ -18,7 +18,10 @@ version = if (env["SNAPSHOTS_URL"] != null) {
 } else {
 	"0.10.2"
 }
-base.archivesBaseName = project.name
+
+base {
+	archivesName.set(project.name)
+}
 
 repositories {
 	mavenCentral()
@@ -28,6 +31,10 @@ repositories {
 	}
 }
 
+sourceSets {
+	create("java8")
+}
+
 dependencies {
 	implementation("org.quiltmc.parsers:json:0.2.1")
 	compileOnly("org.jetbrains:annotations:20.1.0")
@@ -46,9 +53,11 @@ blossom {
 }
 
 tasks.compileJava {
-	if (JavaVersion.current().isJava9Compatible) {
-		options.release.set(17)
-	}
+	options.release.set(17)
+}
+
+tasks.getByName("compileJava8Java", JavaCompile::class) {
+	options.release.set(8)
 }
 java {
 	toolchain {
@@ -61,24 +70,28 @@ java {
 //	mainClass.set("org.quiltmc.installer.Main")
 //}
 
+tasks.jar.get().dependsOn(tasks["compileJava8Java"])
 tasks.jar {
 	manifest {
 		attributes["Implementation-Title"] = "Ornithe-Installer"
 		attributes["Implementation-Version"] = project.version
+		attributes["Multi-Release"] = true
+
 		attributes["Main-Class"] = "org.quiltmc.installer.Main"
 	}
 }
 
 tasks.shadowJar {
 	relocate("org.quiltmc.parsers.json", "org.quiltmc.installer.lib.parsers.json")
-	minimize()
+//	minimize()
 
 	// Compiler does not know which set method we are targeting with null value
 	val classifier: String? = null;
 	archiveClassifier.set(classifier)
+	from(sourceSets["java8"].output)
 }
 
-tasks.build {
+tasks.assemble {
 	dependsOn(tasks.shadowJar)
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists