Merge pull request #147 from MohamedRejeb/0.5.x

Refactor convention plugins
MohamedRejeb · Aug 7, 2024 · 77d50ee · 77d50ee
2 parents b6c9052 + f2f2328
commit 77d50ee
Show file tree

Hide file tree

Showing 31 changed files with 341 additions and 288 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-//    id("root.publication")
+    id("root.publication")
     // trick: for the same plugin versions in all sub-modules
     alias(libs.plugins.androidApplication).apply(false)
     alias(libs.plugins.androidLibrary).apply(false)
@@ -11,5 +11,3 @@ plugins {
     alias(libs.plugins.composeMultiplatform).apply(false)
     alias(libs.plugins.conventionPlugin).apply(false)
 }
-
-rootPublicationSetup()
diff --git a/calf-core/build.gradle.kts b/calf-core/build.gradle.kts
@@ -1,13 +1,8 @@
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.androidLibrary)
+    id("compose.multiplatform")
+    id("module.publication")
 }
 
-composeMultiplatformSetup()
-modulePublicationSetup()
-
 kotlin {
     sourceSets.commonMain.dependencies {
         implementation(compose.runtime)

diff --git a/calf-file-picker-coil/build.gradle.kts b/calf-file-picker-coil/build.gradle.kts
@@ -1,11 +1,8 @@
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.androidLibrary)
+    id("kotlin.multiplatform")
+    id("module.publication")
 }
 
-kotlinMultiplatformSetup()
-modulePublicationSetup()
-
 kotlin {
     sourceSets.commonMain.dependencies {
         api(projects.calfCore)

diff --git a/calf-file-picker/build.gradle.kts b/calf-file-picker/build.gradle.kts
@@ -1,13 +1,8 @@
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.androidLibrary)
+    id("compose.multiplatform")
+    id("module.publication")
 }
 
-composeMultiplatformSetup()
-modulePublicationSetup()
-
 kotlin {
     sourceSets.commonMain.dependencies {
         api(projects.calfIo)

diff --git a/calf-file-picker/src/iosMain/kotlin/com.mohamedrejeb.calf.picker/FilePickerLauncher.ios.kt b/calf-file-picker/src/iosMain/kotlin/com.mohamedrejeb.calf.picker/FilePickerLauncher.ios.kt
@@ -6,6 +6,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.interop.LocalUIViewController
 import com.mohamedrejeb.calf.core.InternalCalfApi
 import com.mohamedrejeb.calf.io.KmpFile
+import kotlinx.cinterop.BetaInteropApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -37,6 +38,7 @@ import platform.UniformTypeIdentifiers.UTTypeVideo
 import platform.darwin.NSObject
 import kotlin.coroutines.resume
 
+@OptIn(BetaInteropApi::class)
 @Composable
 actual fun rememberFilePickerLauncher(
     type: FilePickerFileType,
@@ -49,7 +51,7 @@ actual fun rememberFilePickerLauncher(
         rememberDocumentPickerLauncher(type, selectionMode, onResult)
     }
 
-@OptIn(InternalCalfApi::class)
+@OptIn(InternalCalfApi::class, BetaInteropApi::class)
 @Composable
 private fun rememberDocumentPickerLauncher(
     type: FilePickerFileType,
@@ -137,6 +139,7 @@ private fun rememberDocumentPickerLauncher(
     }
 }
 
+@OptIn(BetaInteropApi::class)
 @Composable
 private fun rememberImageVideoPickerLauncher(
     type: FilePickerFileType,

diff --git a/calf-geo/build.gradle.kts b/calf-geo/build.gradle.kts
@@ -1,12 +1,7 @@
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.androidLibrary)
+    id("compose.multiplatform")
 }
 
-composeMultiplatformSetup()
-
 kotlin {
     sourceSets.commonMain.dependencies {
         implementation(compose.runtime)

diff --git a/calf-io/build.gradle.kts b/calf-io/build.gradle.kts
@@ -1,11 +1,8 @@
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.androidLibrary)
+    id("kotlin.multiplatform")
+    id("module.publication")
 }
 
-kotlinMultiplatformSetup()
-modulePublicationSetup()
-
 kotlin {
     sourceSets.commonMain.dependencies {
         api(projects.calfCore)

diff --git a/calf-maps/build.gradle.kts b/calf-maps/build.gradle.kts
@@ -1,12 +1,7 @@
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.androidLibrary)
+    id("compose.multiplatform")
 }
 
-composeMultiplatformSetup()
-
 kotlin {
     sourceSets.commonMain.dependencies {
         implementation(compose.runtime)

diff --git a/calf-navigation/build.gradle.kts b/calf-navigation/build.gradle.kts
@@ -1,12 +1,7 @@
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.androidLibrary)
+    id("compose.multiplatform")
 }
 
-composeMultiplatformSetup()
-
 kotlin {
     sourceSets.commonMain.dependencies {
         implementation(compose.runtime)

diff --git a/calf-permissions/build.gradle.kts b/calf-permissions/build.gradle.kts
@@ -1,13 +1,8 @@
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.androidLibrary)
+    id("compose.multiplatform")
+    id("module.publication")
 }
 
-composeMultiplatformSetup()
-modulePublicationSetup()
-
 kotlin {
     sourceSets.commonMain.dependencies {
         implementation(compose.runtime)

diff --git a/calf-sf-symbols/build.gradle.kts b/calf-sf-symbols/build.gradle.kts
@@ -1,12 +1,7 @@
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.androidLibrary)
+    id("compose.multiplatform")
 }
 
-composeMultiplatformSetup()
-
 kotlin {
     sourceSets.commonMain.dependencies {
         implementation(compose.runtime)

diff --git a/calf-ui/build.gradle.kts b/calf-ui/build.gradle.kts
@@ -1,13 +1,8 @@
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.androidLibrary)
+    id("compose.multiplatform")
+    id("module.publication")
 }
 
-composeMultiplatformSetup()
-modulePublicationSetup()
-
 kotlin {
     sourceSets.commonMain.dependencies {
         implementation(projects.calfCore)

diff --git a/calf-webview/build.gradle.kts b/calf-webview/build.gradle.kts
@@ -1,15 +1,10 @@
 import org.gradle.internal.os.OperatingSystem
 
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.androidLibrary)
+    id("compose.multiplatform")
+    id("module.publication")
 }
 
-composeMultiplatformSetup()
-modulePublicationSetup()
-
 val os: OperatingSystem = OperatingSystem.current()
 val arch: String = System.getProperty("os.arch")
 val isAarch64: Boolean = arch.contains("aarch64")

diff --git a/convention-plugins/build.gradle.kts b/convention-plugins/build.gradle.kts
@@ -1,8 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    `kotlin-dsl-base`
-    `java-gradle-plugin`
+    `kotlin-dsl`
 }
 
 java {
@@ -23,6 +22,7 @@ dependencies {
     implementation(libs.gradlePlugin.android)
     implementation(libs.gradlePlugin.jetbrainsCompose)
     implementation(libs.gradlePlugin.kotlin)
+    implementation(libs.gradlePlugin.composeCompiler)
     implementation(libs.nexus.publish)
 
     // hack to access version catalogue https://github.com/gradle/gradle/issues/15383

diff --git a/convention-plugins/src/main/kotlin/ComposeMultiplatform.kt b/convention-plugins/src/main/kotlin/ComposeMultiplatform.kt
diff --git a/convention-plugins/src/main/kotlin/KotlinMultiplatform.kt b/convention-plugins/src/main/kotlin/KotlinMultiplatform.kt
diff --git a/convention-plugins/src/main/kotlin/Publication.kt b/convention-plugins/src/main/kotlin/Publication.kt
diff --git a/convention-plugins/src/main/kotlin/Targets.kt b/convention-plugins/src/main/kotlin/Targets.kt
@@ -15,14 +15,10 @@ fun KotlinMultiplatformExtension.applyTargets() {
     jvmToolchain(11)
     jvm("desktop")
 
-    js {
-        browser()
-    }
+    js().browser()
 
     @OptIn(ExperimentalWasmDsl::class)
-    wasmJs {
-        browser()
-    }
+    wasmJs().browser()
 
     iosX64()
     iosArm64()