From 99e09953a36372eff59117176c3981ff94fde282 Mon Sep 17 00:00:00 2001 From: xzxADIxzx Date: Wed, 3 Jan 2024 18:29:06 +0300 Subject: [PATCH] update java, mindustry and javel versions --- .github/workflows/gradle.yml | 4 ++-- build.gradle | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index b37358b..331586c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -11,10 +11,10 @@ jobs: - name: Set up PATH run: | echo "${ANDROID_HOME}/build-tools/30.0.1" >> $GITHUB_PATH - - name: Set up JDK 17 + - name: Set up JDK 20 uses: actions/setup-java@v1 with: - java-version: 17 + java-version: 20 - name: Change permissions run: chmod +x ./gradlew - name: Build mod jar diff --git a/build.gradle b/build.gradle index f720736..fb4af7a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'java' version '1.0' targetCompatibility = 8 -sourceCompatibility = JavaVersion.VERSION_16 +sourceCompatibility = JavaVersion.VERSION_20 sourceSets.main { java.srcDirs = ['src/java'] @@ -16,8 +16,8 @@ repositories { } ext { - mindustryVersion = 'v145' - jabelVersion = '0.4.2' + mindustryVersion = 'v146' + jabelVersion = '1.0.1' sdkRoot = System.getenv('ANDROID_HOME') ?: System.getenv('ANDROID_SDK_ROOT') } @@ -31,8 +31,8 @@ dependencies { compileOnly "com.github.Anuken.Arc:arc-core:$mindustryVersion" compileOnly "com.github.Anuken.Mindustry:core:$mindustryVersion" - compileOnly "com.github.bsideup.jabel:jabel-javac-plugin:$jabelVersion" - annotationProcessor "com.github.bsideup.jabel:jabel-javac-plugin:$jabelVersion" + compileOnly "com.github.bsideup:jabel:$jabelVersion" + annotationProcessor "com.github.bsideup:jabel:$jabelVersion" } jar { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2d2fd7c..20cd5a1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file