Merge pull request #430 from aol/upgrade_gradle

upgrade gradle to latest version
aol · Sep 16, 2020 · c720086 · c720086
2 parents 07cc233 + 035de1b
commit c720086
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -12,7 +12,7 @@ sourceSets {
 }
 
 task integTest(type: Test) {
-  testClassesDir = sourceSets.integTest.output.classesDir
+  testClassesDirs = sourceSets.integTest.output.classesDirs
   classpath = sourceSets.integTest.runtimeClasspath
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,3 @@ subprojects { @@
     }
-    task wrapper(type: Wrapper) {
-      gradleVersion = '2.14.1'
-    }