--- a/ui/common/build.gradle.kts	Tue Sep 16 15:21:10 2025 -0400
+++ b/ui/common/build.gradle.kts	Mon May 26 17:49:20 2025 -0400
@@ -29,7 +29,11 @@
 }
 
 kotlin {
-    androidTarget()
+    androidLibrary {
+        namespace = "com.geekorum.aboutoss.ui.common"
+        withHostTestBuilder {  }
+        withDeviceTestBuilder {  }
+    }
 
     jvm("desktop")
 
@@ -51,12 +55,25 @@
             api(libs.jetbrains.androidx.lifecycle.viewmodel)
             api(compose.components.resources)
             implementation(compose.runtime)
+            api(compose.ui)
         }
 
         androidMain.dependencies {
             api(libs.androidx.activity)
             implementation(libs.androidx.activity.compose)
         }
+
+        named("androidHostTest") {
+            dependencies {
+                implementation(libs.junit)
+            }
+        }
+        named("androidDeviceTest") {
+            dependencies {
+                implementation(libs.androidx.test.ext.junit)
+                implementation(libs.espresso.core)
+            }
+        }
     }
 }
 
@@ -64,6 +81,7 @@
     publicResClass = true
 }
 
+/*
 android {
     namespace = "com.geekorum.aboutoss.ui.common"
 
@@ -89,11 +107,9 @@
         }
     }
 }
+*/
 
 dependencies {
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.test.ext.junit)
-    androidTestImplementation(libs.espresso.core)
     "androidMainApi"(libs.geekdroid) {
         exclude("androidx.compose.material3")
     }