Skip to content

Commit 369e09c

Browse files
lissam1sdelamo
andauthored
Micronaut 5 compatibility and release prep (#673)
* update to kotlin 2.2.20 * update ksp gradle * update baseline to java 21 * update workflow to java 21 * add junit platform * move java-library to objectstorage-example.gradle * use junit platform in buildSrc build * update micronaut build to 8.0.0-M6 * use baseline plugin * remove unused java * remove unused junit * revert changes --------- Co-authored-by: Sergio del Amo <[email protected]>
1 parent 9879341 commit 369e09c

File tree

7 files changed

+8
-21
lines changed

7 files changed

+8
-21
lines changed

.github/workflows/aws.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
strategy:
2525
matrix:
26-
java: ['17']
26+
java: ['21']
2727
steps:
2828
# https://github.com/actions/virtual-environments/issues/709
2929
- name: Free disk space

.github/workflows/azure.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
strategy:
2525
matrix:
26-
java: ['17']
26+
java: ['21']
2727
steps:
2828
# https://github.com/actions/virtual-environments/issues/709
2929
- name: Free disk space

.github/workflows/gcp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
strategy:
2525
matrix:
26-
java: ['17']
26+
java: ['21']
2727
permissions:
2828
contents: 'read'
2929
id-token: 'write'

.github/workflows/oci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
strategy:
2525
matrix:
26-
java: ['17']
26+
java: ['21']
2727
permissions:
2828
contents: 'read'
2929
id-token: 'write'

doc-examples/example-kotlin/build.gradle.kts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
1-
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2-
31
plugins {
42
id("org.jetbrains.kotlin.jvm")
53
id("com.google.devtools.ksp")
64
id("io.micronaut.build.internal.objectstorage-example")
7-
}
8-
9-
java {
10-
sourceCompatibility = JavaVersion.VERSION_17
11-
targetCompatibility = JavaVersion.VERSION_17
12-
}
13-
14-
kotlin {
15-
this.compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
5+
id("io.micronaut.build.internal.kotlin-base")
166
}
177

188
dependencies {

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ bytebuddy = '1.17.8'
1818

1919
# Gradle plugins
2020
micronaut-gradle-plugin = "4.5.5"
21-
kotlin-gradle-plugin = "1.9.25"
22-
kotlin-gradle-ksp-plugin = "1.9.25-1.0.20"
21+
kotlin-gradle-plugin = "2.2.20"
22+
kotlin-gradle-ksp-plugin = "2.2.20-2.0.4"
2323

2424
[libraries]
2525
# Core

test-suite-utils/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
plugins {
22
java
3-
}
4-
java {
5-
sourceCompatibility = JavaVersion.VERSION_17
6-
targetCompatibility = JavaVersion.VERSION_17
3+
id ("io.micronaut.build.internal.java-base")
74
}

0 commit comments

Comments
 (0)