flashcatcloud
diff --git a/‎build.gradle.kts‎
Lines changed: 1 addition & 0 deletions b/‎build.gradle.kts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt‎
Lines changed: 2 additions & 1 deletion b/‎buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎buildSrc/src/main/kotlin/com/datadog/gradle/config/DetektCustomConfig.kt‎
Lines changed: 13 additions & 2 deletions b/‎buildSrc/src/main/kotlin/com/datadog/gradle/config/DetektCustomConfig.kt‎
Lines changed: 13 additions & 2 deletions
diff --git a/‎buildSrc/src/main/kotlin/com/datadog/gradle/config/MavenConfig.kt‎
Lines changed: 5 additions & 2 deletions b/‎buildSrc/src/main/kotlin/com/datadog/gradle/config/MavenConfig.kt‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎consumer-rules.pro‎
Lines changed: 3 additions & 0 deletions b/‎consumer-rules.pro‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎dd-sdk-android-core/api/apiSurface‎
Lines changed: 2 additions & 0 deletions b/‎dd-sdk-android-core/api/apiSurface‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎dd-sdk-android-core/api/dd-sdk-android-core.api‎
Lines changed: 5 additions & 0 deletions b/‎dd-sdk-android-core/api/dd-sdk-android-core.api‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎dd-sdk-android-core/build.gradle.kts‎
Lines changed: 7 additions & 3 deletions b/‎dd-sdk-android-core/build.gradle.kts‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎dd-sdk-android-core/src/main/kotlin/com/datadog/android/Datadog.kt‎
Lines changed: 56 additions & 0 deletions b/‎dd-sdk-android-core/src/main/kotlin/com/datadog/android/Datadog.kt‎
Lines changed: 56 additions & 0 deletions
diff --git a/‎dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/lifecycle/ProcessLifecycleCallback.kt‎
Lines changed: 3 additions & 2 deletions b/‎dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/lifecycle/ProcessLifecycleCallback.kt‎
Lines changed: 3 additions & 2 deletions
@@ -34,6 +34,7 @@ buildscript {
         classpath(libs.sqlDelightGradlePlugin)
         classpath(libs.binaryCompatibilityGradlePlugin)
         classpath(libs.kotlinxSerializationPlugin)
+        classpath(libs.shadowPlugin)
     }
 }
 
 
@@ -40,7 +40,7 @@ object AndroidConfig {
             }
             // Local development or other branches → Snapshot
             else -> {
-                Version(0, 3, 0, Version.Type.Snapshot)
+                Version(0, 3, 1, Version.Type.Snapshot)
             }
         }
     }
@@ -77,6 +77,7 @@ fun Project.androidLibraryConfig() {
 
         defaultConfig {
             minSdk = AndroidConfig.MIN_SDK
+            consumerProguardFiles("${rootDir.absolutePath}/consumer-rules.pro")
         }
 
         compileOptions {
 
@@ -122,17 +122,28 @@ fun Project.detektCustomConfig() {
                 }
             }
 
-        val externalDependencies = File("${projectDir.absolutePath}/detekt_classpath").readText()
+        val externalDependenciesFile = File("${projectDir.absolutePath}/detekt_classpath")
+        val externalDependencies = if (externalDependenciesFile.exists()) {
+            externalDependenciesFile.readText()
+        } else {
+            logger.warn("Detekt classpath file missing: ${externalDependenciesFile.path}")
+            ""
+        }
         val moduleDependenciesClasses = moduleDependencies.map {
             "${rootDir.absolutePath}${it.replace(':', '/')}/build/extracted/classes.jar"
         }.joinToString(":")
 
         val dependencies = if (moduleDependenciesClasses.isBlank()) {
             externalDependencies
         } else {
-            "$externalDependencies:$moduleDependenciesClasses"
+            if (externalDependencies.isBlank()) {
+                moduleDependenciesClasses
+            } else {
+                "$externalDependencies:$moduleDependenciesClasses"
+            }
         }
 
+
         args("-cp", dependencies)
     }
 }
@@ -95,8 +95,11 @@ fun Project.publishingConfig(
     }
 
     signingExtension.apply {
-        // Signing is required unless explicitly skipped
-        isRequired = !hasProperty("dd-skip-signing")
+        // Signing is required unless explicitly skipped or publishing to maven local
+        val isLocalPublish = gradle.startParameter.taskNames.any {
+            it.contains("publishToMavenLocal", ignoreCase = true)
+        }
+        isRequired = !hasProperty("dd-skip-signing") && !isLocalPublish
 
         val privateKey = System.getenv("GPG_PRIVATE_KEY")
         val password = System.getenv("GPG_PASSWORD")
 
@@ -1,3 +1,6 @@
 # This is needed for the Datadog Error Tracking feature to work reliably,
  # this file is used by Logs and RUM modules
 -keepattributes SourceFile,LineNumberTable
+
+# Shaded dependencies
+-keep class cloud.flashcat.shaded.** { *; }
@@ -344,6 +344,8 @@ fun <T> java.util.concurrent.Future<T>?.getSafe(String, com.datadog.android.api.
 object com.datadog.android.core.internal.utils.JsonSerializer
   fun toJsonElement(Any?): com.google.gson.JsonElement
   fun Map<String, Any?>.safeMapValuesToJson(com.datadog.android.api.InternalLogger): Map<String, com.google.gson.JsonElement>
+fun isInitialized(android.content.Context): Boolean
+fun getWorkManagerOrNull(android.content.Context): androidx.work.WorkManager?
 enum com.datadog.android.core.metrics.MethodCallSamplingRate
   constructor(Float)
   - ALL
 
@@ -890,6 +890,11 @@ public final class com/datadog/android/core/internal/utils/JsonSerializer {
 	public final fun toJsonElement (Ljava/lang/Object;)Lcom/google/gson/JsonElement;
 }
 
+public final class com/datadog/android/core/internal/utils/WorkManagerUtilsKt {
+	public static final fun getWorkManagerOrNull (Landroid/content/Context;)Landroidx/work/WorkManager;
+	public static final fun isInitialized (Landroid/content/Context;)Z
+}
+
 public final class com/datadog/android/core/metrics/MethodCallSamplingRate : java/lang/Enum {
 	public static final field ALL Lcom/datadog/android/core/metrics/MethodCallSamplingRate;
 	public static final field HIGH Lcom/datadog/android/core/metrics/MethodCallSamplingRate;
 
@@ -103,14 +103,15 @@ dependencies {
     implementation(libs.kotlin)
 
     // Network
-    implementation(libs.okHttp)
-    implementation(libs.gson)
+    compileOnly(libs.okHttp)
+    compileOnly(libs.gson)
+    implementation(project(":dd-sdk-android-dependencies"))
     implementation(libs.kronosNTP)
 
     // Android Instrumentation
     implementation(libs.androidXAnnotation)
     implementation(libs.androidXCollection)
-    implementation(libs.androidXWorkManager)
+    compileOnly(libs.androidXWorkManager)
 
     implementation(project(":dd-sdk-android-internal"))
 
@@ -130,6 +131,9 @@ dependencies {
         }
     }
     testImplementation(testFixtures(project(":dd-sdk-android-internal")))
+    testImplementation(libs.gson)
+    testImplementation(libs.okHttp)
+    testImplementation(libs.androidXWorkManager)
     testImplementation(libs.bundles.jUnit5)
     testImplementation(libs.bundles.testTools)
     unmock(libs.robolectric)
 
@@ -7,6 +7,7 @@
 package com.datadog.android
 
 import android.content.Context
+import android.util.Log
 import androidx.annotation.AnyThread
 import androidx.annotation.WorkerThread
 import com.datadog.android.Datadog.clearAccountInfo
@@ -63,6 +64,7 @@ object Datadog {
         configuration: Configuration,
         trackingConsent: TrackingConsent
     ): SdkCore? {
+        checkRuntimeDependencies()
         synchronized(registry) {
             val existing = registry.getInstance(instanceName)
             if (existing != null) {
@@ -432,6 +434,53 @@ object Datadog {
 
     // endregion
 
+    // region Internal
+
+    private fun checkRuntimeDependencies() {
+        val missingDependencies = mutableListOf<String>()
+        if (!isClassAvailable("com.google.gson.Gson")) {
+            missingDependencies.add("Gson (com.google.code.gson:gson)")
+        }
+        if (!isClassAvailable("okhttp3.OkHttpClient")) {
+            missingDependencies.add("OkHttp (com.squareup.okhttp3:okhttp)")
+        }
+
+        if (missingDependencies.isNotEmpty()) {
+            val message = MISSING_DEPENDENCIES_ERROR.format(
+                Locale.US,
+                missingDependencies.joinToString(", ")
+            )
+            android.util.Log.e("Datadog", message)
+            unboundInternalLogger.log(
+                InternalLogger.Level.ERROR,
+                InternalLogger.Target.USER,
+                { message }
+            )
+            throw IllegalStateException(message)
+        }
+
+        if (!isClassAvailable("androidx.work.WorkManager")) {
+            unboundInternalLogger.log(
+                InternalLogger.Level.WARN,
+                InternalLogger.Target.USER,
+                { WARNING_WORKMANAGER_MISSING }
+            )
+        }
+    }
+
+    private fun isClassAvailable(className: String): Boolean {
+        return try {
+            Class.forName(className)
+            true
+        } catch (e: ClassNotFoundException) {
+            false
+        } catch (e: LinkageError) {
+            false
+        }
+    }
+
+    // endregion
+
     // region Constants
 
     internal const val MESSAGE_ALREADY_INITIALIZED =
@@ -445,6 +494,13 @@ object Datadog {
     internal const val CANNOT_CREATE_SDK_INSTANCE_ID_ERROR =
         "Cannot create SDK instance ID, stopping SDK initialization."
 
+    internal const val MISSING_DEPENDENCIES_ERROR =
+        "FlashCat SDK initialization failed because of missing dependencies: %s. " +
+            "Please make sure you have added them to your app's build.gradle file."
+
+    internal const val WARNING_WORKMANAGER_MISSING =
+        "WorkManager library not found. Background upload capabilities will be disabled."
+
     internal const val DD_SOURCE_TAG = "_dd.source"
     internal const val DD_SDK_VERSION_TAG = "_dd.sdk_version"
     internal const val DD_APP_VERSION_TAG = "_dd.version"
 
@@ -10,6 +10,7 @@ import android.content.Context
 import androidx.work.WorkManager
 import com.datadog.android.api.InternalLogger
 import com.datadog.android.core.internal.utils.cancelUploadWorker
+import com.datadog.android.core.internal.utils.isInitialized
 import com.datadog.android.core.internal.utils.triggerUploadWorker
 import java.lang.ref.Reference
 import java.lang.ref.WeakReference
@@ -25,7 +26,7 @@ internal class ProcessLifecycleCallback(
 
     override fun onStarted() {
         contextWeakRef.get()?.let {
-            if (WorkManager.isInitialized()) {
+            if (isInitialized(it)) {
                 cancelUploadWorker(it, instanceName, internalLogger)
             }
         }
@@ -37,7 +38,7 @@ internal class ProcessLifecycleCallback(
 
     override fun onStopped() {
         contextWeakRef.get()?.let {
-            if (WorkManager.isInitialized()) {
+            if (isInitialized(it)) {
                 triggerUploadWorker(it, instanceName, internalLogger)
             }
         }
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ buildscript {`
`34`	`34`	`classpath(libs.sqlDelightGradlePlugin)`
`35`	`35`	`classpath(libs.binaryCompatibilityGradlePlugin)`
`36`	`36`	`classpath(libs.kotlinxSerializationPlugin)`
	`37`	`+ classpath(libs.shadowPlugin)`
`37`	`38`	`}`
`38`	`39`	`}`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ object AndroidConfig {`
`40`	`40`	`}`
`41`	`41`	`// Local development or other branches → Snapshot`
`42`	`42`	`else -> {`
`43`		`- Version(0, 3, 0, Version.Type.Snapshot)`
	`43`	`+ Version(0, 3, 1, Version.Type.Snapshot)`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`
`@@ -77,6 +77,7 @@ fun Project.androidLibraryConfig() {`
`77`	`77`
`78`	`78`	`defaultConfig {`
`79`	`79`	`minSdk = AndroidConfig.MIN_SDK`
	`80`	`+ consumerProguardFiles("${rootDir.absolutePath}/consumer-rules.pro")`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`compileOptions {`
Original file line number	Diff line number	Diff line change
`@@ -122,17 +122,28 @@ fun Project.detektCustomConfig() {`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`- val externalDependencies = File("${projectDir.absolutePath}/detekt_classpath").readText()`
	`125`	`+ val externalDependenciesFile = File("${projectDir.absolutePath}/detekt_classpath")`
	`126`	`+ val externalDependencies = if (externalDependenciesFile.exists()) {`
	`127`	`+ externalDependenciesFile.readText()`
	`128`	`+ } else {`
	`129`	`+ logger.warn("Detekt classpath file missing: ${externalDependenciesFile.path}")`
	`130`	`+ ""`
	`131`	`+ }`
`126`	`132`	`val moduleDependenciesClasses = moduleDependencies.map {`
`127`	`133`	`"${rootDir.absolutePath}${it.replace(':', '/')}/build/extracted/classes.jar"`
`128`	`134`	`}.joinToString(":")`
`129`	`135`
`130`	`136`	`val dependencies = if (moduleDependenciesClasses.isBlank()) {`
`131`	`137`	`externalDependencies`
`132`	`138`	`} else {`
`133`		`- "$externalDependencies:$moduleDependenciesClasses"`
	`139`	`+ if (externalDependencies.isBlank()) {`
	`140`	`+ moduleDependenciesClasses`
	`141`	`+ } else {`
	`142`	`+ "$externalDependencies:$moduleDependenciesClasses"`
	`143`	`+ }`
`134`	`144`	`}`
`135`	`145`
	`146`	`+`
`136`	`147`	`args("-cp", dependencies)`
`137`	`148`	`}`
`138`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import android.content.Context`
`10`	`10`	`import androidx.work.WorkManager`
`11`	`11`	`import com.datadog.android.api.InternalLogger`
`12`	`12`	`import com.datadog.android.core.internal.utils.cancelUploadWorker`
	`13`	`+import com.datadog.android.core.internal.utils.isInitialized`
`13`	`14`	`import com.datadog.android.core.internal.utils.triggerUploadWorker`
`14`	`15`	`import java.lang.ref.Reference`
`15`	`16`	`import java.lang.ref.WeakReference`
`@@ -25,7 +26,7 @@ internal class ProcessLifecycleCallback(`
`25`	`26`
`26`	`27`	`override fun onStarted() {`
`27`	`28`	`contextWeakRef.get()?.let {`
`28`		`- if (WorkManager.isInitialized()) {`
	`29`	`+ if (isInitialized(it)) {`
`29`	`30`	`cancelUploadWorker(it, instanceName, internalLogger)`
`30`	`31`	`}`
`31`	`32`	`}`
`@@ -37,7 +38,7 @@ internal class ProcessLifecycleCallback(`
`37`	`38`
`38`	`39`	`override fun onStopped() {`
`39`	`40`	`contextWeakRef.get()?.let {`
`40`		`- if (WorkManager.isInitialized()) {`
	`41`	`+ if (isInitialized(it)) {`
`41`	`42`	`triggerUploadWorker(it, instanceName, internalLogger)`
`42`	`43`	`}`
`43`	`44`	`}`