Skip to content

Commit de2aad1

Browse files
chore: Make launchy compile on Java 21, and upgrade Fabric Installer (#73)
* chore: Make launchy compile on Java21 * chore: remove version.json * feat: Use Fabric Installer 1.0.1
1 parent a304ab3 commit de2aad1

File tree

11 files changed

+228
-154
lines changed

11 files changed

+228
-154
lines changed

.github/workflows/publish-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
changelog: ${{ steps.changelog.outputs.changelog }}
2020
release_id: ${{ steps.release.outputs.id }}
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
2525
token: ${{ secrets.PRIVATE_TOKEN }}
@@ -78,11 +78,11 @@ jobs:
7878
with:
7979
name: version
8080

81-
- name: Set up JDK 16
81+
- name: Set up JDK 21
8282
uses: actions/setup-java@v4
8383
with:
8484
distribution: temurin
85-
java-version: 16
85+
java-version: 21
8686
cache: gradle
8787

8888
- name: Install FUSE (ubuntu)

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@ releases
2121
node_modules
2222
package-lock.json
2323
package.json
24+
25+
version.json

build.gradle.kts

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
import Com_mineinabyss_conventions_platform_gradle.Deps
21
import de.undercouch.gradle.tasks.download.Download
3-
import org.codehaus.plexus.util.Os
4-
import org.jetbrains.compose.compose
2+
import org.apache.tools.ant.taskdefs.condition.Os
53
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
64
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
75

86
plugins {
9-
id("com.mineinabyss.conventions.kotlin")
10-
id("org.jetbrains.compose") version "1.1.1"
7+
kotlin("jvm")
118
kotlin("plugin.serialization")
9+
id("org.jetbrains.compose") version "1.5.11"
10+
id("de.undercouch.download") version "5.6.0"
1211
}
1312

1413
repositories {
@@ -28,18 +27,17 @@ dependencies {
2827
implementation(compose.material3)
2928
implementation(compose.material)
3029
implementation(compose.materialIconsExtended)
31-
implementation(Deps.kotlinx.serialization.json)
32-
implementation(Deps.kotlinx.serialization.kaml)
30+
implementation(libs.kotlinx.serialization.json)
31+
implementation(libs.kotlinx.serialization.kaml)
3332
implementation("io.ktor:ktor-client-core:1.6.8")
3433
implementation("io.ktor:ktor-client-cio:1.6.8")
3534

3635
implementation("org.json:json:20210307")
37-
implementation("net.fabricmc:fabric-installer:0.9.0")
36+
implementation("net.fabricmc:fabric-installer:1.0.1")
3837
implementation("edu.stanford.ejalbert:BrowserLauncher2:1.3")
3938
}
4039

4140
tasks.withType<KotlinCompile> {
42-
kotlinOptions.jvmTarget = "1.8"
4341
kotlinOptions.freeCompilerArgs = listOf(
4442
"-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
4543
"-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
group=com.wynntils
22
version=1.5.0
3-
idofrontConventions=1.6.10-51
4-
kotlinVersion=1.6.10
3+
idofrontVersion=0.20.14
4+
kotlinVersion=1.9.20

gradle/wrapper/gradle-wrapper.jar

-15.7 KB
Binary file not shown.
+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)