From 0f053afe074caed36d33759f79999f087520999e Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Thu, 14 Nov 2019 20:17:46 -0600 Subject: [PATCH 1/5] Bump gradle and dependencies --- build.gradle | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 6 +++--- gradlew.bat | 2 +- grgit-core/gradle/dependency-locks/compile.lockfile | 12 ------------ .../dependency-locks/compileClasspath.lockfile | 2 +- grgit-core/gradle/dependency-locks/default.lockfile | 13 ------------- grgit-core/gradle/dependency-locks/runtime.lockfile | 12 ------------ .../dependency-locks/runtimeClasspath.lockfile | 2 +- .../gradle/dependency-locks/testCompile.lockfile | 12 ------------ .../dependency-locks/testCompileClasspath.lockfile | 6 +++--- .../gradle/dependency-locks/testRuntime.lockfile | 13 ------------- .../dependency-locks/testRuntimeClasspath.lockfile | 8 ++++---- grgit-gradle/.stutter/java11.lock | 3 ++- grgit-gradle/.stutter/{java9.lock => java13.lock} | 5 +---- grgit-gradle/.stutter/java8.lock | 3 ++- grgit-gradle/build.gradle | 6 +++--- .../compatTestCompileClasspath.lockfile | 4 ++-- .../compatTestRuntimeClasspath.lockfile | 4 ++-- .../dependency-locks/compileClasspath.lockfile | 2 +- .../gradle/dependency-locks/default.lockfile | 12 ------------ .../dependency-locks/runtimeClasspath.lockfile | 2 +- .../dependency-locks/testCompileClasspath.lockfile | 2 +- .../dependency-locks/testRuntimeClasspath.lockfile | 2 +- settings.gradle | 3 --- 25 files changed, 31 insertions(+), 108 deletions(-) delete mode 100644 grgit-core/gradle/dependency-locks/compile.lockfile delete mode 100644 grgit-core/gradle/dependency-locks/default.lockfile delete mode 100644 grgit-core/gradle/dependency-locks/runtime.lockfile delete mode 100644 grgit-core/gradle/dependency-locks/testCompile.lockfile delete mode 100644 grgit-core/gradle/dependency-locks/testRuntime.lockfile rename grgit-gradle/.stutter/{java9.lock => java13.lock} (66%) delete mode 100644 grgit-gradle/gradle/dependency-locks/default.lockfile diff --git a/build.gradle b/build.gradle index 38aa9464..e538d730 100644 --- 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 index 7c4388a9..5028f28f 100644 --- 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 index b0d6d0ab..83f2acfd 100755 --- 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 index 15e1ee37..24467a14 100644 --- 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 deleted file mode 100644 index b76f2468..00000000 --- a/grgit-core/gradle/dependency-locks/compile.lockfile +++ /dev/null @@ -1,12 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 -com.jcraft:jzlib:1.1.1 -commons-codec:commons-codec:1.9 -commons-logging:commons-logging:1.2 -org.apache.httpcomponents:httpclient:4.5.2 -org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r -org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/compileClasspath.lockfile b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile index 51ccb455..b150e1fe 100644 --- 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 deleted file mode 100644 index 070fec01..00000000 --- a/grgit-core/gradle/dependency-locks/default.lockfile +++ /dev/null @@ -1,13 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 -com.jcraft:jzlib:1.1.1 -commons-codec:commons-codec:1.9 -commons-logging:commons-logging:1.2 -org.apache.httpcomponents:httpclient:4.5.2 -org.apache.httpcomponents:httpcore:4.4.4 -org.codehaus.groovy:groovy:2.5.0 -org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r -org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/runtime.lockfile b/grgit-core/gradle/dependency-locks/runtime.lockfile deleted file mode 100644 index b76f2468..00000000 --- a/grgit-core/gradle/dependency-locks/runtime.lockfile +++ /dev/null @@ -1,12 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 -com.jcraft:jzlib:1.1.1 -commons-codec:commons-codec:1.9 -commons-logging:commons-logging:1.2 -org.apache.httpcomponents:httpclient:4.5.2 -org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r -org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile b/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile index de1d2b85..9ed987eb 100644 --- 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 deleted file mode 100644 index b76f2468..00000000 --- a/grgit-core/gradle/dependency-locks/testCompile.lockfile +++ /dev/null @@ -1,12 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 -com.jcraft:jzlib:1.1.1 -commons-codec:commons-codec:1.9 -commons-logging:commons-logging:1.2 -org.apache.httpcomponents:httpclient:4.5.2 -org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r -org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile b/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile index ce9b0486..52a98448 100644 --- 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 deleted file mode 100644 index dfc6faff..00000000 --- a/grgit-core/gradle/dependency-locks/testRuntime.lockfile +++ /dev/null @@ -1,13 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 -com.jcraft:jzlib:1.1.1 -commons-codec:commons-codec:1.9 -commons-logging:commons-logging:1.2 -org.apache.httpcomponents:httpclient:4.5.2 -org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r -org.slf4j:slf4j-api:1.8.0-beta2 -org.slf4j:slf4j-simple:1.8.0-beta2 diff --git a/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile index ef569152..6f3b9c4c 100644 --- 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 index 234b053d..c4280bc3 100644 --- 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 b/grgit-gradle/.stutter/java13.lock similarity index 66% rename from grgit-gradle/.stutter/java9.lock rename to grgit-gradle/.stutter/java13.lock index cef29240..e0ca0593 100644 --- a/grgit-gradle/.stutter/java9.lock +++ b/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 index cb92afd3..15b4047e 100644 --- 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 index 0513f349..383aa2e0 100644 --- 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 index fec788d7..98ab7557 100644 --- 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 index fec788d7..98ab7557 100644 --- 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 index de1d2b85..9ed987eb 100644 --- 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 deleted file mode 100644 index b76f2468..00000000 --- a/grgit-gradle/gradle/dependency-locks/default.lockfile +++ /dev/null @@ -1,12 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 -com.jcraft:jzlib:1.1.1 -commons-codec:commons-codec:1.9 -commons-logging:commons-logging:1.2 -org.apache.httpcomponents:httpclient:4.5.2 -org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r -org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile index de1d2b85..9ed987eb 100644 --- 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 index de1d2b85..9ed987eb 100644 --- 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 diff --git a/grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile index de1d2b85..9ed987eb 100644 --- a/grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.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/settings.gradle b/settings.gradle index 8935c8cd..99c8daca 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,6 +2,3 @@ rootProject.name = 'grgit' include 'grgit-core' include 'grgit-gradle' - -enableFeaturePreview('STABLE_PUBLISHING') -enableFeaturePreview('IMPROVED_POM_SUPPORT') From 43711c510a79afba7b6c9526f037652e91dd302d Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Thu, 14 Nov 2019 20:20:59 -0600 Subject: [PATCH 2/5] Add a basic GitHub build workflow --- .github/workflows/build.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/build.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 00000000..00250d0f --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,18 @@ +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 }} + - run: "./gradlew check" From a17c3621e7c5c57f392f9862d7d934640c9fedea Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Thu, 14 Nov 2019 21:51:44 -0600 Subject: [PATCH 3/5] Add a GitHub release workflow --- .github/workflows/build.yaml | 3 ++- .github/workflows/release.yaml | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/release.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 00250d0f..fadf7fd3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,4 +15,5 @@ jobs: - uses: "actions/setup-java@master" with: java-version: ${{ matrix.java }} - - run: "./gradlew check" + - name: "Gradle check" + run: "./gradlew check" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 00000000..604074c2 --- /dev/null +++ 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_PASSWORD: ${{ secrets.BINTRAY_PASSWORD }} + 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" From 43ed120aef42e73ee38c06708a0ef06886d22e6a Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Thu, 14 Nov 2019 21:52:02 -0600 Subject: [PATCH 4/5] Remove Circle CI --- .circleci/config.yml | 81 -------------------------------------------- 1 file changed, 81 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 18c2b116..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,81 +0,0 @@ -############################################################################### -# Anchors for common settings -############################################################################### -defaults: &defaults - steps: - - checkout - - restore_cache: - keys: - - v2-gradle-caches-{{ checksum "gradle/dependency-locks/runtimeClasspath.lockfile" }} - - attach_workspace: - at: "." - - run: - name: Compile and test - command: ./gradlew clean check --continue - - save_cache: - paths: - - "~/.gradle/caches" - key: v2-gradle-caches-{{ checksum "gradle/dependency-locks/runtimeClasspath.lockfile" }} - - store_test_results: - path: "~/gradle-test-results" - when: always -branches-and-tags: &branches-and-tags - filters: - branches: - ignore: - - gh-pages - tags: - only: /^\d+\.\d+\.\d+(?:-.+)?$/ -tags-only: &tags-only - filters: - branches: - ignore: /.*/ - tags: - only: /^\d+\.\d+\.\d+(?:-.+)?$/ - -############################################################################### -# Jobs -############################################################################### -version: 2 -jobs: - build-java-8: - <<: *defaults - docker: - - image: ajoberstar/circleci-openjdk-gradle:8-jdk - build-java-11: - <<: *defaults - docker: - - image: ajoberstar/circleci-openjdk-gradle:11-jdk - publish: - docker: - - image: ajoberstar/circleci-openjdk-gradle:8-jdk - steps: - - checkout - - restore_cache: - keys: - - v2-gradle-caches-{{ checksum "gradle/dependency-locks/runtimeClasspath.lockfile" }} - - run: - name: Decrypt Gradle properties - command: openssl enc -d -aes256 -base64 -in gradle.properties.enc -out gradle.properties -pass 'pass:$GRADLE_PROPS_KEY' - - run: - name: Publish Artifacts - command: ./gradlew publish publishPlugins -############################################################################### -# Workflows -############################################################################### -workflows: - version: 2 - main: - jobs: - - build-java-8: - <<: *branches-and-tags - - build-java-11: - <<: *branches-and-tags - requires: - - build-java-8 - - publish: - <<: *tags-only - requires: - - build-java-8 - - build-java-11 - context: ajoberstar From 92afffbee10ca8608e84459dd6dfc8875d674572 Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Thu, 14 Nov 2019 21:54:02 -0600 Subject: [PATCH 5/5] Fix name of Bintray secret --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 604074c2..3990973c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -26,6 +26,6 @@ jobs: - name: "Gradle publish" env: BINTRAY_USER: ${{ secrets.BINTRAY_USER }} - BINTRAY_PASSWORD: ${{ secrets.BINTRAY_PASSWORD }} + 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"