diff --git a/build.gradle b/build.gradle index 753ae3af..ab474632 100644 --- a/build.gradle +++ b/build.gradle @@ -14,9 +14,9 @@ * limitations under the License. */ plugins { - id 'nebula.plugin-plugin' version '8.1.0' + id 'nebula.plugin-plugin' version '8.1.2' id 'nebula.optional-base' version '3.1.0' - id 'nebula.kotlin' version '1.2.70' + id 'nebula.kotlin' version '1.2.70-3' } description 'Gradle plugin to allow locking of dynamic dependency versions' @@ -41,7 +41,9 @@ dependencies { compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1' testCompile 'com.netflix.nebula:gradle-git-scm-plugin:latest.release' - testCompile 'org.ajoberstar:grgit:1.+' + testCompile ('org.ajoberstar.grgit:grgit-gradle:3.0.0-beta.1') { + exclude group: 'org.codehaus.groovy', module: 'groovy' + } // resolution rules requires at least 2.8.1, and currently DependencyLockLauncherSpec resolution-rules integration // test will fail without this diff --git a/dependencies.lock b/dependencies.lock index fb1a8e91..aa718408 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -1,15 +1,37 @@ { + "apiDependenciesMetadata": { + "com.netflix.nebula:gradle-metrics-plugin": { + "locked": "5.3.0", + "requested": "5.+" + }, + "com.netflix.nebula:gradle-scm-plugin": { + "locked": "4.1.0", + "requested": "latest.release" + }, + "com.netflix.nebula:nebula-gradle-interop": { + "locked": "1.0.1", + "requested": "latest.release" + }, + "org.codehaus.groovy.modules.http-builder:http-builder": { + "locked": "0.7.1", + "requested": "0.7.1" + }, + "org.jetbrains.kotlin:kotlin-stdlib-jdk7": { + "locked": "1.2.70", + "requested": "1.2.70" + } + }, "compile": { "com.netflix.nebula:gradle-metrics-plugin": { "locked": "5.3.0", "requested": "5.+" }, "com.netflix.nebula:gradle-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:nebula-gradle-interop": { - "locked": "0.6.0", + "locked": "1.0.1", "requested": "latest.release" }, "org.codehaus.groovy.modules.http-builder:http-builder": { @@ -27,11 +49,11 @@ "requested": "5.+" }, "com.netflix.nebula:gradle-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:nebula-gradle-interop": { - "locked": "0.6.0", + "locked": "1.0.1", "requested": "latest.release" }, "org.codehaus.groovy.modules.http-builder:http-builder": { @@ -49,11 +71,11 @@ "requested": "5.+" }, "com.netflix.nebula:gradle-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:nebula-gradle-interop": { - "locked": "0.6.0", + "locked": "1.0.1", "requested": "latest.release" }, "org.codehaus.groovy.modules.http-builder:http-builder": { @@ -71,7 +93,7 @@ "requested": "2.8.+" }, "com.netflix.nebula:gradle-git-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:gradle-metrics-plugin": { @@ -79,20 +101,20 @@ "requested": "5.+" }, "com.netflix.nebula:gradle-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:nebula-gradle-interop": { - "locked": "0.6.0", + "locked": "1.0.1", "requested": "latest.release" }, "com.netflix.nebula:nebula-test": { - "locked": "6.7.1", - "requested": "6.+" + "locked": "7.1.0", + "requested": "7.+" }, - "org.ajoberstar:grgit": { - "locked": "1.9.3", - "requested": "1.+" + "org.ajoberstar.grgit:grgit-gradle": { + "locked": "3.0.0-beta.1", + "requested": "3.0.0-beta.1" }, "org.codehaus.groovy.modules.http-builder:http-builder": { "locked": "0.7.1", @@ -109,7 +131,7 @@ "requested": "2.8.+" }, "com.netflix.nebula:gradle-git-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:gradle-metrics-plugin": { @@ -117,20 +139,20 @@ "requested": "5.+" }, "com.netflix.nebula:gradle-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:nebula-gradle-interop": { - "locked": "0.6.0", + "locked": "1.0.1", "requested": "latest.release" }, "com.netflix.nebula:nebula-test": { - "locked": "6.7.1", - "requested": "6.+" + "locked": "7.1.0", + "requested": "7.+" }, - "org.ajoberstar:grgit": { - "locked": "1.9.3", - "requested": "1.+" + "org.ajoberstar.grgit:grgit-gradle": { + "locked": "3.0.0-beta.1", + "requested": "3.0.0-beta.1" }, "org.codehaus.groovy.modules.http-builder:http-builder": { "locked": "0.7.1", @@ -147,7 +169,7 @@ "requested": "2.8.+" }, "com.netflix.nebula:gradle-git-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:gradle-metrics-plugin": { @@ -155,20 +177,20 @@ "requested": "5.+" }, "com.netflix.nebula:gradle-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:nebula-gradle-interop": { - "locked": "0.6.0", + "locked": "1.0.1", "requested": "latest.release" }, "com.netflix.nebula:nebula-test": { - "locked": "6.7.1", - "requested": "6.+" + "locked": "7.1.0", + "requested": "7.+" }, - "org.ajoberstar:grgit": { - "locked": "1.9.3", - "requested": "1.+" + "org.ajoberstar.grgit:grgit-gradle": { + "locked": "3.0.0-beta.1", + "requested": "3.0.0-beta.1" }, "org.codehaus.groovy.modules.http-builder:http-builder": { "locked": "0.7.1", @@ -185,7 +207,7 @@ "requested": "2.8.+" }, "com.netflix.nebula:gradle-git-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:gradle-metrics-plugin": { @@ -193,20 +215,20 @@ "requested": "5.+" }, "com.netflix.nebula:gradle-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:nebula-gradle-interop": { - "locked": "0.6.0", + "locked": "1.0.1", "requested": "latest.release" }, "com.netflix.nebula:nebula-test": { - "locked": "6.7.1", - "requested": "6.+" + "locked": "7.1.0", + "requested": "7.+" }, - "org.ajoberstar:grgit": { - "locked": "1.9.3", - "requested": "1.+" + "org.ajoberstar.grgit:grgit-gradle": { + "locked": "3.0.0-beta.1", + "requested": "3.0.0-beta.1" }, "org.codehaus.groovy.modules.http-builder:http-builder": { "locked": "0.7.1", @@ -244,11 +266,11 @@ "requested": "5.+" }, "com.netflix.nebula:gradle-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:nebula-gradle-interop": { - "locked": "0.6.0", + "locked": "1.0.1", "requested": "latest.release" }, "org.codehaus.groovy.modules.http-builder:http-builder": { @@ -266,11 +288,11 @@ "requested": "5.+" }, "com.netflix.nebula:gradle-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:nebula-gradle-interop": { - "locked": "0.6.0", + "locked": "1.0.1", "requested": "latest.release" }, "org.codehaus.groovy.modules.http-builder:http-builder": { @@ -288,7 +310,7 @@ "requested": "2.8.+" }, "com.netflix.nebula:gradle-git-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:gradle-metrics-plugin": { @@ -296,20 +318,20 @@ "requested": "5.+" }, "com.netflix.nebula:gradle-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:nebula-gradle-interop": { - "locked": "0.6.0", + "locked": "1.0.1", "requested": "latest.release" }, "com.netflix.nebula:nebula-test": { - "locked": "6.7.1", - "requested": "6.+" + "locked": "7.1.0", + "requested": "7.+" }, - "org.ajoberstar:grgit": { - "locked": "1.9.3", - "requested": "1.+" + "org.ajoberstar.grgit:grgit-gradle": { + "locked": "3.0.0-beta.1", + "requested": "3.0.0-beta.1" }, "org.codehaus.groovy.modules.http-builder:http-builder": { "locked": "0.7.1", @@ -326,7 +348,7 @@ "requested": "2.8.+" }, "com.netflix.nebula:gradle-git-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:gradle-metrics-plugin": { @@ -334,20 +356,20 @@ "requested": "5.+" }, "com.netflix.nebula:gradle-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:nebula-gradle-interop": { - "locked": "0.6.0", + "locked": "1.0.1", "requested": "latest.release" }, "com.netflix.nebula:nebula-test": { - "locked": "6.7.1", - "requested": "6.+" + "locked": "7.1.0", + "requested": "7.+" }, - "org.ajoberstar:grgit": { - "locked": "1.9.3", - "requested": "1.+" + "org.ajoberstar.grgit:grgit-gradle": { + "locked": "3.0.0-beta.1", + "requested": "3.0.0-beta.1" }, "org.codehaus.groovy.modules.http-builder:http-builder": { "locked": "0.7.1", @@ -364,7 +386,7 @@ "requested": "2.8.+" }, "com.netflix.nebula:gradle-git-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:gradle-metrics-plugin": { @@ -372,20 +394,20 @@ "requested": "5.+" }, "com.netflix.nebula:gradle-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:nebula-gradle-interop": { - "locked": "0.6.0", + "locked": "1.0.1", "requested": "latest.release" }, "com.netflix.nebula:nebula-test": { - "locked": "6.7.1", - "requested": "6.+" + "locked": "7.1.0", + "requested": "7.+" }, - "org.ajoberstar:grgit": { - "locked": "1.9.3", - "requested": "1.+" + "org.ajoberstar.grgit:grgit-gradle": { + "locked": "3.0.0-beta.1", + "requested": "3.0.0-beta.1" }, "org.codehaus.groovy.modules.http-builder:http-builder": { "locked": "0.7.1", @@ -402,7 +424,7 @@ "requested": "2.8.+" }, "com.netflix.nebula:gradle-git-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:gradle-metrics-plugin": { @@ -410,20 +432,20 @@ "requested": "5.+" }, "com.netflix.nebula:gradle-scm-plugin": { - "locked": "3.0.1", + "locked": "4.1.0", "requested": "latest.release" }, "com.netflix.nebula:nebula-gradle-interop": { - "locked": "0.6.0", + "locked": "1.0.1", "requested": "latest.release" }, "com.netflix.nebula:nebula-test": { - "locked": "6.7.1", - "requested": "6.+" + "locked": "7.1.0", + "requested": "7.+" }, - "org.ajoberstar:grgit": { - "locked": "1.9.3", - "requested": "1.+" + "org.ajoberstar.grgit:grgit-gradle": { + "locked": "3.0.0-beta.1", + "requested": "3.0.0-beta.1" }, "org.codehaus.groovy.modules.http-builder:http-builder": { "locked": "0.7.1", diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockCommitLauncherSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockCommitLauncherSpec.groovy index 412743c4..810c2b69 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockCommitLauncherSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockCommitLauncherSpec.groovy @@ -218,7 +218,7 @@ class DependencyLockCommitLauncherSpec extends IntegrationSpec { } private finishGitSetup(List patterns) { - def project = Grgit.open(projectDir.absolutePath) + def project = Grgit.open(dir: projectDir.absolutePath) project.reset(commit: 'HEAD', mode: ResetOp.Mode.SOFT) project.add(patterns: patterns) project.commit(message: 'test setup')