diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index fed25e4..a424f5a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -22,10 +22,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 21 + - name: Set up JDK 22 uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '22' distribution: 'temurin' - name: Log in to Docker Hub @@ -37,7 +37,7 @@ jobs: - name: Setup Gradle for a non-wrapper project uses: gradle/actions/setup-gradle@v4 with: - gradle-version: 8.9 + gradle-version: 8.10.1 - name: Build JVM OCI image run: gradle jib @@ -48,7 +48,7 @@ jobs: DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Build Native OCI Image - run: bootBuildImage --publishImage + run: gradle bootBuildImage --publishImage env: USERNAME: ${{ github.actor }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.gradle.kts b/build.gradle.kts index 1fe263b..9be9ed9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,8 @@ import com.google.cloud.tools.jib.api.buildplan.ImageFormat import net.nemerosa.versioning.VersioningExtension import org.gradle.plugins.ide.idea.model.IdeaModel +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_22 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.springframework.boot.gradle.dsl.SpringBootExtension import org.springframework.boot.gradle.tasks.aot.ProcessAot @@ -10,14 +12,14 @@ import org.springframework.boot.gradle.tasks.run.BootRun plugins { id("idea") - id("org.springframework.boot") version "3.3.2" + id("org.springframework.boot") version "3.3.3" id("io.spring.dependency-management") version "1.1.6" id("com.google.cloud.tools.jib") version "3.4.3" id("net.nemerosa.versioning") version "3.1.0" - id("org.graalvm.buildtools.native") version "0.10.2" + id("org.graalvm.buildtools.native") version "0.10.3" - kotlin("jvm") version "2.0.10" - kotlin("plugin.spring") version "2.0.10" + kotlin("jvm") version "2.0.20" + kotlin("plugin.spring") version "2.0.20" } @@ -32,7 +34,7 @@ dependencies { implementation("com.github.ben-manes.caffeine:caffeine") implementation("com.fasterxml.jackson.module:jackson-module-kotlin") implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") implementation("io.github.openfeign:feign-core:13.1") implementation("io.github.openfeign:feign-jackson:13.1") @@ -61,7 +63,7 @@ configure { kotlin { jvmToolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) vendor.set(JvmVendorSpec.ADOPTIUM) } } @@ -71,14 +73,14 @@ tasks.withType { } tasks.withType { - sourceCompatibility = JavaVersion.VERSION_21.toString() - targetCompatibility = JavaVersion.VERSION_21.toString() + sourceCompatibility = JavaVersion.VERSION_22.toString() + targetCompatibility = JavaVersion.VERSION_22.toString() } tasks.withType { - kotlinOptions { + compilerOptions { freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = JavaVersion.VERSION_21.toString() + jvmTarget = JVM_22 } } @@ -169,7 +171,7 @@ jib { } } from { - image = "eclipse-temurin:21-jre-jammy" + image = "eclipse-temurin:22-jre-jammy" auth { username = System.getenv("DOCKERHUB_USER") password = System.getenv("DOCKERHUB_PASSWORD") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 1cf4e7f..3499b1a 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,9 +1,12 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile group = "com.github.schaka.janitorr" plugins { - `kotlin-dsl` + kotlin("jvm") version "2.0.20" + `kotlin-dsl` version "5.1.1" + `embedded-kotlin` version "5.1.1" } repositories { @@ -11,13 +14,13 @@ repositories { } tasks.withType { - sourceCompatibility = JavaVersion.VERSION_21.toString() - targetCompatibility = JavaVersion.VERSION_21.toString() + sourceCompatibility = JavaVersion.VERSION_22.toString() + targetCompatibility = JavaVersion.VERSION_22.toString() } tasks.withType { - kotlinOptions { + compilerOptions { freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = JavaVersion.VERSION_21.toString() + jvmTarget = JvmTarget.JVM_22 } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c35211..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0..0aaefbc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew old mode 100644 new mode 100755