From 0db1e5e168d65d71519b0e97037caf20e95dca9f Mon Sep 17 00:00:00 2001 From: jorgeberrex Date: Sun, 14 Jul 2024 01:13:11 -0500 Subject: [PATCH] Upgrade to java 17, gradle 7.6 --- .github/workflows/build.yml | 8 +++++--- build.gradle.kts | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99263b6..3728964 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,10 +7,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 8 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: '1.8' + java-version: '17' + distribution: temurin + cache: gradle - name: Build with Gradle uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021 with: diff --git a/build.gradle.kts b/build.gradle.kts index a19dc7e..ff1e43d 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,8 +2,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.4.31" - kotlin("plugin.serialization") version "1.5.20" + kotlin("jvm") version "1.6.21" + kotlin("plugin.serialization") version "1.6.21" id("com.github.johnrengelman.shadow") version "6.1.0" id("me.qoomon.git-versioning") version "5.1.1" @@ -113,7 +113,7 @@ tasks.withType { } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" } tasks.withType { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 12d38de..070cb70 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-6.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists