diff --git a/.github/workflows/build_head.yml b/.github/workflows/build_head.yml index 7ef801f..df2cc6d 100644 --- a/.github/workflows/build_head.yml +++ b/.github/workflows/build_head.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: 16 + java-version: 17 - run: chmod +x gradlew - uses: actions/cache@v2 with: diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 7d91955..dbd6edd 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: 16 + java-version: 17 - run: chmod +x gradlew - uses: actions/cache@v2 with: diff --git a/build.gradle b/build.gradle index a0dbdc1..8160139 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ import groovy.json.JsonSlurper plugins { id 'maven-publish' id 'fabric-loom' version '0.10.+' apply false - id "org.jetbrains.kotlin.jvm" version "1.5.32" apply false + id "org.jetbrains.kotlin.jvm" version "1.6.0" apply false id "com.matthewprenger.cursegradle" version "1.4.0" } @@ -19,8 +19,8 @@ allprojects { apply plugin: 'maven-publish' apply plugin: 'fabric-loom' - sourceCompatibility = JavaVersion.VERSION_16 - targetCompatibility = JavaVersion.VERSION_16 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 buildDir = rootProject.file("build/${name}") @@ -86,7 +86,7 @@ allprojects { tasks.withType(JavaCompile) { options.encoding = "UTF-8" - options.release.set(16) + options.release.set(17) } java { diff --git a/gradle.properties b/gradle.properties index ead660a..f836425 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,8 +10,8 @@ archivesBaseName = megane # Dependencies wthit = 4.1.2 -modmenu = 2.0.2 -fabricKotlin = 1.6.1+kotlin.1.5.10 +modmenu = 3.0.0 +fabricKotlin = 1.7.0+kotlin.1.6.0 curseforgeDeps = \ kibe \ diff --git a/gradle/kotlin.gradle b/gradle/kotlin.gradle index dd32502..f4e3edd 100644 --- a/gradle/kotlin.gradle +++ b/gradle/kotlin.gradle @@ -1,6 +1,6 @@ apply plugin: "org.jetbrains.kotlin.jvm" -compileKotlin.kotlinOptions.jvmTarget = "16" +compileKotlin.kotlinOptions.jvmTarget = "17" sourceSets { main.kotlin.srcDirs += "../src/${name}/kotlin"