Skip to content

Commit 392d679

Browse files
[FSSDK-11016] chore: update gradle from 6.5 to 7.2 (#553)
Update gradle to 7.2
1 parent a763358 commit 392d679

File tree

6 files changed

+41
-26
lines changed

6 files changed

+41
-26
lines changed

.github/workflows/java.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
- name: Check on success
9191
if: always() && steps.unit_tests.outcome == 'success'
9292
run: |
93-
./gradlew coveralls uploadArchives --console plain
93+
./gradlew coveralls --console plain
9494
9595
publish:
9696
if: startsWith(github.ref, 'refs/tags/')

build.gradle

+22-14
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
plugins {
2-
id 'com.github.kt3k.coveralls' version '2.8.2'
2+
id 'com.github.kt3k.coveralls' version '2.12.2'
33
id 'jacoco'
4-
id 'me.champeau.gradle.jmh' version '0.4.5'
4+
id 'me.champeau.gradle.jmh' version '0.5.3'
55
id 'nebula.optional-base' version '3.2.0'
6-
id 'com.github.hierynomus.license' version '0.15.0'
6+
id 'com.github.hierynomus.license' version '0.16.1'
77
id 'com.github.spotbugs' version "4.5.0"
8+
id 'maven-publish'
89
}
910

1011
allprojects {
@@ -94,23 +95,30 @@ configure(publishedProjects) {
9495
}
9596

9697
dependencies {
97-
compile group: 'commons-codec', name: 'commons-codec', version: commonCodecVersion
98+
implementation group: 'commons-codec', name: 'commons-codec', version: commonCodecVersion
9899

99-
testCompile group: 'junit', name: 'junit', version: junitVersion
100-
testCompile group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
101-
testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: hamcrestVersion
102-
testCompile group: 'com.google.guava', name: 'guava', version: guavaVersion
100+
testImplementation group: 'junit', name: 'junit', version: junitVersion
101+
testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
102+
testImplementation group: 'org.hamcrest', name: 'hamcrest-all', version: hamcrestVersion
103+
testImplementation group: 'com.google.guava', name: 'guava', version: guavaVersion
103104

104105
// logging dependencies (logback)
105-
testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
106-
testCompile group: 'ch.qos.logback', name: 'logback-core', version: logbackVersion
106+
testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
107+
testImplementation group: 'ch.qos.logback', name: 'logback-core', version: logbackVersion
107108

108-
testCompile group: 'com.google.code.gson', name: 'gson', version: gsonVersion
109-
testCompile group: 'org.json', name: 'json', version: jsonVersion
110-
testCompile group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion
111-
testCompile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
109+
testImplementation group: 'com.google.code.gson', name: 'gson', version: gsonVersion
110+
testImplementation group: 'org.json', name: 'json', version: jsonVersion
111+
testImplementation group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion
112+
testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
112113
}
113114

115+
configurations.all {
116+
resolutionStrategy {
117+
force "junit:junit:${junitVersion}"
118+
}
119+
}
120+
121+
114122
def docTitle = "Optimizely Java SDK"
115123
if (name.equals('core-httpclient-impl')) {
116124
docTitle = "Optimizely Java SDK: Httpclient"

core-api/build.gradle

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
dependencies {
2-
compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
3-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jacksonVersion
4-
5-
compile group: 'com.google.code.findbugs', name: 'annotations', version: findbugsAnnotationVersion
6-
compile group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsJsrVersion
2+
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
3+
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jacksonVersion
4+
implementation group: 'com.google.code.findbugs', name: 'annotations', version: findbugsAnnotationVersion
5+
implementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsJsrVersion
6+
testImplementation group: 'junit', name: 'junit', version: junitVersion
7+
testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
78

89
// an assortment of json parsers
910
compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion, optional
@@ -12,6 +13,11 @@ dependencies {
1213
compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion, optional
1314
}
1415

16+
tasks.named('processJmhResources') {
17+
duplicatesStrategy = DuplicatesStrategy.WARN
18+
}
19+
20+
1521
test {
1622
useJUnit {
1723
excludeCategories 'com.optimizely.ab.categories.ExhaustiveTest'
@@ -24,6 +30,7 @@ task exhaustiveTest(type: Test) {
2430
}
2531
}
2632

33+
2734
task generateVersionFile {
2835
// add the build version information into a file that'll go into the distribution
2936
ext.buildVersion = new File(projectDir, "src/main/resources/optimizely-build-version")

core-httpclient-impl/build.gradle

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
dependencies {
2-
compile project(':core-api')
3-
compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion
4-
compile group: 'org.apache.httpcomponents', name: 'httpclient', version: httpClientVersion
5-
testCompile 'org.mock-server:mockserver-netty:5.1.1'
2+
implementation project(':core-api')
3+
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: httpClientVersion
4+
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
5+
implementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsJsrVersion
6+
testImplementation 'org.mock-server:mockserver-netty:5.1.1'
67
}
78

89
task exhaustiveTest {

gradle/wrapper/gradle-wrapper.jar

5.08 KB
Binary file not shown.
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Mon Sep 24 09:56:45 PDT 2018
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

0 commit comments

Comments
 (0)