--- a/core/build.gradle.kts	Tue Sep 16 15:21:10 2025 -0400
+++ b/core/build.gradle.kts	Mon May 26 17:49:20 2025 -0400
@@ -28,7 +28,11 @@
 }
 
 kotlin {
-    androidTarget()
+    androidLibrary {
+        namespace = "com.geekorum.aboutoss.core"
+        withHostTestBuilder {  }
+        withDeviceTestBuilder {  }
+    }
 
     jvm("desktop")
 
@@ -49,9 +53,21 @@
             api(libs.kotlinx.coroutines)
             implementation(libs.kotlinx.serialization.json)
         }
+        named("androidHostTest") {
+            dependencies {
+                implementation(libs.junit)
+            }
+        }
+        named("androidDeviceTest") {
+            dependencies {
+                implementation(libs.androidx.test.ext.junit)
+                implementation(libs.espresso.core)
+            }
+        }
     }
 }
 
+/*
 android {
     namespace = "com.geekorum.aboutoss.core"
 
@@ -77,13 +93,8 @@
         }
     }
 }
-
-dependencies {
+*/
 
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.test.ext.junit)
-    androidTestImplementation(libs.espresso.core)
-}
 
 mavenPublishing {
     coordinates(groupId = group.toString(), name, version.toString())