Use new stutter plugin

ajoberstar · Feb 7, 2022 · 0bf34a6 · 0bf34a6
1 parent 74cfa40
commit 0bf34a6
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 52 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -6,10 +6,6 @@ on:
 jobs:
   ci:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [11, 17]
-      fail-fast: false
     env:
       GRADLE_OPTS: -Dorg.gradle.java.installations.fromEnv=JAVA_HOME_8_x64,JAVA_HOME_11_x64,JAVA_HOME_17_x64
     steps:
@@ -18,11 +14,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Java ${{ matrix.java }}
+      - name: Setup Java 11
         uses: actions/setup-java@v2
         with:
           distribution: temurin
-          java-version: ${{ matrix.java }}
+          java-version: 11
       - name: Setup Java 17
         uses: actions/setup-java@v2
         with:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -3,35 +3,7 @@ on:
   push:
     tags: ["*"]
 jobs:
-  check:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [11, 17]
-      fail-fast: false
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Setup Java ${{ matrix.java }}
-        uses: actions/setup-java@v2
-        with:
-          distribution: temurin
-          java-version: ${{ matrix.java }}
-      - name: Setup Java 17
-        uses: actions/setup-java@v2
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-      - name: Gradle check
-        run: ./gradlew check --continue
-  publish:
+  release:
     runs-on: ubuntu-latest
     needs: check
     steps:

diff --git a/grgit-gradle/.stutter/java11.lock b/grgit-gradle/.stutter/java11.lock
diff --git a/grgit-gradle/.stutter/java17.lock b/grgit-gradle/.stutter/java17.lock
diff --git a/grgit-gradle/build.gradle.kts b/grgit-gradle/build.gradle.kts
@@ -40,15 +40,28 @@ tasks.named<Jar>("jar") {
 }
 
 stutter {
-  setSparse(true)
-  java(11) {
-    compatibleRange("5.0")
+  val java11 by matrices.creating {
+    javaToolchain {
+      languageVersion.set(JavaLanguageVersion.of(11))
+    }
+    gradleVersions {
+      compatibleRange("5.0")
+    }
   }
-  java(17) {
-    compatibleRange("7.3")
+  val java17 by matrices.creating {
+    javaToolchain {
+      languageVersion.set(JavaLanguageVersion.of(17))
+    }
+    gradleVersions {
+      compatibleRange("7.3")
+    }
   }
 }
 
+tasks.named("check") {
+  dependsOn(tasks.named("compatTest"))
+}
+
 pluginBundle {
   website = "https://github.com/ajoberstar/grgit"
   vcsUrl = "https://github.com/ajoberstar/grgit.git"

diff --git a/grgit-gradle/stutter.lockfile b/grgit-gradle/stutter.lockfile
@@ -0,0 +1,3 @@
+# DO NOT MODIFY: Generated by Stutter plugin.
+java11=5.0,5.6.4,6.0.1,6.9.2,7.0.2,7.3.3,7.4-rc-2
+java17=7.3.3,7.4-rc-2
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
     id("org.ajoberstar.grgit") version "4.1.1"
     id("org.ajoberstar.reckon") version "0.13.1"
     id("org.ajoberstar.git-publish") version "3.0.0"
-    id("org.ajoberstar.stutter") version "0.6.0"
+    id("org.ajoberstar.stutter") version "0.7.0"
 
     id("com.diffplug.spotless") version "6.2.1"
     id("org.jbake.site") version "5.5.0"