Have Datadog API provide a JVM module for Android consumers (#6)

JuulLabs · Aug 30, 2023 · cd7adca · cd7adca
1 parent 689df25
commit cd7adca
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 30 deletions.
diff --git a/bundled/api/bundled.api b/bundled/api/bundled.api
@@ -17,7 +17,7 @@ public final class com/juul/datadog/DatadogInitializer : com/juul/datadog/Initia
 	public fun setTrackingConsent (Lcom/juul/datadog/TrackingConsent;)V
 }
 
-public final class com/juul/datadog/DatadogLogger : com/juul/datadog/AndroidLogger {
+public final class com/juul/datadog/DatadogLogger : com/juul/datadog/JvmLogger {
 	public fun <init> (Ljava/lang/String;Lcom/juul/datadog/Logger$Level;Lcom/juul/datadog/LoggerConfiguration;)V
 	public synthetic fun <init> (Ljava/lang/String;Lcom/juul/datadog/Logger$Level;Lcom/juul/datadog/LoggerConfiguration;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun debug (Ljava/lang/String;Ljava/util/Map;Ljava/lang/Throwable;)V

diff --git a/bundled/src/androidMain/kotlin/DatadogLogger.kt b/bundled/src/androidMain/kotlin/DatadogLogger.kt
@@ -9,7 +9,7 @@ public actual class DatadogLogger actual constructor(
     name: String,
     level: Logger.Level?,
     configuration: LoggerConfiguration?,
-) : AndroidLogger {
+) : JvmLogger {
 
     private val logger: DatadogLogger = DatadogLogger.Builder()
         .setName(name)

diff --git a/bundled/src/androidMain/kotlin/PlatformLogger.kt b/bundled/src/androidMain/kotlin/PlatformLogger.kt
@@ -1,3 +1,3 @@
 package com.juul.datadog
 
-public actual typealias PlatformLogger = AndroidLogger
+public actual typealias PlatformLogger = JvmLogger
diff --git a/datadog/api/datadog.api b/datadog/api/datadog.api
@@ -1,11 +1,3 @@
-public abstract interface class com/juul/datadog/AndroidLogger : com/juul/datadog/Logger {
-	public abstract fun verbose (Ljava/lang/String;Ljava/util/Map;Ljava/lang/Throwable;)V
-}
-
-public final class com/juul/datadog/AndroidLogger$DefaultImpls {
-	public static synthetic fun verbose$default (Lcom/juul/datadog/AndroidLogger;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Throwable;ILjava/lang/Object;)V
-}
-
 public final class com/juul/datadog/Configuration {
 	public fun <init> (Ljava/lang/String;Lcom/juul/datadog/Site;Ljava/lang/String;Ljava/lang/String;Lcom/juul/datadog/Configuration$Features;Lcom/juul/datadog/Configuration$UploadFrequency;)V
 	public synthetic fun <init> (Ljava/lang/String;Lcom/juul/datadog/Site;Ljava/lang/String;Ljava/lang/String;Lcom/juul/datadog/Configuration$Features;Lcom/juul/datadog/Configuration$UploadFrequency;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -59,6 +51,14 @@ public final class com/juul/datadog/Initializer$DefaultImpls {
 	public static synthetic fun initialize$default (Lcom/juul/datadog/Initializer;Lcom/juul/datadog/TrackingConsent;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 }
 
+public abstract interface class com/juul/datadog/JvmLogger : com/juul/datadog/Logger {
+	public abstract fun verbose (Ljava/lang/String;Ljava/util/Map;Ljava/lang/Throwable;)V
+}
+
+public final class com/juul/datadog/JvmLogger$DefaultImpls {
+	public static synthetic fun verbose$default (Lcom/juul/datadog/JvmLogger;Ljava/lang/String;Ljava/util/Map;Ljava/lang/Throwable;ILjava/lang/Object;)V
+}
+
 public abstract interface class com/juul/datadog/Logger {
 	public abstract fun debug (Ljava/lang/String;Ljava/util/Map;Ljava/lang/Throwable;)V
 	public abstract fun error (Ljava/lang/String;Ljava/util/Map;Ljava/lang/Throwable;)V

diff --git a/datadog/build.gradle.kts b/datadog/build.gradle.kts
@@ -1,6 +1,4 @@
 plugins {
-    // Android plugin must be before multiplatform plugin until https://youtrack.jetbrains.com/issue/KT-34038 is fixed.
-    alias(libs.plugins.android.library)
     kotlin("multiplatform")
     alias(libs.plugins.kotlinter)
     `maven-publish`
@@ -12,16 +10,16 @@ kotlin {
 
     /* common
      * |-- js
-     * |-- mobile
-     * |   |-- android
-     * |   '-- ios
-     * '-- macos
+     * |-- macos
+     * '-- mobile
+     *     |-- ios
+     *     '-- jvm
      */
 
-    androidTarget().publishAllLibraryVariants()
     iosArm64()
     iosSimulatorArm64()
     js().browser()
+    jvm()
     macosArm64()
     macosX64()
 
@@ -32,7 +30,7 @@ kotlin {
             dependsOn(commonMain)
         }
 
-        val androidMain by getting {
+        val jvmMain by getting {
             dependsOn(mobileMain)
         }
 
@@ -61,13 +59,3 @@ kotlin {
         }
     }
 }
-
-android {
-    compileSdk = libs.versions.android.compile.get().toInt()
-    defaultConfig.minSdk = libs.versions.android.min.get().toInt()
-    namespace = "com.juul.datadog"
-    lint {
-        abortOnError = true
-        warningsAsErrors = true
-    }
-}
diff --git a/...g/src/androidMain/kotlin/AndroidLogger.kt → datadog/src/jvmMain/kotlin/JvmLogger.kt b/...g/src/androidMain/kotlin/AndroidLogger.kt → datadog/src/jvmMain/kotlin/JvmLogger.kt
@@ -1,5 +1,5 @@
 package com.juul.datadog
 
-public interface AndroidLogger : Logger {
+public interface JvmLogger : Logger {
     public fun verbose(message: String, attributes: Map<String, Any?>? = null, throwable: Throwable? = null)
 }
diff --git a/...g/src/androidMain/kotlin/PlatformError.kt → datadog/src/jvmMain/kotlin/PlatformError.kt b/...g/src/androidMain/kotlin/PlatformError.kt → datadog/src/jvmMain/kotlin/PlatformError.kt