From a1e44ba5b9927bfe6cb2495e2262979728f1bd94 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Tue, 17 Dec 2024 21:22:10 +0600 Subject: [PATCH 1/4] reflection issue resolved for java 17 --- gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle.properties b/gradle.properties index ef1dd8bfd..9eb80351e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,6 +8,7 @@ mavenS3Bucket = optimizely-maven org.gradle.configureondemand = true org.gradle.daemon = true org.gradle.parallel = true +org.gradle.jvmargs=--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED # Application Packages gsonVersion = 2.10.1 From 2ab35ebeaa56a1356d54d961f3a6a0f08dc73824 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Fri, 27 Dec 2024 22:16:30 +0600 Subject: [PATCH 2/4] wip: assemble command run successfully --- build.gradle | 30 ++++++++++++------------ core-api/build.gradle | 8 +++---- core-httpclient-impl/build.gradle | 9 ++++--- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index b8405e39b..f1ac05102 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ 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.spotbugs' version "4.5.0" + id 'com.github.spotbugs' version "4.7.3" } allprojects { @@ -43,8 +43,8 @@ configure(publishedProjects) { apply plugin: 'nebula.optional-base' apply plugin: 'com.github.hierynomus.license' - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 17.0 + targetCompatibility = 17.0 repositories { jcenter() @@ -94,21 +94,21 @@ 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 } def docTitle = "Optimizely Java SDK" diff --git a/core-api/build.gradle b/core-api/build.gradle index d2609a97d..f01a10dc5 100644 --- a/core-api/build.gradle +++ b/core-api/build.gradle @@ -1,9 +1,9 @@ dependencies { - compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion - compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jacksonVersion + implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion + implementation 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: 'com.google.code.findbugs', name: 'annotations', version: findbugsAnnotationVersion + implementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsJsrVersion // an assortment of json parsers compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion, optional diff --git a/core-httpclient-impl/build.gradle b/core-httpclient-impl/build.gradle index e4cdd4b99..a7fbd237c 100644 --- a/core-httpclient-impl/build.gradle +++ b/core-httpclient-impl/build.gradle @@ -1,8 +1,11 @@ dependencies { - compile project(':core-api') + implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion + implementation group: 'com.google.code.findbugs', name: 'annotations', version: findbugsAnnotationVersion + implementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsJsrVersion + implementation 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 group: 'org.apache.httpcomponents', name: 'httpclient', version: httpClientVersion + testImplementation 'org.mock-server:mockserver-netty:5.1.1' } task exhaustiveTest { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a9a50f830..5775c1baa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 24 09:56:45 PDT 2018 +#Fri Dec 27 07:11:37 BDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip From c4578f525a28afe22f42ece35dcf05746dc7ef5f Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Fri, 27 Dec 2024 22:23:20 +0600 Subject: [PATCH 3/4] wip: update gradle properties --- gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9eb80351e..ef1dd8bfd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,6 @@ mavenS3Bucket = optimizely-maven org.gradle.configureondemand = true org.gradle.daemon = true org.gradle.parallel = true -org.gradle.jvmargs=--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED # Application Packages gsonVersion = 2.10.1 From b2c590662e3b315695eb705d5a3e80f647e849b1 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Fri, 27 Dec 2024 22:26:33 +0600 Subject: [PATCH 4/4] wip: ci java version updated --- .github/workflows/build.yml | 4 ++-- .github/workflows/java.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7ba7782e..797708e31 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,10 +23,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: set up JDK 8 + - name: set up JDK 17 uses: actions/setup-java@v2 with: - java-version: '8' + java-version: '17' distribution: 'temurin' cache: gradle - name: Grant execute permission for gradlew diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 1c6c57a02..d544ae7ce 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -51,7 +51,7 @@ jobs: strategy: fail-fast: false matrix: - jdk: [8, 9] + jdk: [17, 20] optimizely_default_parser: [GSON_CONFIG_PARSER, JACKSON_CONFIG_PARSER, JSON_CONFIG_PARSER, JSON_SIMPLE_CONFIG_PARSER] steps: - name: checkout