Skip to content

Commit

Permalink
Merge pull request #129 from ajoberstar/updates
Browse files Browse the repository at this point in the history
Update dependencies and gradle
  • Loading branch information
ajoberstar authored Nov 21, 2019
2 parents 5c1cdf3 + 20de82d commit 70a18a0
Show file tree
Hide file tree
Showing 23 changed files with 240 additions and 228 deletions.
79 changes: 0 additions & 79 deletions .circleci/config.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
on:
push:
branches:
- master
pull_request:
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 }}
- name: "Gradle check"
run: "./gradlew check"
31 changes: 31 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# reckon

[![Download](https://api.bintray.com/packages/ajoberstar/maven/reckon/images/download.svg)](https://bintray.com/ajoberstar/maven/reckon/_latestVersion)
[![CircleCI](https://circleci.com/gh/ajoberstar/reckon.svg?style=svg)](https://circleci.com/gh/ajoberstar/reckon)
![](https://github.com/ajoberstar/reckon/workflows/.github/workflows/build.yaml/badge.svg)

## Why do you care?

Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id 'org.ajoberstar.defaults' version '0.15.1-rc.1'
id 'org.ajoberstar.stutter' version '0.5.1'
}

apply from: 'gradle/locking.gradle'
Expand All @@ -9,5 +10,5 @@ allprojects {
group = 'org.ajoberstar.reckon'
}

ext.grgitVersion = '[3.0.0,4.0.0)'
ext.grgitVersion = '[4.0.0,5.0.0)'
ext.jgitVersion = '[5.0,6.0)'
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 17 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
#!/usr/bin/env sh

#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# 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
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
## Gradle start up script for UN*X
Expand Down Expand Up @@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m"'
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
18 changes: 17 additions & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@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
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
Expand All @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m"
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down
12 changes: 6 additions & 6 deletions reckon-core/gradle/dependency-locks/compileClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
# This file is expected to be part of source control.
com.github.zafarkhaja:java-semver:0.9.0
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.54
com.jcraft:jsch:0.1.55
com.jcraft:jzlib:1.1.1
org.apache.commons:commons-lang3:3.9
org.bouncycastle:bcpg-jdk15on:1.60
org.bouncycastle:bcpkix-jdk15on:1.60
org.bouncycastle:bcprov-jdk15on:1.60
org.eclipse.jgit:org.eclipse.jgit:5.3.1.201904271842-r
org.slf4j:slf4j-api:1.7.26
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.1.201910021850-r
org.slf4j:slf4j-api:1.7.29
12 changes: 6 additions & 6 deletions reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
# This file is expected to be part of source control.
com.github.zafarkhaja:java-semver:0.9.0
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.54
com.jcraft:jsch:0.1.55
com.jcraft:jzlib:1.1.1
org.apache.commons:commons-lang3:3.9
org.bouncycastle:bcpg-jdk15on:1.60
org.bouncycastle:bcpkix-jdk15on:1.60
org.bouncycastle:bcprov-jdk15on:1.60
org.eclipse.jgit:org.eclipse.jgit:5.3.1.201904271842-r
org.slf4j:slf4j-api:1.7.26
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.1.201910021850-r
org.slf4j:slf4j-api:1.7.29
62 changes: 31 additions & 31 deletions reckon-core/gradle/dependency-locks/testCompileClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,49 @@
# This file is expected to be part of source control.
com.github.zafarkhaja:java-semver:0.9.0
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.54
com.jcraft:jsch:0.1.55
com.jcraft:jzlib:1.1.1
com.thoughtworks.qdox:qdox:1.12.1
commons-cli:commons-cli:1.4
info.picocli:picocli:3.9.5
info.picocli:picocli:4.0.1
jline:jline:2.14.6
junit:junit:4.12
org.ajoberstar.grgit:grgit-core:3.1.1
org.ajoberstar.grgit:grgit-core:4.0.0
org.apache.ant:ant-launcher:1.9.13
org.apache.ant:ant:1.9.13
org.apache.commons:commons-lang3:3.9
org.apiguardian:apiguardian-api:1.0.0
org.bouncycastle:bcpg-jdk15on:1.60
org.bouncycastle:bcpkix-jdk15on:1.60
org.bouncycastle:bcprov-jdk15on:1.60
org.codehaus.groovy:groovy-all:2.5.7
org.codehaus.groovy:groovy-ant:2.5.7
org.codehaus.groovy:groovy-cli-commons:2.5.7
org.codehaus.groovy:groovy-cli-picocli:2.5.7
org.codehaus.groovy:groovy-console:2.5.7
org.codehaus.groovy:groovy-datetime:2.5.7
org.codehaus.groovy:groovy-docgenerator:2.5.7
org.codehaus.groovy:groovy-groovydoc:2.5.7
org.codehaus.groovy:groovy-groovysh:2.5.7
org.codehaus.groovy:groovy-jmx:2.5.7
org.codehaus.groovy:groovy-json:2.5.7
org.codehaus.groovy:groovy-jsr223:2.5.7
org.codehaus.groovy:groovy-macro:2.5.7
org.codehaus.groovy:groovy-nio:2.5.7
org.codehaus.groovy:groovy-servlet:2.5.7
org.codehaus.groovy:groovy-sql:2.5.7
org.codehaus.groovy:groovy-swing:2.5.7
org.codehaus.groovy:groovy-templates:2.5.7
org.codehaus.groovy:groovy-test-junit5:2.5.7
org.codehaus.groovy:groovy-test:2.5.7
org.codehaus.groovy:groovy-testng:2.5.7
org.codehaus.groovy:groovy-xml:2.5.7
org.codehaus.groovy:groovy:2.5.7
org.eclipse.jgit:org.eclipse.jgit:5.3.0.201903130848-r
org.bouncycastle:bcpg-jdk15on:1.61
org.bouncycastle:bcpkix-jdk15on:1.61
org.bouncycastle:bcprov-jdk15on:1.61
org.codehaus.groovy:groovy-all:2.5.8
org.codehaus.groovy:groovy-ant:2.5.8
org.codehaus.groovy:groovy-cli-commons:2.5.8
org.codehaus.groovy:groovy-cli-picocli:2.5.8
org.codehaus.groovy:groovy-console:2.5.8
org.codehaus.groovy:groovy-datetime:2.5.8
org.codehaus.groovy:groovy-docgenerator:2.5.8
org.codehaus.groovy:groovy-groovydoc:2.5.8
org.codehaus.groovy:groovy-groovysh:2.5.8
org.codehaus.groovy:groovy-jmx:2.5.8
org.codehaus.groovy:groovy-json:2.5.8
org.codehaus.groovy:groovy-jsr223:2.5.8
org.codehaus.groovy:groovy-macro:2.5.8
org.codehaus.groovy:groovy-nio:2.5.8
org.codehaus.groovy:groovy-servlet:2.5.8
org.codehaus.groovy:groovy-sql:2.5.8
org.codehaus.groovy:groovy-swing:2.5.8
org.codehaus.groovy:groovy-templates:2.5.8
org.codehaus.groovy:groovy-test-junit5:2.5.8
org.codehaus.groovy:groovy-test:2.5.8
org.codehaus.groovy:groovy-testng:2.5.8
org.codehaus.groovy:groovy-xml:2.5.8
org.codehaus.groovy:groovy:2.5.8
org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r
org.hamcrest:hamcrest-core:1.3
org.junit.platform:junit-platform-commons:1.4.0
org.junit.platform:junit-platform-engine:1.4.0
org.junit.platform:junit-platform-launcher:1.4.0
org.opentest4j:opentest4j:1.1.1
org.slf4j:slf4j-api:1.7.26
org.slf4j:slf4j-api:1.7.29
org.spockframework:spock-core:1.2-groovy-2.5
Loading

0 comments on commit 70a18a0

Please sign in to comment.