wip: update to gradle 7.0

Author: muzahidul-opti

build.gradle

@@ -1,9 +1,9 @@
 plugins {
     id 'com.github.kt3k.coveralls' version '2.8.2'
     id 'jacoco'
-    id 'me.champeau.gradle.jmh' version '0.4.5'
+    id 'me.champeau.gradle.jmh' version '0.5.3'
     id 'nebula.optional-base' version '3.2.0'
-    id 'com.github.hierynomus.license' version '0.15.0'
+    id 'com.github.hierynomus.license' version '0.16.1'
     id 'com.github.spotbugs' version "4.5.0"
 }
 
@@ -94,23 +94,30 @@ configure(publishedProjects) {
     }
 
     dependencies {
-        compile group: 'commons-codec', name: 'commons-codec', version: commonCodecVersion
+        implementation group: 'commons-codec', name: 'commons-codec', version: commonCodecVersion
 
-        testCompile group: 'junit', name: 'junit', version: junitVersion
-        testCompile group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
-        testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: hamcrestVersion
-        testCompile group: 'com.google.guava', name: 'guava', version: guavaVersion
+        testImplementation group: 'junit', name: 'junit', version: junitVersion
+        testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
+        testImplementation group: 'org.hamcrest', name: 'hamcrest-all', version: hamcrestVersion
+        testImplementation group: 'com.google.guava', name: 'guava', version: guavaVersion
 
         // logging dependencies (logback)
-        testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
-        testCompile group: 'ch.qos.logback', name: 'logback-core', version: logbackVersion
+        testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
+        testImplementation group: 'ch.qos.logback', name: 'logback-core', version: logbackVersion
 
-        testCompile group: 'com.google.code.gson', name: 'gson', version: gsonVersion
-        testCompile group: 'org.json', name: 'json', version: jsonVersion
-        testCompile group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion
-        testCompile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
+        testImplementation group: 'com.google.code.gson', name: 'gson', version: gsonVersion
+        testImplementation group: 'org.json', name: 'json', version: jsonVersion
+        testImplementation group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion
+        testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
     }
 
+    configurations.all {
+        resolutionStrategy {
+            force "junit:junit:${junitVersion}"
+        }
+    }
+
+
     def docTitle = "Optimizely Java SDK"
     if (name.equals('core-httpclient-impl')) {
         docTitle = "Optimizely Java SDK: Httpclient"

core-api/build.gradle

@@ -1,9 +1,10 @@
 dependencies {
-    compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jacksonVersion
-
-    compile group: 'com.google.code.findbugs', name: 'annotations', version: findbugsAnnotationVersion
-    compile group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsJsrVersion
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jacksonVersion
+    implementation group: 'com.google.code.findbugs', name: 'annotations', version: findbugsAnnotationVersion
+    implementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsJsrVersion
+    testImplementation group: 'junit', name: 'junit', version: junitVersion
+    testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
 
     // an assortment of json parsers
     compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion, optional
@@ -12,6 +13,11 @@ dependencies {
     compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion, optional
 }
 
+tasks.named('processJmhResources') {
+    duplicatesStrategy = DuplicatesStrategy.WARN
+}
+
+
 test {
     useJUnit {
         excludeCategories 'com.optimizely.ab.categories.ExhaustiveTest'
@@ -24,6 +30,7 @@ task exhaustiveTest(type: Test) {
     }
 }
 
+
 task generateVersionFile {
     // add the build version information into a file that'll go into the distribution
     ext.buildVersion = new File(projectDir, "src/main/resources/optimizely-build-version")

core-httpclient-impl/build.gradle

@@ -1,8 +1,9 @@
 dependencies {
-    compile project(':core-api')
-    compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion
-    compile group: 'org.apache.httpcomponents', name: 'httpclient', version: httpClientVersion
-    testCompile 'org.mock-server:mockserver-netty:5.1.1'
+    implementation project(':core-api')
+    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: httpClientVersion
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
+    implementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsJsrVersion
+    testImplementation 'org.mock-server:mockserver-netty:5.1.1'
 }
 
 task exhaustiveTest {

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-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip