8000 [FSSDK-11016] chore: update gradle from 6.5 to 7.2 by muzahidul-opti · Pull Request #553 · optimizely/java-sdk · GitHub
[go: up one dir, main page]
Skip to content

[FSSDK-11016] chore: update gradle from 6.5 to 7.2 #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 2, 2025
Merged

[FSSDK-11016] chore: update gradle from 6.5 to 7.2 #553

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
701569b
wip: update to gradle 7.0
muzahidul-opti Dec 30, 2024
0445eb0
wip: update to gradle 7.5
muzahidul-opti Dec 30, 2024
d2ae1ae
wip: replace uploadArchives task with publish
muzahidul-opti Dec 30, 2024
753e5a9
wip: maven publish plugin added
muzahidul-opti Dec 31, 2024
7fcb36f
wip: remove uploadArchives task
muzahidul-opti Dec 31, 2024
9ae6a01
wip: update gradle wrapper and coveralls version
muzahidul-opti Dec 31, 2024
ab8770f
update gradle version
muzahidul-opti Dec 31, 2024
1ace6e4
Update gradle wrapper
muzahidul-opti Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
wip: update to gradle 7.0
  • Loading branch information
@muzahidul-opti
muzahidul-opti committed Dec 30, 2024
commit 701569be4e638acadfcd6be9369ae9f2a578f4dc
33 changes: 20 additions & 13 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}

Expand Down Expand Up @@ -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"
Expand Down
17 changes: 12 additions & 5 deletions core-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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'
Expand All @@ -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")
Expand Down
9 changes: 5 additions & 4 deletions core-httpclient-impl/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading
0