prepare 1.2.1 release

.circleci/config.yml

@@ -10,22 +10,12 @@ workflows:
       - build-linux
       - test-linux:
           name: Java 8 - Linux - OpenJDK
-          docker-image: circleci/openjdk:8
-          requires:
-            - build-linux
-      - test-linux:
-          name: Java 9 - Linux - OpenJDK
-          docker-image: circleci/openjdk:9
-          requires:
-            - build-linux
-      - test-linux:
-          name: Java 10 - Linux - OpenJDK
-          docker-image: circleci/openjdk:10
+          docker-image: cimg/openjdk:8.0
           requires:
             - build-linux
       - test-linux:
           name: Java 11 - Linux - OpenJDK
-          docker-image: circleci/openjdk:11
+          docker-image: cimg/openjdk:11.0
           with-coverage: true
           requires:
             - build-linux
@@ -37,7 +27,7 @@ workflows:
 jobs:
   build-linux:
     docker:
-      - image: circleci/openjdk:8u131-jdk # To match the version pre-installed in Ubuntu 16 and used by Jenkins for releasing 
+      - image: cimg/openjdk:8.0
     steps:
       - checkout
       - run: cp gradle.properties.example gradle.properties

.ldrelease/config.yml

@@ -1,3 +1,5 @@
+version: 2
+
 repo:
   public: java-sdk-common
   private: java-sdk-common-private
@@ -8,8 +10,11 @@ publications:
   - url: https://javadoc.io/doc/com.launchdarkly/launchdarkly-java-sdk-common
     description: documentation (javadoc.io)
 
-template:
-  name: gradle
+jobs:
+  - docker:
+      image: gradle:6.8.3-jdk11
+    template:
+      name: gradle
 
 documentation:
-  githubPages: true
+  gitHubPages: true

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to the LaunchDarkly SDK Java Common Code
 
-LaunchDarkly has published an [SDK contributor's guide](https://docs.launchdarkly.com/docs/sdk-contributors-guide) that provides a detailed explanation of how our SDKs work. See below for additional information on how to contribute to this project.
+LaunchDarkly has published an [SDK contributor's guide](https://docs.launchdarkly.com/sdk/concepts/contributors-guide) that provides a detailed explanation of how our SDKs work. See below for additional information on how to contribute to this project.
 
 ## Submitting bug reports and feature requests
 

README.md

@@ -20,7 +20,7 @@ See [Contributing](https://github.com/launchdarkly/dotnet-sdk-common/blob/master
     * Gradually roll out a feature to an increasing percentage of users, and track the effect that the feature has on key metrics (for instance, how likely is a user to complete a purchase if they have feature A versus feature B?).
     * Turn off a feature that you realize is causing performance problems in production, without needing to re-deploy, or even restart the application with a changed configuration file.
     * Grant access to certain features based on user attributes, like payment plan (eg: users on the ‘gold’ plan get access to more features than users in the ‘silver’ plan). Disable parts of your application to facilitate maintenance, without taking everything offline.
-* LaunchDarkly provides feature flag SDKs for a wide variety of languages and technologies. Check out [our documentation](https://docs.launchdarkly.com/docs) for a complete list.
+* LaunchDarkly provides feature flag SDKs for a wide variety of languages and technologies. Read [our documentation](https://docs.launchdarkly.com/sdk) for a complete list.
 * Explore LaunchDarkly
     * [launchdarkly.com](https://www.launchdarkly.com/ "LaunchDarkly Main Website") for more information
     * [docs.launchdarkly.com](https://docs.launchdarkly.com/  "LaunchDarkly Documentation") for our documentation and SDK reference guides

build-android.gradle

@@ -24,7 +24,11 @@ repositories {
     google()
 }
 
-apply from: 'build-shared.gradle'
+allprojects {
+    group = ProjectValues.groupId
+    version = "${version}"  // from gradle.properties
+    archivesBaseName = ProjectValues.artifactId
+}
 
 android {
     compileSdkVersion 26
@@ -59,16 +63,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"
+dependencies {  // see Dependencies.kt in buildSrc
+    // See note in Dependencies.kt in buildSrc 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.
+    Libs.privateImplementation.each { implementation(it) }
+    Libs.javaTestImplementation.each { testImplementation(it) }
+    Libs.androidTestImplementation.each { androidTestImplementation(it) }
 }

build.gradle.kts

@@ -1,6 +1,4 @@
 import java.time.Duration
-import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.gradle.external.javadoc.CoreJavadocOptions
 
 // These values come from gradle.properties
 val ossrhUsername: String by project
@@ -13,16 +11,9 @@ buildscript {
     }
 }
 
-plugins {
-    java
-    "java-library"
-    checkstyle
-    signing
-    "maven-publish"
-    idea
-    jacoco
-    id("de.marcphilipp.nexus-publish") version "0.3.0"
-    id("io.codearte.nexus-staging") version "0.30.0"
+plugins {  // see Dependencies.kt in buildSrc
+    Libs.javaBuiltInGradlePlugins.forEach { id(it) }
+    Libs.javaExtGradlePlugins.forEach { (n, v) -> id(n) version v }
 }
 
 repositories {
@@ -32,139 +23,71 @@ repositories {
     mavenCentral()
 }
 
-apply { from("build-shared.gradle") }
+configurations.all {
+    // check for updates every build for dependencies with: 'changing: true'
+    resolutionStrategy.cacheChangingModulesFor(0, "seconds")
+}
+
+base {
+    group = ProjectValues.groupId
+    archivesBaseName = ProjectValues.artifactId
+    version = version
+}
 
 java {
     withJavadocJar()
     withSourcesJar()
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}
+
+// See Dependencies.kt in buildSrc for the purpose of "privateImplementation"
+val privateImplementation by configurations.creating
+
+dependencies {  // see Dependencies.kt in buildSrc
+    Libs.privateImplementation.forEach { privateImplementation(it)}
+    Libs.javaTestImplementation.forEach { testImplementation(it) }
 }
 
 checkstyle {
     configFile = file("${project.rootDir}/checkstyle.xml")
 }
 
 tasks.compileJava {
-    // See note in build-shared.gradle on the purpose of "privateImplementation"
-    classpath = configurations["privateImplementation"]
-}
-
-tasks.javadoc.configure {
-    // Force the Javadoc build to fail if there are any Javadoc warnings. See: https://discuss.gradle.org/t/javadoc-fail-on-warning/18141/3
-    // See JDK-8200363 (https://bugs.openjdk.java.net/browse/JDK-8200363)
-    // for information about the -Xwerror option.
-    (options as CoreJavadocOptions).addStringOption("Xwerror")
-
-    // See note in build-shared.gradle on the purpose of "privateImplementation"
+    // See note in Dependencies.kt in buildSrc on "privateImplementation"
     classpath = configurations["privateImplementation"]
 }
 
-tasks.test.configure {
-    testLogging {
-        events("passed", "skipped", "failed", "standardOut", "standardError")
-        showStandardStreams = true
-        exceptionFormat = TestExceptionFormat.FULL
-    }
-}
-
-tasks.jacocoTestReport.configure {
-    reports {
-        xml.isEnabled = true
-        csv.isEnabled = true
-        html.isEnabled = true
-    }
-}
+helpers.Javadoc.configureTask(tasks.javadoc, configurations["privateImplementation"])  // see Javadoc.kt in buildSrc
 
-tasks.jacocoTestCoverageVerification.configure {
-    // See notes in CONTRIBUTING.md on code coverage. Unfortunately we can't configure line-by-line code
-    // coverage overrides within the source code itself, because Jacoco operates on bytecode.
-    violationRules {
-        val knownMissedLinesForMethods = mapOf(
-            "EvaluationReason.error(com.launchdarkly.sdk.EvaluationReason.ErrorKind)" to 1,
-            "EvaluationReasonTypeAdapter.parse(com.google.gson.stream.JsonReader)" to 1,
-            "LDValue.equals(java.lang.Object)" to 1,
-            "LDValueTypeAdapter.read(com.google.gson.stream.JsonReader)" to 1,
-            "json.JsonSerialization.getDeserializableClasses()" to -1,
-            "json.LDGson.LDTypeAdapter.write(com.google.gson.stream.JsonWriter, java.lang.Object)" to 1,
-            "json.LDJackson.GsonReaderToJacksonParserAdapter.peekInternal()" to 3
-        )
-
-        knownMissedLinesForMethods.forEach { (signature, maxMissedLines) ->
-            if (maxMissedLines > 0) {  // < 0 means skip entire method
-                rule {
-                    element = "METHOD"
-                    includes = listOf("com.launchdarkly.sdk." + signature)
-                    limit {
-                        counter = "LINE"
-                        value = "MISSEDCOUNT"
-                        maximum = maxMissedLines.toBigDecimal()
-                    }
-                }
-            }
-        }
-
-        // General rule that we should expect 100% test coverage; exclude any methods that have overrides above
-        rule {
-            element = "METHOD"
-            limit {
-                counter = "LINE"
-                value = "MISSEDCOUNT"
-                maximum = 0.toBigDecimal()
-            }
-            excludes = knownMissedLinesForMethods.map { (signature, maxMissedLines) ->
-                "com.launchdarkly.sdk." + signature }
-        }
-    }
-}
+helpers.Test.configureTask(tasks.compileTestJava, tasks.test,
+    configurations["privateImplementation"])  // see Test.kt in buildSrc
 
-idea {
-    module {
-        isDownloadJavadoc = true
-        isDownloadSources = true
-    }
-}
+helpers.Jacoco.configureTasks(  // see Jacoco.kt in buildSrc
+    tasks.jacocoTestReport,
+    tasks.jacocoTestCoverageVerification
+)
 
-nexusStaging {
-    packageGroup = "com.launchdarkly"
-    numberOfRetries = 40 // we've seen extremely long delays in closing repositories
-}
+helpers.Idea.configure(idea)
 
 publishing {
     publications {
         create<MavenPublication>("mavenJava") {
             from(components["java"])
 
-            groupId = "com.launchdarkly"
-            artifactId = "launchdarkly-java-sdk-common"
-
-            pom {
-                name.set("launchdarkly-java-sdk-common")
-                description.set("LaunchDarkly SDK Java Common Classes")
-                url.set("https://github.com/launchdarkly/java-sdk-common")
-                licenses {
-                    license {
-                        name.set("The Apache License, Version 2.0")
-                        url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-                    }
-                }
-                developers {
-                    developer {
-                        name.set("LaunchDarkly")
-                        email.set("[email protected]")
-                    }
-                }
-                scm {
-                    connection.set("scm:git:git://github.com/launchdarkly/java-sdk-common.git")
-                    developerConnection.set("scm:git:ssh:[email protected]:launchdarkly/java-sdk-common.git")
-                    url.set("https://github.com/launchdarkly/java-sdk-common")
-                }
-            }
+            helpers.Pom.standardPom(pom)  // see Pom.kt in buildSrc
         }
     }
     repositories {
         mavenLocal()
     }
 }
 
+nexusStaging {
+    packageGroup = ProjectValues.groupId
+    numberOfRetries = 40 // we've seen extremely long delays in closing repositories
+}
+
 nexusPublishing {
     clientTimeout.set(Duration.ofMinutes(2)) // we've seen extremely long delays in creating repositories
     repositories {

buildSrc/build.gradle.kts

@@ -0,0 +1,20 @@
+
+// This build script controls the building of the shared Gradle code in
+// buildSrc. Putting code under buildSrc allows us to break it up for better
+// clarity, leaving a much simpler build script at the top level of the repo.
+
+// For the java-sdk-common project, this also allows us to share some values
+// between build.gradle.kts and build-android.gradle in a clearer way than
+// the old method of including a shared build script.
+
+// Things that are specific to this project, like dependencies, are in
+// buildSrc/src/main/kotlin. Reusable helper code that isn't specific to this
+// project is in buildSrc/src/main/kotlin/helpers.
+
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    jcenter()
+}