Skip to content

Commit

Permalink
chore: Make launchy compile on Java 21, and upgrade Fabric Installer (#…
Browse files Browse the repository at this point in the history
…73)

* chore: Make launchy compile on Java21

* chore: remove version.json

* feat: Use Fabric Installer 1.0.1
  • Loading branch information
kristofbolyai authored Aug 5, 2024
1 parent a304ab3 commit de2aad1
Show file tree
Hide file tree
Showing 11 changed files with 228 additions and 154 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
changelog: ${{ steps.changelog.outputs.changelog }}
release_id: ${{ steps.release.outputs.id }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.PRIVATE_TOKEN }}
Expand Down Expand Up @@ -78,11 +78,11 @@ jobs:
with:
name: version

- name: Set up JDK 16
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 16
java-version: 21
cache: gradle

- name: Install FUSE (ubuntu)
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ releases
node_modules
package-lock.json
package.json

version.json
16 changes: 7 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import Com_mineinabyss_conventions_platform_gradle.Deps
import de.undercouch.gradle.tasks.download.Download
import org.codehaus.plexus.util.Os
import org.jetbrains.compose.compose
import org.apache.tools.ant.taskdefs.condition.Os
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("com.mineinabyss.conventions.kotlin")
id("org.jetbrains.compose") version "1.1.1"
kotlin("jvm")
kotlin("plugin.serialization")
id("org.jetbrains.compose") version "1.5.11"
id("de.undercouch.download") version "5.6.0"
}

repositories {
Expand All @@ -28,18 +27,17 @@ dependencies {
implementation(compose.material3)
implementation(compose.material)
implementation(compose.materialIconsExtended)
implementation(Deps.kotlinx.serialization.json)
implementation(Deps.kotlinx.serialization.kaml)
implementation(libs.kotlinx.serialization.json)
implementation(libs.kotlinx.serialization.kaml)
implementation("io.ktor:ktor-client-core:1.6.8")
implementation("io.ktor:ktor-client-cio:1.6.8")

implementation("org.json:json:20210307")
implementation("net.fabricmc:fabric-installer:0.9.0")
implementation("net.fabricmc:fabric-installer:1.0.1")
implementation("edu.stanford.ejalbert:BrowserLauncher2:1.3")
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.freeCompilerArgs = listOf(
"-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
"-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
group=com.wynntils
version=1.5.0
idofrontConventions=1.6.10-51
kotlinVersion=1.6.10
idofrontVersion=0.20.14
kotlinVersion=1.9.20
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit de2aad1

Please sign in to comment.