Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update plugin org.ajoberstar.stutter to v0.7.2 #225

Merged
merged 9 commits into from
Jun 5, 2023
4 changes: 2 additions & 2 deletions .github/workflows/gradle-latest-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ jobs:

- name: Set latest Gradle versions to test with
run: |
cp "${{ env.GRADLE_VERSIONS_OUTPUT_FILE }}" .stutter/java11.lock
echo "java11=$(cat ${{ env.GRADLE_VERSIONS_OUTPUT_FILE }} | tr '\n' ',')" > stutter.lockfile
echo "Gradle versions configured for compatibility tests:"
cat .stutter/java11.lock
cat stutter.lockfile

- name: Run compatTest
run: ./gradlew --continue test compatTest
14 changes: 8 additions & 6 deletions .github/workflows/java-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@ jobs:
# Workaround https://github.com/ajoberstar/gradle-stutter/issues/22
- name: Reduce number of Gradle regressions builds
run: |
for l in .stutter/*.lock; do
echo $l
echo "$(cat $l | grep -v "^#" | tail -1)" > $l
cat $l
done
# Keep only the last Gradle version per Stutter matrix; for each line this transformation is done:
# java11=6.0.1,6.9.4,7.0.2,7.6.1,8.0.2,8.1.1,8.2-rc-1
# ->
# java11=8.2-rc-1
# The trick is that \2 will greedily eat everything before the last comma.
sed -r 's/^(.*?)=(.*),(.*)$/\1=\3/g' -i stutter.lockfile
szpak marked this conversation as resolved.
Show resolved Hide resolved
cat stutter.lockfile
- name: Test cross Java versions compatibility
run: |
./gradlew --version
./gradlew --stacktrace build
./gradlew --stacktrace build compatTestJava${{ matrix.jdk }}
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
distribution: 'zulu'
- uses: gradle/gradle-build-action@v2
with:
arguments: --scan --stacktrace build
arguments: --scan --stacktrace build compatTestJava11
8 changes: 0 additions & 8 deletions .stutter/java11.lock

This file was deleted.

6 changes: 0 additions & 6 deletions .stutter/java17.lock

This file was deleted.

8 changes: 0 additions & 8 deletions .stutter/java8.lock

This file was deleted.

37 changes: 27 additions & 10 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {
id("com.github.johnrengelman.shadow") version "8.1.1"
id("org.jetbrains.gradle.plugin.idea-ext")
id("com.github.ben-manes.versions") version "0.46.0"
id("org.ajoberstar.stutter") version "0.6.0"
id("org.ajoberstar.stutter") version "0.7.2"
}

group = "io.github.gradle-nexus"
Expand Down Expand Up @@ -100,15 +100,32 @@ java {
}

stutter {
isSparse = (findProperty("stutter.sparce")?.toString()?.toBoolean()) ?: true
java(8) {
compatibleRange("6.0")
}
java(11) {
compatibleRange("6.0")
}
java(17) {
compatibleRange("7.3")
sparse.set(providers.gradleProperty("stutter.sparse").map(String::toBoolean).orElse(true))
matrices {
register("java8") {
javaToolchain {
languageVersion.set(JavaLanguageVersion.of(8))
}
gradleVersions {
compatibleRange("6.0")
}
}
register("java11") {
javaToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
}
gradleVersions {
compatibleRange("6.0")
}
}
register("java17") {
javaToolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
gradleVersions {
compatibleRange("7.3")
}
}
}
}

Expand Down
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id("com.gradle.enterprise") version "3.13.3"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
szpak marked this conversation as resolved.
Show resolved Hide resolved
}

gradleEnterprise {
Expand Down
4 changes: 4 additions & 0 deletions stutter.lockfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# DO NOT MODIFY: Generated by Stutter plugin.
java11=6.0.1,6.9.4,7.0.2,7.6.1,8.0.2,8.1.1,8.2-milestone-1
java17=7.3.3,7.6.1,8.0.2,8.1.1,8.2-milestone-1
java8=6.0.1,6.9.4,7.0.2,7.6.1,8.0.2,8.1.1,8.2-milestone-1