Merge pull request #346 from ajoberstar/gradle7

Upgrade to Gradle 7, JGit 6, Java 11

.github/workflows/ci.yaml

@@ -0,0 +1,33 @@
+name: CI
+on:
+  push:
+    branches: [main]
+  pull_request:
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    env:
+      GRADLE_OPTS: -Dorg.gradle.java.installations.fromEnv=JAVA_HOME_8_x64,JAVA_HOME_11_x64,JAVA_HOME_17_x64
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java 11
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 11
+      - 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

.github/workflows/release.yaml

@@ -3,63 +3,27 @@ on:
   push:
     tags: ["*"]
 jobs:
-  check:
+  release:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [8, 11, 15]
-      fail-fast: false
+    needs: check
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Setup Java ${{ matrix.java }}
+      - name: Setup Java 11
         uses: actions/setup-java@v2
         with:
           distribution: zulu
-          java-version: ${{ matrix.java }}
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-      - name: Cache Gradle wrapper
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/wrapper
-            ~/.gradle/notifications
-          key: gradle-wrapper-${{ runner.os }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-      - name: Cache Gradle dependencies
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: gradle-caches-${{ runner.os }}-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
-      - name: Gradle check
-        run: ./gradlew check --continue
-  publish:
-    runs-on: ubuntu-latest
-    needs: check
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Setup Java
+          java-version: 11
+      - name: Setup Java 17
         uses: actions/setup-java@v2
         with:
           distribution: zulu
-          java-version: 8
-      - name: Cache Gradle wrapper
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/wrapper
-            ~/.gradle/notifications
-          key: gradle-wrapper-${{ runner.os }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-      - name: Cache Gradle dependencies
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: gradle-caches-${{ runner.os }}-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Gradle publish
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}

.gitignore

@@ -12,4 +12,3 @@ bin
 out
 *.sublime-*
 *.swp
-gradle.properties

README.md

@@ -1,6 +1,6 @@
 # grgit
 
-![Build](https://github.com/ajoberstar/grgit/workflows/Build/badge.svg)
+![CI](https://github.com/ajoberstar/grgit/workflows/CI/badge.svg)
 
 ## Project News
 

buildSrc/build.gradle.kts

@@ -2,6 +2,18 @@ plugins {
   `kotlin-dsl`
 }
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(17))
+  }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+  kotlinOptions {
+    jvmTarget = "17"
+  }
+}
+
 repositories {
   mavenCentral()
 }

buildSrc/src/main/kotlin/java-library-convention.gradle.kts

@@ -14,7 +14,9 @@ repositories {
 }
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_1_8
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
   withSourcesJar()
   withJavadocJar()
 }

buildSrc/src/main/kotlin/spotless-convention.gradle.kts

@@ -6,7 +6,6 @@ spotless {
   plugins.withId("java") {
     java {
       importOrder("java", "javax", "")
-      removeUnusedImports()
       eclipse().configFile(project.rootProject.file("gradle/eclipse-java-formatter.xml"))
     }
   }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists