Skip to content

Commit 169f38f

Browse files
committed
Run CI with Java 21
# Conflicts: # build.gradle.kts
1 parent 2a477ff commit 169f38f

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

.github/workflows/cd.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ jobs:
2323
# - windows-latest
2424
# - macos-latest
2525
java:
26-
- 8
27-
# - 17
26+
- '21'
2827
runs-on: ${{ matrix.os }}
2928
timeout-minutes: 20
3029
steps:

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ jobs:
2525
# pinned to macos-13 due to https://github.com/actions/runner-images/issues/9254
2626
- macos-13
2727
java:
28-
- 8
29-
- 17
28+
- '21'
3029
runs-on: ${{ matrix.os }}
3130
timeout-minutes: 20
3231
steps:

.github/workflows/release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ jobs:
2525
# - windows-latest
2626
# - macos-latest
2727
java:
28-
- 8
29-
# - 17
28+
- '21'
3029
runs-on: ${{ matrix.os }}
3130
timeout-minutes: 20
3231
steps:

api-client/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
id("maven-publish")
88
id("signing")
99
id("com.github.ben-manes.versions")
10-
id("net.ossindex.audit")
10+
id("org.sonatype.gradle.plugins.scan")
1111
id("io.freefair.maven-central.validate-poms")
1212
}
1313

build.gradle.kts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ rootProject.extra.set("artifactVersion", SimpleDateFormat("yyyy-MM-dd\'T\'HH-mm-
66
plugins {
77
id("maven-publish")
88
id("com.github.ben-manes.versions") version "0.52.0"
9-
id("net.ossindex.audit") version "0.4.11"
9+
id("org.sonatype.gradle.plugins.scan") version "3.1.4"
1010
id("io.freefair.maven-central.validate-poms") version "8.14.2"
1111
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
1212
alias(libs.plugins.kotlinJvm) apply false
@@ -68,6 +68,11 @@ allprojects {
6868
}
6969
}
7070

71+
ossIndexAudit {
72+
username = System.getenv("SONATYPE_INDEX_USERNAME") ?: findProperty("sonatype.index.username")
73+
password = System.getenv("SONATYPE_INDEX_PASSWORD") ?: findProperty("sonatype.index.password")
74+
}
75+
7176
fun findProperty(s: String) = project.findProperty(s) as String?
7277

7378
val isSnapshot = project.version == "unspecified"

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ sonatype.staging.url=https://oss.sonatype.org/service/local/staging/deploy/maven
1212
sonatype.staging.profile.id=
1313
sonatype.username=
1414
sonatype.password=
15+
16+
sonatype.index.username=
17+
sonatype.index.password=

0 commit comments

Comments
 (0)