Skip to content

Commit

Permalink
Platform to 21 (#973)
Browse files Browse the repository at this point in the history
* Update common files

* Set the target for buildSrc to java 17

---------

Co-authored-by: Sergio del Amo <sergio.delamo@softamo.com>
Co-authored-by: Tim Yates <tim.yates@gmail.com>
  • Loading branch information
3 people authored Oct 13, 2023
1 parent d10261a commit 93182ba
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ end_of_line = lf
[{*.bat,*.cmd}]
end_of_line = crlf

[{*.mustache,*.ftl}]
insert_final_newline = false

[*.java]
indent_size = 4
tab_width = 4
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/graalvm-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
max-parallel: 6
matrix: ${{ fromJson(needs.build_matrix.outputs.matrix) }}
matrix:
java: ['17', '21']
native_test_task: ${{ fromJson(needs.build_matrix.outputs.matrix).native_test_task }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
Expand All @@ -46,7 +48,7 @@ jobs:
id: pre-build
with:
distribution: 'graalvm'
java: '17'
java: ${{ matrix.java }}
- name: Build Steps
uses: micronaut-projects/github-actions/graalvm/build@master
id: build
Expand All @@ -60,4 +62,4 @@ jobs:
uses: micronaut-projects/github-actions/graalvm/post-build@master
id: post-build
with:
java: '17'
java: ${{ matrix.java }}
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: ['17']
java: ['17', '21']
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
./gradlew check --no-daemon --continue
- name: "🔎 Run static analysis"
if: env.SONAR_TOKEN != ''
if: env.SONAR_TOKEN != '' && matrix.java == '17'
run: |
./gradlew sonar
Expand Down
11 changes: 11 additions & 0 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
`kotlin-dsl`
}
Expand All @@ -10,3 +12,12 @@ repositories {
dependencies {
implementation("io.micronaut.build.internal.publishing:io.micronaut.build.internal.publishing.gradle.plugin:6.5.7")
}

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
this.compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
}

0 comments on commit 93182ba

Please sign in to comment.