Skip to content

Commit 31af205

Browse files
authored
chore: Upgrade gradle to 8.12.1 (#207)
Upgrade gradle to 8.12.1, fairly recent version.
1 parent 5bf6920 commit 31af205

File tree

7 files changed

+21
-10
lines changed

7 files changed

+21
-10
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,19 @@ jobs:
66
runs-on: ubuntu-latest
77
if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main')
88

9-
strategy:
10-
matrix:
11-
gradle-version: [ '7.6.2', '8.0.1', '8.2.1' ]
12-
139
steps:
1410
- uses: actions/setup-java@v4
1511
with:
16-
java-version: 17
12+
java-version: 21
1713
distribution: 'temurin'
1814

1915
- uses: actions/checkout@v4
2016

2117
- uses: gradle/wrapper-validation-action@v3
2218

23-
- uses: gradle/gradle-build-action@v3
19+
- uses: gradle/actions/setup-gradle@v4
2420
with:
25-
gradle-version: ${{ matrix.gradle-version }}
26-
arguments: check --continue
21+
gradle-version: '8.12.1'
2722

28-
# TODO Add publish on tag support
23+
- run:
24+
./gradlew check --continue

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.gradle
2+
.kotlin
23
/build/
34

45
# Ignore Gradle GUI config

build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ tasks.named("publishPlugins") {
3838
group = "org.assertj"
3939
version = "2.2.0-SNAPSHOT"
4040

41+
java {
42+
toolchain {
43+
languageVersion = JavaLanguageVersion.of(21)
44+
vendor = JvmVendorSpec.ADOPTIUM
45+
}
46+
}
47+
4148
gradlePlugin {
4249
website.set("https://github.com/assertj/assertj-generator-gradle-plugin")
4350
vcsUrl.set("https://github.com/assertj/assertj-generator-gradle-plugin.git")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package org.assertj.generator.gradle
2+
3+
internal fun String.capitalized(): String {
4+
return this[0].uppercaseChar() + this.substring(1)
5+
}

src/test/kotlin/org/assertj/generator/gradle/parameter/OutputDirectoryParameter.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ package org.assertj.generator.gradle.parameter
1515
import net.navatwo.gradle.testkit.junit5.GradleProject
1616
import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
1717
import org.assertj.generator.gradle.TestUtils.writeBuildFile
18+
import org.assertj.generator.gradle.capitalized
1819
import org.assertj.generator.gradle.isSuccessful
1920
import org.gradle.configurationcache.extensions.capitalized
2021
import org.gradle.testkit.runner.GradleRunner

src/test/kotlin/org/assertj/generator/gradle/parameter/SkipParameter.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ package org.assertj.generator.gradle.parameter
1515
import net.navatwo.gradle.testkit.junit5.GradleProject
1616
import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
1717
import org.assertj.generator.gradle.TestUtils.writeBuildFile
18+
import org.assertj.generator.gradle.capitalized
1819
import org.assertj.generator.gradle.isSuccessful
1920
import org.gradle.configurationcache.extensions.capitalized
2021
import org.gradle.testkit.runner.GradleRunner

0 commit comments

Comments
 (0)