Skip to content
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.

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

[FSSDK-10505] chore: reflection issue resolved for java 17.0 #552

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 15 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions core-api/build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 6 additions & 3 deletions core-httpclient-impl/build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Loading