Merge pull request #307 from ajoberstar/gradle6

Bump gradle and dependencies
ajoberstar · Nov 15, 2019 · 6428f6f · 6428f6f
2 parents 97924f3 + 92afffb
commit 6428f6f
Show file tree

Hide file tree

Showing 28 changed files with 81 additions and 189 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -0,0 +1,19 @@
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [8, 11, 13]
+      fail-fast: false
+    steps:
+      - uses: "actions/checkout@master"
+      - uses: "actions/setup-java@master"
+        with:
+          java-version: ${{ matrix.java }}
+      - name: "Gradle check"
+        run: "./gradlew check"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -0,0 +1,31 @@
+on:
+  push:
+    tags:
+      - "*"
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [8, 11]
+      fail-fast: false
+    steps:
+      - uses: "actions/checkout@master"
+      - uses: "actions/setup-java@master"
+        with:
+          java-version: ${{ matrix.java }}
+      - run: "./gradlew check --continue"
+  publish:
+    runs-on: ubuntu-latest
+    needs: check
+    steps:
+      - uses: "actions/checkout@master"
+      - uses: "actions/setup-java@master"
+        with:
+          java-version: 11
+      - name: "Gradle publish"
+        env:
+          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
+          BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
+          GRADLE_OPTS: "-Dorg.gradle.project.gradle.publish.key=${{ secrets.GRADLE_PLUGIN_KEY }} -Dorg.gradle.project.gradle.publish.secret=${{ secrets.GRADLE_PLUGIN_SECRET }}"
+        run: "./gradlew publish publishPlugins"
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,6 @@
 plugins {
   id 'org.ajoberstar.defaults' version '0.15.1'
+  id 'org.ajoberstar.stutter' version '0.5.1'
   id 'org.jbake.site' version '5.0.0'
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

diff --git a/gradlew.bat b/gradlew.bat
@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/grgit-core/gradle/dependency-locks/compile.lockfile b/grgit-core/gradle/dependency-locks/compile.lockfile
diff --git a/grgit-core/gradle/dependency-locks/compileClasspath.lockfile b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile
@@ -8,5 +8,5 @@ org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
 org.codehaus.groovy:groovy:2.5.8
-org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
+org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
 org.slf4j:slf4j-api:1.7.2
diff --git a/grgit-core/gradle/dependency-locks/default.lockfile b/grgit-core/gradle/dependency-locks/default.lockfile
diff --git a/grgit-core/gradle/dependency-locks/runtime.lockfile b/grgit-core/gradle/dependency-locks/runtime.lockfile
diff --git a/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile b/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,5 +7,5 @@ com.jcraft:jzlib:1.1.1
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
+org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
 org.slf4j:slf4j-api:1.7.2
diff --git a/grgit-core/gradle/dependency-locks/testCompile.lockfile b/grgit-core/gradle/dependency-locks/testCompile.lockfile
diff --git a/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile b/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -4,7 +4,7 @@
 com.googlecode.javaewah:JavaEWAH:1.1.6
 com.jcraft:jsch:0.1.55
 com.jcraft:jzlib:1.1.1
-junit:junit:4.13-beta-3
+junit:junit:4.13-rc-1
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
@@ -16,7 +16,7 @@ org.codehaus.groovy:groovy-templates:2.5.4
 org.codehaus.groovy:groovy-test:2.5.4
 org.codehaus.groovy:groovy-xml:2.5.4
 org.codehaus.groovy:groovy:2.5.4
-org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
+org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
 org.hamcrest:hamcrest-core:1.3
-org.slf4j:slf4j-api:2.0.0-alpha0
+org.slf4j:slf4j-api:2.0.0-alpha1
 org.spockframework:spock-core:1.3-groovy-2.5
diff --git a/grgit-core/gradle/dependency-locks/testRuntime.lockfile b/grgit-core/gradle/dependency-locks/testRuntime.lockfile
diff --git a/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -4,7 +4,7 @@
 com.googlecode.javaewah:JavaEWAH:1.1.6
 com.jcraft:jsch:0.1.55
 com.jcraft:jzlib:1.1.1
-junit:junit:4.13-beta-3
+junit:junit:4.13-rc-1
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
@@ -16,8 +16,8 @@ org.codehaus.groovy:groovy-templates:2.5.4
 org.codehaus.groovy:groovy-test:2.5.4
 org.codehaus.groovy:groovy-xml:2.5.4
 org.codehaus.groovy:groovy:2.5.4
-org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
+org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
 org.hamcrest:hamcrest-core:1.3
-org.slf4j:slf4j-api:2.0.0-alpha0
-org.slf4j:slf4j-simple:2.0.0-alpha0
+org.slf4j:slf4j-api:2.0.0-alpha1
+org.slf4j:slf4j-simple:2.0.0-alpha1
 org.spockframework:spock-core:1.3-groovy-2.5
diff --git a/grgit-gradle/.stutter/java11.lock b/grgit-gradle/.stutter/java11.lock
@@ -1,3 +1,4 @@
 # DO NOT MODIFY: Generated by Stutter plugin.
 5.0
-5.6.2
+5.6.4
+6.0
diff --git a/grgit-gradle/.stutter/java9.lock → grgit-gradle/.stutter/java13.lock b/grgit-gradle/.stutter/java9.lock → grgit-gradle/.stutter/java13.lock
@@ -1,5 +1,2 @@
 # DO NOT MODIFY: Generated by Stutter plugin.
-4.2.1
-4.10.3
-5.0
-5.6.2
+6.0
diff --git a/grgit-gradle/.stutter/java8.lock b/grgit-gradle/.stutter/java8.lock
@@ -2,4 +2,5 @@
 4.0.2
 4.10.3
 5.0
-5.6.2
+5.6.4
+6.0
diff --git a/grgit-gradle/build.gradle b/grgit-gradle/build.gradle
@@ -33,12 +33,12 @@ stutter {
   java(8) {
     compatibleRange '4.0'
   }
-  java(9) {
-    compatibleRange '4.2.1'
-  }
   java(11) {
     compatibleRange '5.0'
   }
+  java(13) {
+    compatibleRange '6.0'
+  }
 }
 
 pluginBundle {

diff --git a/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile
@@ -4,11 +4,11 @@
 com.googlecode.javaewah:JavaEWAH:1.1.6
 com.jcraft:jsch:0.1.55
 com.jcraft:jzlib:1.1.1
-junit:junit:4.13-beta-3
+junit:junit:4.13-rc-1
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
+org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
 org.hamcrest:hamcrest-core:1.3
 org.slf4j:slf4j-api:1.7.2
 org.spockframework:spock-core:1.3-groovy-2.5
diff --git a/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile
@@ -4,11 +4,11 @@
 com.googlecode.javaewah:JavaEWAH:1.1.6
 com.jcraft:jsch:0.1.55
 com.jcraft:jzlib:1.1.1
-junit:junit:4.13-beta-3
+junit:junit:4.13-rc-1
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
+org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
 org.hamcrest:hamcrest-core:1.3
 org.slf4j:slf4j-api:1.7.2
 org.spockframework:spock-core:1.3-groovy-2.5
diff --git a/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile
@@ -7,5 +7,5 @@ com.jcraft:jzlib:1.1.1
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
+org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
 org.slf4j:slf4j-api:1.7.2
diff --git a/grgit-gradle/gradle/dependency-locks/default.lockfile b/grgit-gradle/gradle/dependency-locks/default.lockfile
diff --git a/grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -7,5 +7,5 @@ com.jcraft:jzlib:1.1.1
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
+org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
 org.slf4j:slf4j-api:1.7.2
diff --git a/grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -7,5 +7,5 @@ com.jcraft:jzlib:1.1.1
 org.bouncycastle:bcpg-jdk15on:1.61
 org.bouncycastle:bcpkix-jdk15on:1.61
 org.bouncycastle:bcprov-jdk15on:1.61
-org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
+org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
 org.slf4j:slf4j-api:1.7.2
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ @@
 .0.2
 .10.3
 .0
-.6.2
+.6.4
+.0