Skip to content

Commit

Permalink
Merge pull request #268 from ajoberstar/prep
Browse files Browse the repository at this point in the history
Prep for 3.0
  • Loading branch information
ajoberstar authored Nov 13, 2018
2 parents 133e096 + 4138218 commit 6a5d6b9
Show file tree
Hide file tree
Showing 18 changed files with 63 additions and 46 deletions.
16 changes: 14 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'org.ajoberstar.defaults' version '0.12.0'
id 'org.jbake.site' version '1.0.0'
id 'org.jbake.site' version '1.3.0'
}

apply from: 'gradle/locking.gradle'
Expand All @@ -10,13 +10,25 @@ allprojects {
group = 'org.ajoberstar.grgit'
description = 'The Groovy way to use Git.'

plugins.withId('java') {
plugins.withId('java-library') {
sourceCompatibility = 8

repositories {
mavenCentral()
}
}

// workaround for groovy plugin not supporting java-library
plugins.withId('groovy') {
configurations {
apiElements {
outgoing.variants.getByName('classes').artifact(
file: compileGroovy.destinationDir,
type: ArtifactTypeDefinition.JVM_CLASS_DIRECTORY,
builtBy: compileGroovy)
}
}
}
}

jbake {
Expand Down
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-4.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-rc-2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 2 additions & 1 deletion grgit-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
plugins {
id 'java-library'
id 'groovy'
}

Expand All @@ -13,7 +14,7 @@ dependencies {
compileOnly 'org.codehaus.groovy:groovy-all:[2.5.0, 2.6.0-alpha)'

// jgit
compile 'org.eclipse.jgit:org.eclipse.jgit:latest.release'
api 'org.eclipse.jgit:org.eclipse.jgit:latest.release'

// logging
testImplementation 'org.slf4j:slf4j-api:latest.release'
Expand Down
62 changes: 31 additions & 31 deletions grgit-core/gradle/dependency-locks/compileClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,39 @@ com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
com.thoughtworks.qdox:qdox:1.12.1
commons-cli:commons-cli:1.4
info.picocli:picocli:3.5.0
info.picocli:picocli:3.7.0
jline:jline:2.14.6
junit:junit:4.12
org.apache.ant:ant-launcher:1.9.9
org.apache.ant:ant:1.9.9
org.apache.ant:ant-launcher:1.9.13
org.apache.ant:ant:1.9.13
org.apiguardian:apiguardian-api:1.0.0
org.codehaus.groovy:groovy-all:2.5.2
org.codehaus.groovy:groovy-ant:2.5.2
org.codehaus.groovy:groovy-cli-commons:2.5.2
org.codehaus.groovy:groovy-cli-picocli:2.5.2
org.codehaus.groovy:groovy-console:2.5.2
org.codehaus.groovy:groovy-datetime:2.5.2
org.codehaus.groovy:groovy-docgenerator:2.5.2
org.codehaus.groovy:groovy-groovydoc:2.5.2
org.codehaus.groovy:groovy-groovysh:2.5.2
org.codehaus.groovy:groovy-jmx:2.5.2
org.codehaus.groovy:groovy-json:2.5.2
org.codehaus.groovy:groovy-jsr223:2.5.2
org.codehaus.groovy:groovy-macro:2.5.2
org.codehaus.groovy:groovy-nio:2.5.2
org.codehaus.groovy:groovy-servlet:2.5.2
org.codehaus.groovy:groovy-sql:2.5.2
org.codehaus.groovy:groovy-swing:2.5.2
org.codehaus.groovy:groovy-templates:2.5.2
org.codehaus.groovy:groovy-test-junit5:2.5.2
org.codehaus.groovy:groovy-test:2.5.2
org.codehaus.groovy:groovy-testng:2.5.2
org.codehaus.groovy:groovy-xml:2.5.2
org.codehaus.groovy:groovy:2.5.2
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.codehaus.groovy:groovy-all:2.5.4
org.codehaus.groovy:groovy-ant:2.5.4
org.codehaus.groovy:groovy-cli-commons:2.5.4
org.codehaus.groovy:groovy-cli-picocli:2.5.4
org.codehaus.groovy:groovy-console:2.5.4
org.codehaus.groovy:groovy-datetime:2.5.4
org.codehaus.groovy:groovy-docgenerator:2.5.4
org.codehaus.groovy:groovy-groovydoc:2.5.4
org.codehaus.groovy:groovy-groovysh:2.5.4
org.codehaus.groovy:groovy-jmx:2.5.4
org.codehaus.groovy:groovy-json:2.5.4
org.codehaus.groovy:groovy-jsr223:2.5.4
org.codehaus.groovy:groovy-macro:2.5.4
org.codehaus.groovy:groovy-nio:2.5.4
org.codehaus.groovy:groovy-servlet:2.5.4
org.codehaus.groovy:groovy-sql:2.5.4
org.codehaus.groovy:groovy-swing:2.5.4
org.codehaus.groovy:groovy-templates:2.5.4
org.codehaus.groovy:groovy-test-junit5:2.5.4
org.codehaus.groovy:groovy-test:2.5.4
org.codehaus.groovy:groovy-testng: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.1.3.201810200350-r
org.hamcrest:hamcrest-core:1.3
org.junit.platform:junit-platform-commons:1.2.0
org.junit.platform:junit-platform-engine:1.2.0
org.junit.platform:junit-platform-launcher:1.2.0
org.opentest4j:opentest4j:1.1.0
org.junit.platform:junit-platform-commons:1.3.1
org.junit.platform:junit-platform-engine:1.3.1
org.junit.platform:junit-platform-launcher:1.3.1
org.opentest4j:opentest4j:1.1.1
org.slf4j:slf4j-api:1.7.2
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
org.slf4j:slf4j-api:1.7.2
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ org.codehaus.groovy:groovy-templates:2.5.2
org.codehaus.groovy:groovy-test:2.5.2
org.codehaus.groovy:groovy-xml:2.5.2
org.codehaus.groovy:groovy:2.5.2
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
org.hamcrest:hamcrest-core:1.3
org.slf4j:slf4j-api:1.7.2
org.slf4j:slf4j-api:1.8.0-beta2
org.spockframework:spock-core:1.2-groovy-2.5
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ org.codehaus.groovy:groovy-templates:2.5.2
org.codehaus.groovy:groovy-test:2.5.2
org.codehaus.groovy:groovy-xml:2.5.2
org.codehaus.groovy:groovy:2.5.2
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
org.hamcrest:hamcrest-core:1.3
org.slf4j:slf4j-api:1.8.0-beta2
org.slf4j:slf4j-simple:1.8.0-beta2
Expand Down
1 change: 1 addition & 0 deletions grgit-gradle/.stutter/java11.lock
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# DO NOT MODIFY: Generated by Stutter plugin.
5.0-rc-2
1 change: 1 addition & 0 deletions grgit-gradle/.stutter/java8.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
3.5.1
4.0
4.10.2
5.0-rc-2
1 change: 1 addition & 0 deletions grgit-gradle/.stutter/java9.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# DO NOT MODIFY: Generated by Stutter plugin.
4.2.1
4.10.2
5.0-rc-2
3 changes: 2 additions & 1 deletion grgit-gradle/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id 'java-gradle-plugin'
id 'java-library'
id 'groovy'
}

Expand All @@ -14,7 +15,7 @@ sourceSets {
dependencies {
compileOnly gradleApi()

implementation project(':grgit-core')
api project(':grgit-core')
compatTestImplementation project(':grgit-core')

compatTestCompile 'junit:junit:latest.release'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
junit:junit:4.12
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
org.hamcrest:hamcrest-core:1.3
org.slf4j:slf4j-api:1.7.2
org.spockframework:spock-core:1.1-groovy-2.4
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
junit:junit:4.12
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
org.hamcrest:hamcrest-core:1.3
org.slf4j:slf4j-api:1.7.2
org.spockframework:spock-core:1.1-groovy-2.4
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
org.slf4j:slf4j-api:1.7.2
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
org.slf4j:slf4j-api:1.7.2
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
org.slf4j:slf4j-api:1.7.2
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
org.eclipse.jgit:org.eclipse.jgit:5.1.1.201809181055-r
org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
org.slf4j:slf4j-api:1.7.2

0 comments on commit 6a5d6b9

Please sign in to comment.