Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/graalvm-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,16 @@ jobs:
- name: Build Matrix
uses: micronaut-projects/github-actions/graalvm/build-matrix@master
id: build-matrix
with:
java-version: '21'
build:
needs: build_matrix
if: github.repository != 'micronaut-projects/micronaut-project-template'
runs-on: ubuntu-latest
strategy:
max-parallel: 6
matrix:
java: ['21', '25']
java: ['21']
native_test_task: ${{ fromJson(needs.build_matrix.outputs.matrix).native_test_task }}
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
Expand All @@ -48,6 +50,7 @@ jobs:
id: pre-build
with:
distribution: 'graalvm'
gradle-java: '21'
java: ${{ matrix.java }}
- name: Build Steps
uses: micronaut-projects/github-actions/graalvm/build@master
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ dependencies {
testImplementation(mn.micronaut.http.server.tck)
testImplementation(mn.micronaut.jackson.databind)
testImplementation(libs.junit.platform.engine)
testImplementation(libs.junit.jupiter.engine)
testImplementation(mnTest.junit.jupiter.engine)
testRuntimeOnly(mnLogging.logback.classic)
testRuntimeOnly(mnValidation.micronaut.validation)
}

java {
sourceCompatibility = JavaVersion.toVersion("17")
targetCompatibility = JavaVersion.toVersion("17")
sourceCompatibility = JavaVersion.toVersion("21")
targetCompatibility = JavaVersion.toVersion("21")
}

tasks.named("test") {
Expand Down
3 changes: 1 addition & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ micronaut-logging = "1.7.1"
# Micronaut
micronaut-gradle-plugin = "4.5.5"
logback-access = "2.0.6"
kotlin = "1.9.25"
kotlin = "2.2.20"

[libraries]
# Core
Expand All @@ -41,7 +41,6 @@ micronaut-serde = { module = "io.micronaut.serde:micronaut-serde-bom", version.r
micronaut-session = { module = "io.micronaut.session:micronaut-session-bom", version.ref = "micronaut-session" }
micronaut-validation = { module = "io.micronaut.validation:micronaut-validation-bom", version.ref = "micronaut-validation" }

junit-jupiter-engine = { module = 'org.junit.jupiter:junit-jupiter-engine' }
junit-platform-engine = { module = "org.junit.platform:junit-platform-suite-engine" }
kotlin-stdlib-jdk8 = { module = 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' }
kotlin-reflect = { module = 'org.jetbrains.kotlin:kotlin-reflect' }
Expand Down
1 change: 1 addition & 0 deletions test-sample-poja/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ dependencies {

testAnnotationProcessor(mn.micronaut.inject.java.test)
testImplementation(mn.micronaut.inject.java)
testRuntimeOnly(mnTest.junit.platform.suite)
}

application {
Expand Down
4 changes: 2 additions & 2 deletions test-suite-kotlin-jetty/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repositories {
dependencies {
kaptTest mn.micronaut.inject.java

testRuntimeOnly libs.junit.jupiter.engine
testRuntimeOnly mnTest.junit.jupiter.engine

testImplementation libs.kotlin.stdlib.jdk8
testImplementation libs.kotlin.reflect
Expand All @@ -36,6 +36,6 @@ tasks.named('test') {

kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(17))
languageVersion.set(JavaLanguageVersion.of(21))
}
}
Loading