Merge pull request #101 from DataDog/xgouchet/RUMM-188_API19

RUMM-188 make library compatible with API-19

Author: xgouchet

.gitlab-ci.yml

@@ -30,6 +30,14 @@ analysis:ktlint:
     - git fetch --depth=1 origin master
     - ./gradlew :ktlintCheckAll
 
+analysis:android-lint:
+  tags: [ "runner:docker", "size:large" ]
+  image: $CI_IMAGE_DOCKER
+  stage: analysis
+  script:
+    - git fetch --depth=1 origin master
+    - ./gradlew :lintCheckAll
+
 analysis:detekt:
   tags: [ "runner:docker", "size:large" ]
   image: $CI_IMAGE_DOCKER

build.gradle.kts

@@ -73,6 +73,7 @@ tasks.register("checkAll") {
     dependsOn(
         "ktlintCheckAll",
         "detektAll",
+        "lintCheckAll",
         "unitTestAll",
         "jacocoReportAll",
         "instrumentTestAll"
@@ -90,6 +91,15 @@ tasks.register("ktlintCheckAll") {
     )
 }
 
+tasks.register("lintCheckAll") {
+    dependsOn(
+        ":dd-sdk-android:lintDebug",
+        ":dd-sdk-android:lintRelease",
+        ":dd-sdk-android-timber:lintDebug",
+        ":dd-sdk-android-timber:lintRelease"
+    )
+}
+
 tasks.register("detektAll") {
     dependsOn(
         ":dd-sdk-android:detekt",
@@ -115,7 +125,6 @@ tasks.register("jacocoReportAll") {
 tasks.register("instrumentTestAll") {
     dependsOn(":instrumented:integration:connectedCheck")
     dependsOn(":instrumented:benchmark:connectedCheck")
-    dependsOn(":dd-sdk-android:connectedCheck")
 }
 
 tasks.register("buildIntegrationTestsArtifacts") {

buildSrc/src/main/kotlin/com/datadog/gradle/Dependencies.kt

@@ -15,6 +15,7 @@ object Dependencies {
         const val Gson = "2.8.6"
         const val OkHttp = "3.12.6"
         const val JetpackWorkManager = "2.2.0"
+        const val AndroidXMultidex = "2.0.1"
 
         // JUnit
         const val JUnitJupiter = "5.5.2"
@@ -59,6 +60,8 @@ object Dependencies {
 
         const val OkHttp = "com.squareup.okhttp3:okhttp:${Versions.OkHttp}"
 
+        const val AndroidXMultidex = "androidx.multidex:multidex:${Versions.AndroidXMultidex}"
+
         val JetpackBenchmark = arrayOf(
             "androidx.benchmark:benchmark-junit4:${Versions.JetpackBenchmark}",
             "androidx.test.ext:junit:1.1.1"

buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt

@@ -11,7 +11,7 @@ import com.datadog.gradle.utils.Version
 object AndroidConfig {
 
     const val TARGET_SDK = 29
-    const val MIN_SDK = 21
+    const val MIN_SDK = 19
     const val BUILD_TOOLS_VERSION = "29.0.2"
 
     val VERSION = Version(1, 1, 1)

dd-sdk-android-timber/build.gradle.kts

@@ -58,6 +58,13 @@ android {
     testOptions {
         unitTests.isReturnDefaultValues = true
     }
+
+    lintOptions {
+        isWarningsAsErrors = true
+        isAbortOnError = true
+        isCheckReleaseBuilds = false
+        isCheckGeneratedSources = true
+    }
 }
 
 dependencies {

dd-sdk-android/build.gradle.kts

@@ -5,7 +5,6 @@
  */
 
 import com.datadog.gradle.Dependencies
-import com.datadog.gradle.androidTestImplementation
 import com.datadog.gradle.config.AndroidConfig
 import com.datadog.gradle.config.BuildConfigPropertiesKeys
 import com.datadog.gradle.config.GradlePropertiesKeys
@@ -49,13 +48,6 @@ android {
         targetSdkVersion(AndroidConfig.TARGET_SDK)
         versionCode = AndroidConfig.VERSION.code
         versionName = AndroidConfig.VERSION.name
-
-        testInstrumentationRunner = "androidx.benchmark.junit4.AndroidBenchmarkRunner"
-        testInstrumentationRunnerArgument("androidx.benchmark.suppressErrors",
-            "EMULATOR,UNLOCKED")
-        testInstrumentationRunnerArgument("androidx.benchmark.suppressErrors",
-            "EMULATOR,DEBUGGABLE")
-        testInstrumentationRunnerArgument("androidx.benchmark.output.enable", "true")
     }
 
     sourceSets.named("main") {
@@ -73,8 +65,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    // TODO when using Android Plugin 3.6.+
-    // enableAdditionalTestOutput=true
     testOptions {
         unitTests.isReturnDefaultValues = true
     }
@@ -102,6 +92,13 @@ android {
         exclude("META-INF/LICENSE.md")
         exclude("META-INF/LICENSE-notice.md")
     }
+
+    lintOptions {
+        isWarningsAsErrors = true
+        isAbortOnError = true
+        isCheckReleaseBuilds = false
+        isCheckGeneratedSources = true
+    }
 }
 
 dependencies {
@@ -115,11 +112,6 @@ dependencies {
     testImplementation(Dependencies.Libraries.TestTools)
     testImplementation(Dependencies.Libraries.OkHttpMock)
 
-    androidTestImplementation(project(":tools:unit"))
-    androidTestImplementation(Dependencies.Libraries.AndroidTestTools)
-    androidTestImplementation(Dependencies.Libraries.JetpackBenchmark)
-    androidTestImplementation(Dependencies.Libraries.OkHttpMock)
-
     detekt(project(":tools:detekt"))
     detekt(Dependencies.Libraries.DetektCli)
 }

dd-sdk-android/src/androidTest/AndroidManifest.xml

@@ -156,13 +156,13 @@ object Datadog {
                 logStrategy.getReader().dropAllBatches()
                 devLogger.w(
                     "$TAG: old logs targeted at $endpointUrl " +
-                            "will now be deleted"
+                        "will now be deleted"
                 )
             }
             EndpointUpdateStrategy.SEND_OLD_LOGS_TO_NEW_ENDPOINT -> {
                 devLogger.w(
                     "$TAG: old logs targeted at $endpointUrl " +
-                            "will now be sent to $endpointUrl"
+                        "will now be sent to $endpointUrl"
                 )
             }
         }
@@ -242,8 +242,8 @@ object Datadog {
     private fun checkInitialized() {
         check(initialized) {
             "Datadog has not been initialized.\n" +
-                    "Please add the following code in your application's onCreate() method:\n" +
-                    "Datadog.initialize(context, \"<CLIENT_TOKEN>\");"
+                "Please add the following code in your application's onCreate() method:\n" +
+                "Datadog.initialize(context, \"<CLIENT_TOKEN>\");"
         }
     }
 
@@ -258,10 +258,10 @@ object Datadog {
     }
 
     private fun buildOkHttpClient(endpoint: String): OkHttpClient {
-        val connectionSpec = if (endpoint.startsWith("http://")) {
-            ConnectionSpec.CLEARTEXT
-        } else {
-            ConnectionSpec.RESTRICTED_TLS
+        val connectionSpec = when {
+            endpoint.startsWith("http://") -> ConnectionSpec.CLEARTEXT
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP -> ConnectionSpec.RESTRICTED_TLS
+            else -> ConnectionSpec.MODERN_TLS
         }
         return OkHttpClient.Builder()
             .addInterceptor(NetworkTimeInterceptor(timeProvider))

dd-sdk-android/src/androidTest/kotlin/com/datadog/android/internal/file/LogFileStrategyBenchmarking.kt

@@ -6,6 +6,7 @@
 
 package com.datadog.android.core.internal.net.info
 
+import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -17,6 +18,7 @@ import android.telephony.TelephonyManager
 import com.datadog.android.core.internal.utils.sdkLogger
 
 @Suppress("DEPRECATION")
+@SuppressLint("InlinedApi")
 internal class BroadcastReceiverNetworkInfoProvider :
     BroadcastReceiver(),
     NetworkInfoProvider {