Use new plugin, desktop disabled

Author: alorma

gradle/libs.versions.toml

@@ -41,6 +41,7 @@ windowSizeClass = { module = "dev.chrisbanes.material3:material3-window-size-cla
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
+androidLibrary = { id = "com.android.library", version.ref = "agp" }
 androidKmpLibrary = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
 
 composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

samples/desktopApp/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 kotlin {
-  jvm()
+  // jvm("desktop)
 
   sourceSets {
     jvmMain.dependencies {
@@ -16,6 +16,7 @@ kotlin {
   }
 }
 
+/*
 compose.desktop {
   application {
     mainClass = "com.alorma.compose.settings.sample.shared.MainKt"
@@ -27,3 +28,4 @@ compose.desktop {
     }
   }
 }
+*/

samples/shared/build.gradle.kts

@@ -12,8 +12,13 @@ plugins {
 version = "1.0-SNAPSHOT"
 
 kotlin {
-  androidTarget()
-  jvm("desktop")
+  androidLibrary {
+    namespace = libs.versions.namespace.get() + ".samples.shared"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
+    minSdk = libs.versions.android.minSdk.get().toInt()
+  }
+
+  // jvm("desktop)
 
   js(IR) {
     browser()
@@ -73,34 +78,13 @@ kotlin {
       }
     }
 
+    /*
     val desktopMain by getting
     desktopMain.dependencies {
       api(compose.desktop.currentOs)
       implementation(compose.desktop.common)
     }
-  }
-}
-
-android {
-  namespace = libs.versions.namespace.get() + ".sample.shared"
-  compileSdk =
-    libs.versions.android.compileSdk
-      .get()
-      .toInt()
-
-  sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-  sourceSets["main"].res.srcDirs("src/androidMain/res")
-  sourceSets["main"].resources.srcDirs("src/commonMain/resources")
-
-  defaultConfig {
-    minSdk =
-      libs.versions.android.minSdkSample
-        .get()
-        .toInt()
-  }
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+     */
   }
 }
 

ui-base/build.gradle.kts

@@ -19,11 +19,13 @@ kotlin {
 
   withSourcesJar()
 
-  androidTarget {
-    publishLibraryVariants("release")
+  androidLibrary {
+    namespace = libs.versions.namespace.get() + ".ui.base"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
+    minSdk = libs.versions.android.minSdk.get().toInt()
   }
 
-  jvm("desktop")
+  // jvm("desktop)
 
   iosX64()
   iosArm64()
@@ -52,47 +54,7 @@ kotlin {
   }
 }
 
-android {
-  namespace = libs.versions.namespace.get() + ".ui.base"
-  compileSdk =
-    libs.versions.android.compileSdk
-      .get()
-      .toInt()
-
-  sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-  sourceSets["main"].res.srcDirs("src/androidMain/res")
-  sourceSets["main"].resources.srcDirs("src/commonMain/resources")
-
-  defaultConfig {
-    minSdk =
-      libs.versions.android.minSdk
-        .get()
-        .toInt()
-  }
-
-  packaging {
-    resources {
-      excludes += "/META-INF/{AL2.0,LGPL2.1}"
-    }
-  }
-  lint {
-    checkReleaseBuilds = false
-    abortOnError = false
-  }
-  buildTypes {
-    getByName("release") {
-      isMinifyEnabled = false
-    }
-  }
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-  }
-  dependencies {
-    debugImplementation(compose.uiTooling)
-  }
-}
-
+/*
 compose.desktop {
   application {
     nativeDistributions {
@@ -102,6 +64,7 @@ compose.desktop {
     }
   }
 }
+ */
 
 dependencies {
   detektPlugins(libs.compose.detekt.rules)

ui-tiles-extended/build.gradle.kts

@@ -19,11 +19,13 @@ kotlin {
 
   withSourcesJar()
 
-  androidTarget {
-    publishLibraryVariants("release")
+  androidLibrary {
+    namespace = libs.versions.namespace.get() + ".ui.extended"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
+    minSdk = libs.versions.android.minSdk.get().toInt()
   }
 
-  jvm("desktop")
+  // jvm("desktop)
 
   iosX64()
   iosArm64()
@@ -54,46 +56,7 @@ kotlin {
   }
 }
 
-android {
-  namespace = libs.versions.namespace.get() + ".ui.extended"
-  compileSdk =
-    libs.versions.android.compileSdk
-      .get()
-      .toInt()
-
-  sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-  sourceSets["main"].res.srcDirs("src/androidMain/res")
-  sourceSets["main"].resources.srcDirs("src/commonMain/resources")
-
-  defaultConfig {
-    minSdk =
-      libs.versions.android.minSdk
-        .get()
-        .toInt()
-  }
-  packaging {
-    resources {
-      excludes += "/META-INF/{AL2.0,LGPL2.1}"
-    }
-  }
-  lint {
-    checkReleaseBuilds = false
-    abortOnError = false
-  }
-  buildTypes {
-    getByName("release") {
-      isMinifyEnabled = false
-    }
-  }
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-  }
-  dependencies {
-    debugImplementation(compose.uiTooling)
-  }
-}
-
+/*
 compose.desktop {
   application {
     nativeDistributions {
@@ -103,6 +66,7 @@ compose.desktop {
     }
   }
 }
+ */
 
 dependencies {
   detektPlugins(libs.compose.detekt.rules)

ui-tiles/build.gradle.kts

@@ -19,11 +19,13 @@ kotlin {
 
   withSourcesJar()
 
-  androidTarget {
-    publishLibraryVariants("release")
+  androidLibrary {
+    namespace = libs.versions.namespace.get() + ".ui"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
+    minSdk = libs.versions.android.minSdk.get().toInt()
   }
 
-  jvm("desktop")
+  // jvm("desktop)
 
   iosX64()
   iosArm64()
@@ -54,46 +56,7 @@ kotlin {
   }
 }
 
-android {
-  namespace = libs.versions.namespace.get() + ".ui"
-  compileSdk =
-    libs.versions.android.compileSdk
-      .get()
-      .toInt()
-
-  sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-  sourceSets["main"].res.srcDirs("src/androidMain/res")
-  sourceSets["main"].resources.srcDirs("src/commonMain/resources")
-
-  defaultConfig {
-    minSdk =
-      libs.versions.android.minSdk
-        .get()
-        .toInt()
-  }
-  packaging {
-    resources {
-      excludes += "/META-INF/{AL2.0,LGPL2.1}"
-    }
-  }
-  lint {
-    checkReleaseBuilds = false
-    abortOnError = false
-  }
-  buildTypes {
-    getByName("release") {
-      isMinifyEnabled = false
-    }
-  }
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-  }
-  dependencies {
-    debugImplementation(compose.uiTooling)
-  }
-}
-
+/*
 compose.desktop {
   application {
     nativeDistributions {
@@ -103,6 +66,7 @@ compose.desktop {
     }
   }
 }
+ */
 
 dependencies {
   detektPlugins(libs.compose.detekt.rules)