Permalink
Browse files

Upgrade to grgit 3

This allows for Groovy 2.5 support, and thus (likely) Gradle 5 support.
The main impact to users though is the breaking changes in grgit 3.

Review those changes in the release notes.

[1] https://github.com/ajoberstar/grgit/releases/tag/3.0.0-rc.2

This fixes #58.
  • Loading branch information...
ajoberstar committed Oct 6, 2018
1 parent af6ec70 commit 490b4a2bc600b6121fb4db85da11243469fe8c05
@@ -0,0 +1 @@
# DO NOT MODIFY: Generated by Stutter plugin.
@@ -1,3 +1,3 @@
# DO NOT MODIFY: Generated by Stutter plugin.
4.3
4.8
4.10.2
@@ -4,6 +4,9 @@ plugins {
id 'java-gradle-plugin'
}
apply from: 'gradle/bintray.gradle'
apply from: 'gradle/locking.gradle'
group = 'org.ajoberstar'
repositories {
@@ -16,18 +19,18 @@ dependencyLocking {
dependencies {
// gradle
compile gradleApi()
implementation gradleApi()
// groovy
compile localGroovy()
implementation localGroovy()
// grgit
compile 'org.ajoberstar:grgit:[2.0.0,)'
compatTestCompile 'org.ajoberstar:grgit:[2.0.0,)'
implementation 'org.ajoberstar.grgit:grgit-core:latest.release'
compatTestImplementation 'org.ajoberstar.grgit:grgit-core:latest.release'
// testing
compatTestCompile gradleTestKit()
compatTestCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
compatTestImplementation gradleTestKit()
compatTestImplementation 'org.spockframework:spock-core:1.1-groovy-2.4'
}
stutter {
@@ -36,6 +39,9 @@ stutter {
java(8) {
compatibleRange '4.3'
}
java(11) {
compatibleRange '5.0'
}
}
publishing {
@@ -0,0 +1,16 @@
allprojects {
plugins.withId('maven-publish') {
publishing {
repositories {
maven {
name = 'bintray'
url = 'https://api.bintray.com/maven/ajoberstar/maven/grgit/;publish=1'
credentials {
username = System.env['BINTRAY_USER']
password = System.env['BINTRAY_KEY']
}
}
}
}
}
}
@@ -2,24 +2,11 @@
# 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.agentproxy.core:0.0.9
com.jcraft:jsch.agentproxy.jsch:0.0.9
com.jcraft:jsch.agentproxy.pageant:0.0.9
com.jcraft:jsch.agentproxy.sshagent:0.0.9
com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
junit:junit:4.12
net.java.dev.jna:jna-platform:4.1.0
net.java.dev.jna:jna:4.1.0
org.ajoberstar:grgit:2.2.1
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
org.ajoberstar.grgit:grgit-core:3.0.0-rc.2
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.hamcrest:hamcrest-core:1.3
org.slf4j:slf4j-api:1.7.2
org.spockframework:spock-core:1.1-groovy-2.4
@@ -2,24 +2,11 @@
# 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.agentproxy.core:0.0.9
com.jcraft:jsch.agentproxy.jsch:0.0.9
com.jcraft:jsch.agentproxy.pageant:0.0.9
com.jcraft:jsch.agentproxy.sshagent:0.0.9
com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
junit:junit:4.12
net.java.dev.jna:jna-platform:4.1.0
net.java.dev.jna:jna:4.1.0
org.ajoberstar:grgit:2.2.1
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
org.ajoberstar.grgit:grgit-core:3.0.0-rc.2
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.hamcrest:hamcrest-core:1.3
org.slf4j:slf4j-api:1.7.2
org.spockframework:spock-core:1.1-groovy-2.4
@@ -2,21 +2,8 @@
# 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.agentproxy.core:0.0.9
com.jcraft:jsch.agentproxy.jsch:0.0.9
com.jcraft:jsch.agentproxy.pageant:0.0.9
com.jcraft:jsch.agentproxy.sshagent:0.0.9
com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
net.java.dev.jna:jna-platform:4.1.0
net.java.dev.jna:jna:4.1.0
org.ajoberstar:grgit:2.2.1
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
org.ajoberstar.grgit:grgit-core:3.0.0-rc.2
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.slf4j:slf4j-api:1.7.2
@@ -2,21 +2,8 @@
# 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.agentproxy.core:0.0.9
com.jcraft:jsch.agentproxy.jsch:0.0.9
com.jcraft:jsch.agentproxy.pageant:0.0.9
com.jcraft:jsch.agentproxy.sshagent:0.0.9
com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
net.java.dev.jna:jna-platform:4.1.0
net.java.dev.jna:jna:4.1.0
org.ajoberstar:grgit:2.2.1
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
org.ajoberstar.grgit:grgit-core:3.0.0-rc.2
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.slf4j:slf4j-api:1.7.2
@@ -2,21 +2,8 @@
# 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.agentproxy.core:0.0.9
com.jcraft:jsch.agentproxy.jsch:0.0.9
com.jcraft:jsch.agentproxy.pageant:0.0.9
com.jcraft:jsch.agentproxy.sshagent:0.0.9
com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
net.java.dev.jna:jna-platform:4.1.0
net.java.dev.jna:jna:4.1.0
org.ajoberstar:grgit:2.2.1
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
org.ajoberstar.grgit:grgit-core:3.0.0-rc.2
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.slf4j:slf4j-api:1.7.2
@@ -2,21 +2,8 @@
# 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.agentproxy.core:0.0.9
com.jcraft:jsch.agentproxy.jsch:0.0.9
com.jcraft:jsch.agentproxy.pageant:0.0.9
com.jcraft:jsch.agentproxy.sshagent:0.0.9
com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
net.java.dev.jna:jna-platform:4.1.0
net.java.dev.jna:jna:4.1.0
org.ajoberstar:grgit:2.2.1
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
org.ajoberstar.grgit:grgit-core:3.0.0-rc.2
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.slf4j:slf4j-api:1.7.2
@@ -0,0 +1,20 @@
allprojects {
plugins.withId('java-base') {
sourceSets.all { sourceSet ->
configurations[sourceSet.compileClasspathConfigurationName].resolutionStrategy.activateDependencyLocking()
configurations[sourceSet.runtimeClasspathConfigurationName].resolutionStrategy.activateDependencyLocking()
}
task lock {
doFirst {
assert gradle.startParameter.writeDependencyLocks
}
doLast {
sourceSets.all { sourceSet ->
configurations[sourceSet.compileClasspathConfigurationName].resolve()
configurations[sourceSet.runtimeClasspathConfigurationName].resolve()
}
}
}
}
}
BIN -5 Bytes (100%) gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 490b4a2

Please sign in to comment.