Skip to content
This repository was archived by the owner on May 30, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
db568d4
initial implementation of Java common SDK code (#1)
eli-darkly Mar 20, 2020
374e08e
stick with Java 7 for Android compatibility (#2)
eli-darkly Apr 15, 2020
f1b9cb4
add getters to EvaluationReason and hide its subclasses
eli-darkly Apr 20, 2020
e86ced3
completely remove EvaluationReason subclasses
eli-darkly Apr 20, 2020
a8d1a91
Merge pull request #3 from launchdarkly/eb/ch74282/hide-reason-subcla…
eli-darkly Apr 20, 2020
0ff060b
Merge pull request #4 from launchdarkly/eb/ch74282/remove-reason-subc…
eli-darkly Apr 20, 2020
d440fd0
add JSON helpers, better serialization logic, and Gson adapter
eli-darkly Apr 20, 2020
04eaf1a
javadoc fixes
eli-darkly Apr 21, 2020
433a1e7
remove @since tags, misc doc fixes, add note about changelogging
eli-darkly Apr 21, 2020
55e3c1b
Merge branch 'eb/ch74370/javadoc-since' into eb/ch73994/gson-interop
eli-darkly Apr 21, 2020
fe6f0eb
fix sample code
eli-darkly Apr 22, 2020
97a8fa3
rename Gson adapter, use factory method
eli-darkly Apr 22, 2020
2c5cc2b
Merge pull request #5 from launchdarkly/eb/ch74370/javadoc-since
eli-darkly Apr 22, 2020
511c9e2
improve and rigorously test equals() for all immutable types
eli-darkly Apr 24, 2020
525daa6
simplifying
eli-darkly Apr 24, 2020
3e222c3
simplifying
eli-darkly Apr 24, 2020
d003179
make EvaluationDetail non-nullable + use boolean singletons
eli-darkly Apr 24, 2020
b810cd7
hide Gson in pom
eli-darkly Apr 24, 2020
129d5b6
doc additions
eli-darkly Apr 24, 2020
0ab6d7c
Merge pull request #8 from launchdarkly/eb/ch74915/non-null-index
eli-darkly Apr 27, 2020
36d3fba
Merge pull request #6 from launchdarkly/eb/ch73994/gson-interop
eli-darkly Apr 27, 2020
939b879
Merge branch 'master' into eb/ch68094/test-equals
eli-darkly Apr 27, 2020
6136698
javadoc fixes
eli-darkly Apr 27, 2020
fa2dd6c
Merge branch 'master' into eb/ch68094/test-equals
eli-darkly Apr 27, 2020
9bd6dbb
Merge pull request #7 from launchdarkly/eb/ch68094/test-equals
eli-darkly Apr 28, 2020
5458738
add Jackson adapter (#9)
eli-darkly Apr 28, 2020
5635a1d
more predictable exception behavior for LDValue.parse()
eli-darkly Apr 28, 2020
4ac7396
Merge pull request #11 from launchdarkly/eb/ch73994/parse-exception
eli-darkly Apr 28, 2020
21e9167
fix the JSON behavior of EvaluationDetail (#10)
eli-darkly Apr 28, 2020
7c29e7b
maximize and enforce test coverage (#12)
eli-darkly Apr 28, 2020
7a2aa77
build and test in Android! (#13)
eli-darkly Apr 29, 2020
aa9f794
Merge branch 'master' of github.com:launchdarkly/java-sdk-common
eli-darkly Apr 29, 2020
d5c3b0d
ensure real nulls can't be stored in an LDValue
eli-darkly May 23, 2020
9e200fb
clean up some unnecessary coverage warnings
eli-darkly May 23, 2020
08f2b21
Merge pull request #15 from launchdarkly/eb/ch77641/null-safety
eli-darkly May 27, 2020
8fbc7a0
more convenient location for coverage reports
eli-darkly May 27, 2020
fbe209b
remove rc1 from changelog
eli-darkly Jun 1, 2020
7f83233
Merge branch 'master' of github.com:launchdarkly/java-sdk-common
eli-darkly Jun 2, 2020
ac4a2cd
Removed the guides link
bwoskow-ld Feb 3, 2021
1cad8c5
Use Android machine image for CircleCI Android tests. (#17)
gwhelanLD Mar 30, 2021
17f0b0b
improve Gson integration using reader/writer delegation + add LDValue…
eli-darkly Mar 30, 2021
96931b3
add LDValue.arrayOf() + misc javadoc fixes
eli-darkly Mar 30, 2021
99c51e9
Merge pull request #19 from launchdarkly/eb/ch104357/array-of
eli-darkly Mar 30, 2021
b468c4e
javadoc fix
eli-darkly Apr 8, 2021
a5abd08
add validation of javadoc build in CI
eli-darkly Apr 8, 2021
1e11684
add another Eclipse metadata exclusion to .gitignore
eli-darkly Apr 8, 2021
bceedef
Merge pull request #21 from launchdarkly/eb/ch105283/check-javadoc
eli-darkly Apr 8, 2021
3a8aa98
partially revert ch103941 fix that doesn't work in the Java SDK
eli-darkly Apr 14, 2021
3f02d6d
Merge pull request #22 from launchdarkly/eb/ch103941/revert-gson-adapter
eli-darkly Apr 14, 2021
36fe80f
unrevert some JSON improvements from previous revert
eli-darkly Apr 16, 2021
cfdece2
Merge pull request #23 from launchdarkly/eb/ch103941/json-partial-unr…
eli-darkly Apr 17, 2021
9d50c7e
improve Gson integration using reader/writer delegation - take 2
eli-darkly Apr 19, 2021
df89903
Merge pull request #24 from launchdarkly/eb/ch103941/gson-adapter-fix
eli-darkly Apr 21, 2021
b8ace9b
better Jackson adapter + misc JSON test improvements (#18)
eli-darkly Apr 21, 2021
cd9525e
omit redundant method call (this commit was mistakenly left out of th…
eli-darkly Apr 21, 2021
62c6988
merge from public after release
LaunchDarklyCI Apr 22, 2021
f5680a1
Merge branch 'master' of github.com:launchdarkly/java-sdk-common
eli-darkly Apr 22, 2021
08c734f
avoid unnecessarily adding ".0" to JSON numbers (#25)
eli-darkly Apr 22, 2021
3dbe3f2
merge from public after release
LaunchDarklyCI Apr 22, 2021
6a5a5f6
update Gradle to 6.8.3
eli-darkly May 5, 2021
113c27d
Merge pull request #26 from launchdarkly/eb/ch104534/gradle-update
eli-darkly May 5, 2021
b91dd33
Kotlinize main build script
eli-darkly May 5, 2021
9088dff
rm obsolete comments
eli-darkly May 5, 2021
41a846b
Merge pull request #27 from launchdarkly/eb/ch107687/gradle-kotlin
eli-darkly May 6, 2021
b5c338e
bump Jackson compile-time dependency to 2.10.5.1 due to CVE-2020-2564…
eli-darkly Jun 14, 2021
b9116a8
exclude Gson & Jackson from published dependencies in a more correct …
eli-darkly Jun 14, 2021
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
10 changes: 9 additions & 1 deletion build-android.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.0'
classpath 'com.android.tools.build:gradle:4.2.0'
}
}
// This Gradle script is used only when we are running tests in an Android environment to verify
Expand Down Expand Up @@ -60,6 +60,14 @@ android {
}

dependencies {
// See note in build-shared.gradle on the purpose of "privateImplementation". The
// Android Gradle plugin doesn't seem to have a good way to customize the classpath
// of the compile and test tasks, but since we're not actually publishing any
// Android artifacts from this project (we use this build only for CI testing), we
// can simply copy the dependencies from "privateImplementation" into the standard
// "implementation" for the Android build.
implementation configurations.privateImplementation

androidTestImplementation "junit:junit:4.12"
androidTestImplementation "org.hamcrest:hamcrest-library:1.3"
androidTestImplementation "com.android.support.test:runner:1.0.2"
Expand Down
29 changes: 24 additions & 5 deletions build-shared.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,36 @@ ext {

ext.versions = [
"gson": "2.7",
"jackson": "2.10.0"
"jacksonCore": "2.10.5",
"jacksonDatabind": "2.10.5.1"
]

ext.libraries = [:]

configurations {
privateImplementation
}

dependencies {
// Dependencies will not be exposed in the pom - see below in pom.withXml block
implementation "com.google.code.gson:gson:${versions.gson}"
implementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
// The Gson and Jackson dependencies go into a custom configuration here, instead of
// the regular "implementation" configuration. We don't want them to be visible at
// all in the module's published dependencies - not even in "runtime" scope - because:
//
// 1. For Gson: While java-sdk-common does need Gson in order to work, the
// LaunchDarkly SDKs that use java-sdk-common have different strategies for packaging
// Gson. The Android SDK exposes it as a regular dependency; the Java server-side SDK
// embeds and shades Gson and does not expose it as a dependency. So we are leaving
// it up to the SDK to provide Gson in some way.
//
// 2. For Jackson: The SDKs do not use, require, or embed Jackson; we provide the
// LDJackson class as a convenience for applications that do use Jackson, and it is
// only usable if the application already has Jackson in its classpath. So we do not
// want Jackson to show up as a transitive dependency.
privateImplementation "com.google.code.gson:gson:${versions.gson}"
privateImplementation "com.fasterxml.jackson.core:jackson-core:${versions.jacksonCore}"
privateImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jacksonDatabind}"

testImplementation configurations.privateImplementation
testImplementation "org.hamcrest:hamcrest-library:1.3"
testImplementation "junit:junit:4.12"
}
217 changes: 0 additions & 217 deletions build.gradle

This file was deleted.

Loading