Skip to content

Commit 3324c13

Browse files
authored
Merge pull request #280 from nebula-plugins/gradle-9-support
Gradle 9.x support
2 parents 991eb9a + 7ae4868 commit 3324c13

18 files changed

+617
-284
lines changed

.github/workflows/nebula.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
# test against latest update of some major Java version(s), as well as specific LTS version(s)
25-
java: [8, 17, 21]
25+
java: [17, 21]
2626
name: Gradle Build without Publish
2727
steps:
2828
- uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
distribution: 'zulu'
3737
java-version: |
38-
8
38+
17
3939
${{ matrix.java }}
4040
java-package: jdk
4141
- uses: actions/cache@v4
@@ -75,7 +75,7 @@ jobs:
7575
with:
7676
distribution: 'zulu'
7777
java-version: |
78-
8
78+
17
7979
21
8080
java-package: jdk
8181
- uses: actions/cache@v4
@@ -120,7 +120,7 @@ jobs:
120120
with:
121121
distribution: 'zulu'
122122
java-version: |
123-
8
123+
17
124124
21
125125
java-package: jdk
126126
- uses: actions/cache@v4

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ out/
66
*.iml
77
*.ipr
88
*.iws
9+
.kotlin/

build.gradle

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import org.gradle.util.GradleVersion
1717

1818
plugins {
19-
id 'com.netflix.nebula.plugin-plugin' version '21.2.2'
19+
id 'com.netflix.nebula.plugin-plugin' version '22.0.2'
2020
id 'com.netflix.nebula.optional-base' version '9.0.0'
21-
id "org.jetbrains.kotlin.jvm" version "2.1.0"
21+
id "org.jetbrains.kotlin.jvm" version "2.2.0"
2222
id 'java-gradle-plugin'
2323
}
2424

@@ -106,24 +106,6 @@ tasks.withType(Test).configureEach {
106106
}
107107
}
108108

109-
java {
110-
sourceCompatibility = JavaVersion.VERSION_1_8
111-
targetCompatibility = JavaVersion.VERSION_1_8
112-
}
113-
114-
idea {
115-
project {
116-
jdkName = '1.8'
117-
languageLevel = '1.8'
118-
}
119-
}
120-
121-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
122-
kotlinOptions {
123-
jvmTarget = '1.8'
124-
}
125-
}
126-
127109
tasks.withType(GenerateModuleMetadata).configureEach {
128110
suppressedValidationErrors.add('enforced-platform')
129111
}

0 commit comments

Comments
 (0)