Skip to content
This repository has been archived by the owner on Oct 20, 2023. It is now read-only.

Commit

Permalink
Upgrade to latest GrGit for groovy 2.5 support
Browse files Browse the repository at this point in the history
  • Loading branch information
@rpalcolea
rpalcolea committed Sep 23, 2018
1 parent f1ede9e commit 187f533
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 88 deletions.
11 changes: 8 additions & 3 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


plugins {
id 'nebula.plugin-plugin' version '8.1.0'
id 'nebula.plugin-plugin' version '8.1.1'
}

description 'A git implementation of the gradle-scm-plugin'
Expand All @@ -29,8 +29,13 @@ contacts {
}

dependencies {
compile 'com.netflix.nebula:gradle-scm-plugin:2.2.+'
compile 'org.ajoberstar:grgit:0.+'
compile 'com.netflix.nebula:gradle-scm-plugin:latest.release'
compile ('org.ajoberstar.grgit:grgit-gradle:3.0.0-beta.1') {
exclude group: 'org.codehaus.groovy', module: 'groovy'
}
testCompile('com.netflix.nebula:nebula-test:latest.release') {
exclude group: 'org.codehaus.groovy'
}
}

pluginBundle {
Expand Down
162 changes: 81 additions & 81 deletions dependencies.lock
View file
Original file line number Diff line number Diff line change
@@ -1,88 +1,88 @@
{
"compile": {
"com.netflix.nebula:gradle-scm-plugin": {
"locked": "2.2.0",
"requested": "2.2.+"
"locked": "4.1.0",
"requested": "latest.release"
},
"org.ajoberstar:grgit": {
"locked": "0.4.1",
"requested": "0.+"
"org.ajoberstar.grgit:grgit-gradle": {
"locked": "3.0.0-beta.1",
"requested": "3.0.0-beta.1"
}
},
"compileClasspath": {
"com.netflix.nebula:gradle-scm-plugin": {
"locked": "2.2.0",
"requested": "2.2.+"
"locked": "4.1.0",
"requested": "latest.release"
},
"org.ajoberstar:grgit": {
"locked": "0.4.1",
"requested": "0.+"
"org.ajoberstar.grgit:grgit-gradle": {
"locked": "3.0.0-beta.1",
"requested": "3.0.0-beta.1"
}
},
"default": {
"com.netflix.nebula:gradle-scm-plugin": {
"locked": "2.2.0",
"requested": "2.2.+"
"locked": "4.1.0",
"requested": "latest.release"
},
"org.ajoberstar:grgit": {
"locked": "0.4.1",
"requested": "0.+"
"org.ajoberstar.grgit:grgit-gradle": {
"locked": "3.0.0-beta.1",
"requested": "3.0.0-beta.1"
}
},
"integTestCompile": {
"com.netflix.nebula:gradle-scm-plugin": {
"locked": "2.2.0",
"requested": "2.2.+"
"locked": "4.1.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.1",
"requested": "6.+"
"locked": "7.1.0",
"requested": "latest.release"
},
"org.ajoberstar:grgit": {
"locked": "0.4.1",
"requested": "0.+"
"org.ajoberstar.grgit:grgit-gradle": {
"locked": "3.0.0-beta.1",
"requested": "3.0.0-beta.1"
}
},
"integTestCompileClasspath": {
"com.netflix.nebula:gradle-scm-plugin": {
"locked": "2.2.0",
"requested": "2.2.+"
"locked": "4.1.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.1",
"requested": "6.+"
"locked": "7.1.0",
"requested": "latest.release"
},
"org.ajoberstar:grgit": {
"locked": "0.4.1",
"requested": "0.+"
"org.ajoberstar.grgit:grgit-gradle": {
"locked": "3.0.0-beta.1",
"requested": "3.0.0-beta.1"
}
},
"integTestRuntime": {
"com.netflix.nebula:gradle-scm-plugin": {
"locked": "2.2.0",
"requested": "2.2.+"
"locked": "4.1.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.1",
"requested": "6.+"
"locked": "7.1.0",
"requested": "latest.release"
},
"org.ajoberstar:grgit": {
"locked": "0.4.1",
"requested": "0.+"
"org.ajoberstar.grgit:grgit-gradle": {
"locked": "3.0.0-beta.1",
"requested": "3.0.0-beta.1"
}
},
"integTestRuntimeClasspath": {
"com.netflix.nebula:gradle-scm-plugin": {
"locked": "2.2.0",
"requested": "2.2.+"
"locked": "4.1.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.1",
"requested": "6.+"
"locked": "7.1.0",
"requested": "latest.release"
},
"org.ajoberstar:grgit": {
"locked": "0.4.1",
"requested": "0.+"
"org.ajoberstar.grgit:grgit-gradle": {
"locked": "3.0.0-beta.1",
"requested": "3.0.0-beta.1"
}
},
"jacocoAgent": {
Expand All @@ -97,78 +97,78 @@
},
"runtime": {
"com.netflix.nebula:gradle-scm-plugin": {
"locked": "2.2.0",
"requested": "2.2.+"
"locked": "4.1.0",
"requested": "latest.release"
},
"org.ajoberstar:grgit": {
"locked": "0.4.1",
"requested": "0.+"
"org.ajoberstar.grgit:grgit-gradle": {
"locked": "3.0.0-beta.1",
"requested": "3.0.0-beta.1"
}
},
"runtimeClasspath": {
"com.netflix.nebula:gradle-scm-plugin": {
"locked": "2.2.0",
"requested": "2.2.+"
"locked": "4.1.0",
"requested": "latest.release"
},
"org.ajoberstar:grgit": {
"locked": "0.4.1",
"requested": "0.+"
"org.ajoberstar.grgit:grgit-gradle": {
"locked": "3.0.0-beta.1",
"requested": "3.0.0-beta.1"
}
},
"testCompile": {
"com.netflix.nebula:gradle-scm-plugin": {
"locked": "2.2.0",
"requested": "2.2.+"
"locked": "4.1.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.1",
"requested": "6.+"
"locked": "7.1.0",
"requested": "latest.release"
},
"org.ajoberstar:grgit": {
"locked": "0.4.1",
"requested": "0.+"
"org.ajoberstar.grgit:grgit-gradle": {
"locked": "3.0.0-beta.1",
"requested": "3.0.0-beta.1"
}
},
"testCompileClasspath": {
"com.netflix.nebula:gradle-scm-plugin": {
"locked": "2.2.0",
"requested": "2.2.+"
"locked": "4.1.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.1",
"requested": "6.+"
"locked": "7.1.0",
"requested": "latest.release"
},
"org.ajoberstar:grgit": {
"locked": "0.4.1",
"requested": "0.+"
"org.ajoberstar.grgit:grgit-gradle": {
"locked": "3.0.0-beta.1",
"requested": "3.0.0-beta.1"
}
},
"testRuntime": {
"com.netflix.nebula:gradle-scm-plugin": {
"locked": "2.2.0",
"requested": "2.2.+"
"locked": "4.1.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.1",
"requested": "6.+"
"locked": "7.1.0",
"requested": "latest.release"
},
"org.ajoberstar:grgit": {
"locked": "0.4.1",
"requested": "0.+"
"org.ajoberstar.grgit:grgit-gradle": {
"locked": "3.0.0-beta.1",
"requested": "3.0.0-beta.1"
}
},
"testRuntimeClasspath": {
"com.netflix.nebula:gradle-scm-plugin": {
"locked": "2.2.0",
"requested": "2.2.+"
"locked": "4.1.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.1",
"requested": "6.+"
"locked": "7.1.0",
"requested": "latest.release"
},
"org.ajoberstar:grgit": {
"locked": "0.4.1",
"requested": "0.+"
"org.ajoberstar.grgit:grgit-gradle": {
"locked": "3.0.0-beta.1",
"requested": "3.0.0-beta.1"
}
}
}
8 changes: 5 additions & 3 deletions plugin.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ apply plugin: 'nebula-plugin'
apply plugin: 'gradle-dependency-lock'

dependencies {
compile 'com.netflix.nebula:gradle-scm-plugin:2.2.+'
compile 'org.ajoberstar:grgit:0.+'
testCompile('com.netflix.nebula:nebula-test:2.2.+') {
compile 'com.netflix.nebula:gradle-scm-plugin:latest.release'
compile ('org.ajoberstar.grgit:grgit-gradle:3.0.0-beta.1') {
exclude group: 'org.codehaus.groovy', module: 'groovy'
}
testCompile('com.netflix.nebula:nebula-test:latest.release') {
exclude group: 'org.codehaus.groovy'
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/nebula/plugin/scm/git/providers/GitProvider.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class GitProvider extends ScmProvider {
Grgit repo

GitProvider(String rootDirectory) {
repo = Grgit.open(rootDirectory)
repo = Grgit.open(dir: rootDirectory)
}

@Override
Expand Down

0 comments on commit 187f533

Please sign in to comment.