From fc34bb67feb9a34b37598d57cab1a1ec5912bee8 Mon Sep 17 00:00:00 2001 From: Kevin Brightwell Date: Thu, 24 Apr 2025 08:09:43 -0400 Subject: [PATCH 1/8] chore: Upgrade gradle to 8.12.1 --- .github/workflows/ci.yml | 2 +- .gitignore | 1 + build.gradle.kts | 7 +++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- .../org/assertj/generator/gradle/StringExtensions.kt | 5 +++++ .../generator/gradle/parameter/OutputDirectoryParameter.kt | 1 + .../assertj/generator/gradle/parameter/SkipParameter.kt | 1 + 7 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 src/test/kotlin/org/assertj/generator/gradle/StringExtensions.kt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 455ec73..a373c6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - gradle-version: [ '7.6.2', '8.0.1', '8.2.1' ] + gradle-version: [ '7.6.4', '8.7', '8.12.1', 'latest' ] steps: - uses: actions/setup-java@v4 diff --git a/.gitignore b/.gitignore index 6607f25..cc56745 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .gradle +.kotlin /build/ # Ignore Gradle GUI config diff --git a/build.gradle.kts b/build.gradle.kts index 2b3c28c..901850b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,6 +38,13 @@ tasks.named("publishPlugins") { group = "org.assertj" version = "2.2.0-SNAPSHOT" +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.AZUL + } +} + gradlePlugin { website.set("https://github.com/assertj/assertj-generator-gradle-plugin") vcsUrl.set("https://github.com/assertj/assertj-generator-gradle-plugin.git") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5083229..9bf7bd3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/test/kotlin/org/assertj/generator/gradle/StringExtensions.kt b/src/test/kotlin/org/assertj/generator/gradle/StringExtensions.kt new file mode 100644 index 0000000..ff0367e --- /dev/null +++ b/src/test/kotlin/org/assertj/generator/gradle/StringExtensions.kt @@ -0,0 +1,5 @@ +package org.assertj.generator.gradle + +internal fun String.capitalized(): String { + return this[0].uppercaseChar() + this.substring(1) +} diff --git a/src/test/kotlin/org/assertj/generator/gradle/parameter/OutputDirectoryParameter.kt b/src/test/kotlin/org/assertj/generator/gradle/parameter/OutputDirectoryParameter.kt index eacc7bb..86b5c9e 100644 --- a/src/test/kotlin/org/assertj/generator/gradle/parameter/OutputDirectoryParameter.kt +++ b/src/test/kotlin/org/assertj/generator/gradle/parameter/OutputDirectoryParameter.kt @@ -15,6 +15,7 @@ package org.assertj.generator.gradle.parameter import net.navatwo.gradle.testkit.junit5.GradleProject import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat import org.assertj.generator.gradle.TestUtils.writeBuildFile +import org.assertj.generator.gradle.capitalized import org.assertj.generator.gradle.isSuccessful import org.gradle.configurationcache.extensions.capitalized import org.gradle.testkit.runner.GradleRunner diff --git a/src/test/kotlin/org/assertj/generator/gradle/parameter/SkipParameter.kt b/src/test/kotlin/org/assertj/generator/gradle/parameter/SkipParameter.kt index 0ea97d4..ac1717d 100644 --- a/src/test/kotlin/org/assertj/generator/gradle/parameter/SkipParameter.kt +++ b/src/test/kotlin/org/assertj/generator/gradle/parameter/SkipParameter.kt @@ -15,6 +15,7 @@ package org.assertj.generator.gradle.parameter import net.navatwo.gradle.testkit.junit5.GradleProject import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat import org.assertj.generator.gradle.TestUtils.writeBuildFile +import org.assertj.generator.gradle.capitalized import org.assertj.generator.gradle.isSuccessful import org.gradle.configurationcache.extensions.capitalized import org.gradle.testkit.runner.GradleRunner From c3546111a843310733887e4396bf3f56dd9d2385 Mon Sep 17 00:00:00 2001 From: Kevin Brightwell Date: Thu, 24 Apr 2025 08:12:10 -0400 Subject: [PATCH 2/8] fix ci action --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a373c6e..e7d1617 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,9 +20,9 @@ jobs: - uses: gradle/wrapper-validation-action@v3 - - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v4 with: gradle-version: ${{ matrix.gradle-version }} - arguments: check --continue -# TODO Add publish on tag support + - run: + ./gradlew check --continue From b85dc91ea8a8c82015c341edf371ed6c7894dcb8 Mon Sep 17 00:00:00 2001 From: Kevin Brightwell Date: Thu, 24 Apr 2025 08:12:56 -0400 Subject: [PATCH 3/8] more clean-up for action --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7d1617..cfa1693 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,13 +8,13 @@ jobs: strategy: matrix: - gradle-version: [ '7.6.4', '8.7', '8.12.1', 'latest' ] + gradle-version: [ '7.6.4', '8.7', '8.12.1', 'current' ] steps: - uses: actions/setup-java@v4 with: - java-version: 17 - distribution: 'temurin' + java-version: 21 + distribution: 'azul' - uses: actions/checkout@v4 From 08296c3a187403b53d0c7076845ca25f29b452b0 Mon Sep 17 00:00:00 2001 From: Kevin Brightwell Date: Thu, 24 Apr 2025 08:13:42 -0400 Subject: [PATCH 4/8] add more os support --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfa1693..0ed702b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,12 +3,13 @@ on: [ push, pull_request ] jobs: ci: - runs-on: ubuntu-latest - if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main') - strategy: matrix: gradle-version: [ '7.6.4', '8.7', '8.12.1', 'current' ] + os: [ ubuntu-latest, macos-latest, windows-latest ] + + runs-on: ${{ matrix.os }} + if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main') steps: - uses: actions/setup-java@v4 From b17837f520d7360b71c770d5b231459325ceeae2 Mon Sep 17 00:00:00 2001 From: Kevin Brightwell Date: Thu, 24 Apr 2025 08:14:02 -0400 Subject: [PATCH 5/8] temurin --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ed702b..6c1962a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-java@v4 with: java-version: 21 - distribution: 'azul' + distribution: 'temurin' - uses: actions/checkout@v4 From b499ca7b448c8239409e1925ceeae187d0e6548c Mon Sep 17 00:00:00 2001 From: Kevin Brightwell Date: Thu, 24 Apr 2025 08:15:59 -0400 Subject: [PATCH 6/8] adoptium --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 901850b..32855fc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,7 @@ version = "2.2.0-SNAPSHOT" java { toolchain { languageVersion = JavaLanguageVersion.of(21) - vendor = JvmVendorSpec.AZUL + vendor = JvmVendorSpec.ADOPTIUM } } From 909c5bc91f8f57832bb9ed920a878d99e28d9c5b Mon Sep 17 00:00:00 2001 From: Kevin Brightwell Date: Thu, 24 Apr 2025 08:30:26 -0400 Subject: [PATCH 7/8] remove ci changes --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c1962a..129c8f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,13 +3,12 @@ on: [ push, pull_request ] jobs: ci: + runs-on: ubuntu-latest + if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main') + strategy: matrix: - gradle-version: [ '7.6.4', '8.7', '8.12.1', 'current' ] - os: [ ubuntu-latest, macos-latest, windows-latest ] - - runs-on: ${{ matrix.os }} - if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main') + gradle-version: [ '7.6.2', '8.0.1', '8.2.1' ] steps: - uses: actions/setup-java@v4 From 5ca6d107e53190ca17dd241d0954f6ce9669584e Mon Sep 17 00:00:00 2001 From: Kevin Brightwell Date: Thu, 24 Apr 2025 08:35:36 -0400 Subject: [PATCH 8/8] remove excessive testing --- .github/workflows/ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 129c8f0..142da52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,10 +6,6 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main') - strategy: - matrix: - gradle-version: [ '7.6.2', '8.0.1', '8.2.1' ] - steps: - uses: actions/setup-java@v4 with: @@ -22,7 +18,7 @@ jobs: - uses: gradle/actions/setup-gradle@v4 with: - gradle-version: ${{ matrix.gradle-version }} + gradle-version: '8.12.1' - run: ./gradlew check --continue