Skip to content

Commit

Permalink
use java 17 on github actions
Browse files Browse the repository at this point in the history
update kotlin
update modmenu
  • Loading branch information
deirn committed Nov 30, 2021
1 parent 94ec108 commit 27e9109
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_head.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -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}")

Expand Down Expand Up @@ -86,7 +86,7 @@ allprojects {

tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
options.release.set(16)
options.release.set(17)
}

java {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion gradle/kotlin.gradle
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 27e9109

Please sign in to comment.