From 035de1bfc3f3bf642f487ac59f5b32b192e7ab96 Mon Sep 17 00:00:00 2001 From: jijisv Date: Wed, 16 Sep 2020 10:50:10 +0100 Subject: [PATCH] upgrade gradle to latest version --- build.gradle | 4 ---- gradle/wrapper/gradle-wrapper.properties | 2 +- micro-async-data-loader/build.gradle | 1 - micro-async-data-writer/build.gradle | 1 - micro-couchbase/build.gradle | 1 - micro-curator/build.gradle | 2 +- 6 files changed, 2 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 3eab0c1b4..d4b678dfd 100644 --- a/build.gradle +++ b/build.gradle @@ -63,7 +63,3 @@ subprojects { } -task wrapper(type: Wrapper) { - gradleVersion = '2.14.1' -} - diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 994ef2076..738dba9f4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip diff --git a/micro-async-data-loader/build.gradle b/micro-async-data-loader/build.gradle index ba787936c..08a5d844c 100644 --- a/micro-async-data-loader/build.gradle +++ b/micro-async-data-loader/build.gradle @@ -10,7 +10,6 @@ dependencies { compile project(':micro-manifest-comparator') testCompile project(':micro-grizzly-with-jersey') testCompile project(':micro-couchbase') - testCompile 'com.github.johnmcclean-aol:couchbasemock:master' } modifyPom { diff --git a/micro-async-data-writer/build.gradle b/micro-async-data-writer/build.gradle index b73fd425e..d0fe1d84f 100644 --- a/micro-async-data-writer/build.gradle +++ b/micro-async-data-writer/build.gradle @@ -10,7 +10,6 @@ dependencies { compile project(':micro-manifest-comparator') testCompile project(':micro-grizzly-with-jersey') testCompile project(':micro-couchbase') - testCompile 'com.github.johnmcclean-aol:couchbasemock:master' } modifyPom { diff --git a/micro-couchbase/build.gradle b/micro-couchbase/build.gradle index 6f071f952..3b7e1b0da 100644 --- a/micro-couchbase/build.gradle +++ b/micro-couchbase/build.gradle @@ -18,7 +18,6 @@ dependencies { } testCompile group: 'com.cyrusinnovation', name: 'mockito-groovy-support', version: '1.3' testCompile 'cglib:cglib-nodep:2.2' - testCompile 'com.github.johnmcclean-aol:couchbasemock:master' testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: hamcrestVersion testCompile project(':micro-grizzly-with-jersey') } diff --git a/micro-curator/build.gradle b/micro-curator/build.gradle index 9dc97a953..803f4b622 100644 --- a/micro-curator/build.gradle +++ b/micro-curator/build.gradle @@ -12,7 +12,7 @@ sourceSets { } task integTest(type: Test) { - testClassesDir = sourceSets.integTest.output.classesDir + testClassesDirs = sourceSets.integTest.output.classesDirs classpath = sourceSets.integTest.runtimeClasspath }