Skip to content

Commit 3e92d81

Browse files
ajoberstarajoberstar
authored
Merge pull request #145 from ajoberstar/upgrade
General Upgrades
2 parents b9a8e6e + 60725b4 commit 3e92d81

25 files changed

+392
-260
lines changed

‎.github/workflows/build.yaml

+24-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,38 @@
1+
name: Build
12
on:
23
push:
34
branches:
4-
- master
5+
- main
56
pull_request:
67
jobs:
78
check:
89
runs-on: ubuntu-latest
910
strategy:
1011
matrix:
11-
java: [8, 11]
12+
java: [8, 11, 15]
1213
fail-fast: false
1314
steps:
14-
- uses: "actions/checkout@master"
15-
- uses: "actions/setup-java@master"
15+
- name: "Checkout repo"
16+
uses: "actions/checkout@v2"
17+
with:
18+
fetch-depth: 0
19+
- name: "Setup Java ${{ matrix.java }}"
20+
uses: "actions/setup-java@v1"
1621
with:
1722
java-version: ${{ matrix.java }}
23+
- name: "Validate Gradle Wrapper"
24+
uses: gradle/wrapper-validation-action@v1
25+
- name: "Cache Gradle wrapper"
26+
uses: "actions/cache@v2"
27+
with:
28+
path: |
29+
~/.gradle/wrapper
30+
~/.gradle/notifications
31+
key: "gradle-wrapper-${{ runner.os }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}"
32+
- name: "Cache Gradle dependencies"
33+
uses: "actions/cache@v2"
34+
with:
35+
path: "~/.gradle/caches"
36+
key: "gradle-caches-${{ runner.os }}-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}"
1837
- name: "Gradle check"
19-
run: "./gradlew check"
38+
run: "./gradlew check --continue"

‎.github/workflows/release.yaml

+42-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
name: Release
12
on:
23
push:
34
tags:
@@ -7,22 +8,57 @@ jobs:
78
runs-on: ubuntu-latest
89
strategy:
910
matrix:
10-
java: [8, 11]
11+
java: [8, 11, 15]
1112
fail-fast: false
1213
steps:
13-
- uses: "actions/checkout@master"
14-
- uses: "actions/setup-java@master"
14+
- name: "Checkout repo"
15+
uses: "actions/checkout@v2"
16+
with:
17+
fetch-depth: 0
18+
- name: "Setup Java ${{ matrix.java }}"
19+
uses: "actions/setup-java@v1"
1520
with:
1621
java-version: ${{ matrix.java }}
17-
- run: "./gradlew check --continue"
22+
- name: "Validate Gradle Wrapper"
23+
uses: gradle/wrapper-validation-action@v1
24+
- name: "Cache Gradle wrapper"
25+
uses: "actions/cache@v2"
26+
with:
27+
path: |
28+
~/.gradle/wrapper
29+
~/.gradle/notifications
30+
key: "gradle-wrapper-${{ runner.os }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}"
31+
- name: "Cache Gradle dependencies"
32+
uses: "actions/cache@v2"
33+
with:
34+
path: "~/.gradle/caches"
35+
key: "gradle-caches-${{ runner.os }}-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}"
36+
- name: "Gradle check"
37+
run: "./gradlew check --continue"
1838
publish:
1939
runs-on: ubuntu-latest
2040
needs: check
2141
steps:
22-
- uses: "actions/checkout@master"
23-
- uses: "actions/setup-java@master"
42+
- name: "Checkout repo"
43+
uses: "actions/checkout@v2"
44+
with:
45+
fetch-depth: 0
46+
- name: "Setup Java"
47+
uses: "actions/setup-java@v1"
2448
with:
2549
java-version: 8
50+
- name: "Cache Gradle wrapper"
51+
uses: "actions/cache@v2"
52+
with:
53+
path: |
54+
~/.gradle/wrapper
55+
~/.gradle/notifications
56+
key: "gradle-wrapper-${{ runner.os }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}"
57+
- name: "Cache Gradle dependencies"
58+
uses: "actions/cache@v2"
59+
with:
60+
path: "~/.gradle/caches"
61+
key: "gradle-caches-${{ runner.os }}-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}"
2662
- name: "Gradle publish"
2763
env:
2864
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}

‎build.gradle

+31-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,42 @@
11
plugins {
2-
id 'org.ajoberstar.defaults' version '0.15.1-rc.1'
3-
id 'org.ajoberstar.stutter' version '0.5.1'
2+
id 'org.ajoberstar.grgit'
3+
id 'org.ajoberstar.reckon'
44
}
55

6+
apply from: 'gradle/spotless.gradle'
67
apply from: 'gradle/locking.gradle'
78
apply from: 'gradle/bintray.gradle'
89

10+
reckon {
11+
scopeFromProp()
12+
stageFromProp('alpha', 'beta', 'rc', 'final')
13+
}
14+
915
allprojects {
1016
group = 'org.ajoberstar.reckon'
17+
18+
plugins.withId('java-library') {
19+
sourceCompatibility = 8
20+
21+
repositories {
22+
jcenter()
23+
}
24+
25+
java {
26+
withSourcesJar()
27+
withJavadocJar()
28+
}
29+
30+
plugins.withId('maven-publish') {
31+
publishing {
32+
publications {
33+
main(MavenPublication) {
34+
from components.java
35+
}
36+
}
37+
}
38+
}
39+
}
1140
}
1241

1342
ext.grgitVersion = '[4.0.0,5.0.0)'

‎gradle.properties.enc

-3
This file was deleted.

‎gradle/spotless.gradle

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
allprojects {
2+
plugins.withId('com.diffplug.spotless') {
3+
spotless {
4+
plugins.withId('java') {
5+
java {
6+
importOrder 'java', 'javax', ''
7+
removeUnusedImports()
8+
eclipse().configFile(project.rootProject.file('gradle/eclipse-java-formatter.xml'))
9+
}
10+
}
11+
plugins.withId('groovy') {
12+
format 'groovy', {
13+
target 'src/**/*.groovy'
14+
trimTrailingWhitespace()
15+
indentWithSpaces(2)
16+
endWithNewline()
17+
}
18+
}
19+
format 'gradle', {
20+
target '**/*.gradle'
21+
trimTrailingWhitespace()
22+
indentWithSpaces(2)
23+
endWithNewline()
24+
}
25+
}
26+
}
27+
}

‎gradle/wrapper/gradle-wrapper.jar

3.5 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew

+17-20
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
99
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
10+
# https://www.apache.org/licenses/LICENSE-2.0
1111
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -82,6 +82,7 @@ esac
8282

8383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
8484

85+
8586
# Determine the Java command to use to start the JVM.
8687
if [ -n "$JAVA_HOME" ] ; then
8788
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -125,10 +126,11 @@ if $darwin; then
125126
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
126127
fi
127128

128-
# For Cygwin, switch paths to Windows format before running java
129-
if $cygwin ; then
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
132134
JAVACMD=`cygpath --unix "$JAVACMD"`
133135

134136
# We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if $cygwin ; then
154156
else
155157
eval `echo args$i`="\"$arg\""
156158
fi
157-
i=$((i+1))
159+
i=`expr $i + 1`
158160
done
159161
case $i in
160-
(0) set -- ;;
161-
(1) set -- "$args0" ;;
162-
(2) set -- "$args0" "$args1" ;;
163-
(3) set -- "$args0" "$args1" "$args2" ;;
164-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
170172
esac
171173
fi
172174

@@ -175,14 +177,9 @@ save () {
175177
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176178
echo " "
177179
}
178-
APP_ARGS=$(save "$@")
180+
APP_ARGS=`save "$@"`
179181

180182
# Collect all arguments for the java command, following the shell quoting and substitution rules
181183
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
182184

183-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
184-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
185-
cd "$(dirname "$0")"
186-
fi
187-
188185
exec "$JAVACMD" "$@"

‎gradlew.bat

+8-19
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@rem you may not use this file except in compliance with the License.
66
@rem You may obtain a copy of the License at
77
@rem
8-
@rem http://www.apache.org/licenses/LICENSE-2.0
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
99
@rem
1010
@rem Unless required by applicable law or agreed to in writing, software
1111
@rem distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
2929
set APP_BASE_NAME=%~n0
3030
set APP_HOME=%DIRNAME%
3131

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
3235
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
3336
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
3437

@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
3740

3841
set JAVA_EXE=java.exe
3942
%JAVA_EXE% -version >NUL 2>&1
40-
if "%ERRORLEVEL%" == "0" goto init
43+
if "%ERRORLEVEL%" == "0" goto execute
4144

4245
echo.
4346
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
5154
set JAVA_HOME=%JAVA_HOME:"=%
5255
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5356

54-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
5558

5659
echo.
5760
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
6164

6265
goto fail
6366

64-
:init
65-
@rem Get command-line arguments, handling Windows variants
66-
67-
if not "%OS%" == "Windows_NT" goto win9xME_args
68-
69-
:win9xME_args
70-
@rem Slurp the command line arguments.
71-
set CMD_LINE_ARGS=
72-
set _SKIP=2
73-
74-
:win9xME_args_slurp
75-
if "x%~1" == "x" goto execute
76-
77-
set CMD_LINE_ARGS=%*
78-
7967
:execute
8068
@rem Setup the command line
8169

8270
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8371

72+
8473
@rem Execute Gradle
85-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
8675

8776
:end
8877
@rem End local scope for the variables with windows NT shell

‎reckon-core/build.gradle

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
plugins {
2+
id 'maven-publish'
23
id 'java-library'
34
id 'groovy'
45
}
56

6-
sourceCompatibility = 8
7-
8-
repositories {
9-
jcenter()
10-
}
11-
127
dependencies {
138
// logging
149
implementation 'org.slf4j:slf4j-api:[1.7.25,1.8.0-alpha)' // wait until final 1.8.0 is out to upgrade
@@ -23,6 +18,12 @@ dependencies {
2318
implementation 'com.github.zafarkhaja:java-semver:[0.9.0,)'
2419

2520
// testing
26-
testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
21+
testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5'
2722
testImplementation 'org.codehaus.groovy:groovy-all:[2.5,2.6-alpha)'
2823
}
24+
25+
jar {
26+
manifest {
27+
attributes 'Automatic-Module-Name': 'org.ajoberstar.reckon.core'
28+
}
29+
}

‎reckon-core/gradle/dependency-locks/compileClasspath.lockfile

+4-9
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.github.zafarkhaja:java-semver:0.9.0
5-
com.googlecode.javaewah:JavaEWAH:1.1.6
6-
com.jcraft:jsch:0.1.55
7-
com.jcraft:jzlib:1.1.1
8-
org.apache.commons:commons-lang3:3.9
9-
org.bouncycastle:bcpg-jdk15on:1.61
10-
org.bouncycastle:bcpkix-jdk15on:1.61
11-
org.bouncycastle:bcprov-jdk15on:1.61
12-
org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
13-
org.slf4j:slf4j-api:1.7.29
5+
com.googlecode.javaewah:JavaEWAH:1.1.7
6+
org.apache.commons:commons-lang3:3.11
7+
org.eclipse.jgit:org.eclipse.jgit:5.9.0.202009080501-r
8+
org.slf4j:slf4j-api:1.7.30

0 commit comments

Comments
 (0)