Merge pull request #51 from icerockdev/#49-#50-android-plugins

#49 #50 android plugins

Author: Alex009

.github/workflows/create-release.yml

@@ -39,6 +39,6 @@ jobs:
         with:
           commitish: ${{ github.ref }}
           tag_name: release/${{ github.event.inputs.version }}
-          release_name: Release ${{ github.event.inputs.version }}
+          release_name: ${{ github.event.inputs.version }}
           body: "Will be filled later"
           draft: true

README.md

@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.11.0")
+    implementation("dev.icerock:mobile-multiplatform:0.12.0")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
     implementation("com.android.tools.build:gradle:4.1.1")
 }
@@ -31,7 +31,8 @@ plugins {
 ```
 
 Plugin automatically setup android, ios targets.
-For Android setup sourceSet path to `androidMain`.
+Android target also automatically configured with `dev.icerock.mobile.multiplatform.android-manifest` 
+and `dev.icerock.mobile.multiplatform.android-sources` plugins.
 
 By default used `ios()` targets creation with intermediate source set `iosMain`. To disable it add
 into `gradle.properties` line:
@@ -44,6 +45,28 @@ To disable warning about used ios targets add into `gradle.properties` line:
 mobile.multiplatform.iosTargetWarning=false
 ```
 
+### Setup AndroidManifest.xml in androidMain sourceSet
+`build.gradle.kts`
+```kotlin
+plugins {
+    id("dev.icerock.mobile.multiplatform.android-manifest")
+}
+```
+
+After enable this plugin you can move `AndroidManifest.xml` from `src/main/AndroidManifest.xml` to
+`src/androidMain/AndroidManifest.xml`
+
+### Setup android sourceSets in android prefixed source sets
+`build.gradle.kts`
+```kotlin
+plugins {
+    id("dev.icerock.mobile.multiplatform.android-sources")
+}
+```
+
+After enable this plugin you can move android's `main` source set to `androidMain`, `release` 
+to `androidRelease`, `test` to `androidTest` etc.
+
 ### Setup cocoapods integration for iOS
 `build.gradle.kts`
 ```kotlin

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "dev.icerock"
-version = "0.11.0"
+version = "0.12.0"
 
 repositories {
     mavenCentral()

src/main/kotlin/dev/icerock/gradle/AndroidManifestPlugin.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.gradle
+
+import com.android.build.gradle.LibraryExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class AndroidManifestPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        target.plugins.withId("com.android.library") {
+            val androidExtension = target.extensions.findByType(LibraryExtension::class.java)!!
+            val mainSourceSet = androidExtension.sourceSets.getByName("main")
+            val newManifestPath = "src/androidMain/AndroidManifest.xml"
+            mainSourceSet.manifest.srcFile(newManifestPath)
+
+            target.logger.info("set new android manifest path $newManifestPath")
+        }
+    }
+}

src/main/kotlin/dev/icerock/gradle/AndroidSourcesPlugin.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.gradle
+
+import com.android.build.gradle.LibraryExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class AndroidSourcesPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        target.plugins.withId("com.android.library") {
+            val androidExtension = target.extensions.findByType(LibraryExtension::class.java)!!
+
+            androidExtension.sourceSets.configureEach {
+                val capitalizedName = name.capitalize()
+                val newRoot = "src/android$capitalizedName"
+                setRoot(newRoot)
+
+                target.logger.info("set new root for $name android source set - $newRoot")
+            }
+        }
+    }
+}

src/main/kotlin/dev/icerock/gradle/CocoapodsPlugin.kt

@@ -92,7 +92,7 @@ class CocoapodsPlugin : Plugin<Project> {
         pod: CocoaPodInfo,
         cocoaPodsExtension: CocoapodsConfig
     ) {
-        project.logger.debug("configure cocoaPod $pod in $target of $project")
+        project.logger.info("configure cocoaPod $pod in $target of $project")
 
         val buildTask: CompileCocoaPod = configurePodCompilation(
             kotlinNativeTarget = target,
@@ -116,7 +116,7 @@ class CocoapodsPlugin : Plugin<Project> {
         project: Project,
         cocoaPodsExtension: CocoapodsConfig
     ): CompileCocoaPod {
-        project.logger.debug("configure compilation pod $pod in $kotlinNativeTarget of $project")
+        project.logger.info("configure compilation pod $pod in $kotlinNativeTarget of $project")
 
         val (sdk, arch) = when (kotlinNativeTarget.konanTarget) {
             KonanTarget.IOS_ARM64 -> "iphoneos" to "arm64"
@@ -159,7 +159,7 @@ class CocoapodsPlugin : Plugin<Project> {
         pod: CocoaPodInfo,
         project: Project
     ) {
-        project.logger.debug("configure cInterop for pod $pod in $target of $project")
+        project.logger.info("configure cInterop for pod $pod in $target of $project")
 
         if (pod.precompiled) {
             createCInteropTask(

src/main/kotlin/dev/icerock/gradle/FrameworkConfig.kt

@@ -7,6 +7,7 @@ package dev.icerock.gradle
 import KotlinNativeExportable
 import org.gradle.api.Project
 import org.gradle.api.artifacts.MinimalExternalModuleDependency
+import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.provider.Provider
 import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
 import org.jetbrains.kotlin.konan.target.Architecture
@@ -24,27 +25,23 @@ open class FrameworkConfig {
     }
 
     fun export(project: Project) {
-        ExportDeclaration.ProjectExport(
-            project = project
-        ).let { exports.add(it) }
+        ExportDeclaration.ProjectExport(project).let { exports.add(it) }
     }
 
     fun export(kotlinNativeExportable: KotlinNativeExportable) {
-        ExportDeclaration.Exportable(
-            kotlinNativeExportable = kotlinNativeExportable
-        ).let { exports.add(it) }
+        ExportDeclaration.Exportable(kotlinNativeExportable).let { exports.add(it) }
     }
 
     fun export(artifact: String) {
-        ExportDeclaration.ArtifactStringExport(
-            artifact = artifact
-        ).let { exports.add(it) }
+        ExportDeclaration.ArtifactStringExport(artifact).let { exports.add(it) }
     }
 
     fun export(provider: Provider<MinimalExternalModuleDependency>) {
-        ExportDeclaration.VersionCatalogExport(
-            provider = provider
-        ).let { exports.add(it) }
+        ExportDeclaration.VersionCatalogExport(provider.get()).let { exports.add(it) }
+    }
+
+    fun export(project: ProjectDependency) {
+        ExportDeclaration.ProjectExport(project.dependencyProject).let { exports.add(it) }
     }
 
     internal sealed class ExportDeclaration {
@@ -87,10 +84,10 @@ open class FrameworkConfig {
         }
 
         data class VersionCatalogExport(
-            val provider: Provider<MinimalExternalModuleDependency>
+            val externalModuleDependency: MinimalExternalModuleDependency
         ) : ExportDeclaration() {
             override fun export(project: Project, framework: Framework) {
-                framework.export(this.provider.get())
+                framework.export(externalModuleDependency)
             }
         }
 

src/main/kotlin/dev/icerock/gradle/MobileTargetsPlugin.kt

@@ -4,19 +4,18 @@
 
 package dev.icerock.gradle
 
-import com.android.build.gradle.LibraryExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 class MobileTargetsPlugin : Plugin<Project> {
-    override fun apply(target: Project) {
-        target.plugins.withId("com.android.library") {
-            val androidLibraryExtension =
-                target.extensions.findByType(LibraryExtension::class.java)!!
+    private val androidManifestPlugin = AndroidManifestPlugin()
+    private val androidSourcesPlugin = AndroidSourcesPlugin()
 
-            setupAndroidLibrary(androidLibraryExtension)
-        }
+    override fun apply(target: Project) {
+        // backward compatibility apply
+        androidManifestPlugin.apply(target)
+        androidSourcesPlugin.apply(target)
 
         target.plugins.withId("org.jetbrains.kotlin.multiplatform") {
             val kmpExtension =
@@ -26,23 +25,6 @@ class MobileTargetsPlugin : Plugin<Project> {
         }
     }
 
-    private fun setupAndroidLibrary(libraryExtension: LibraryExtension) {
-        libraryExtension.sourceSets {
-            mapOf(
-                "main" to "src/androidMain",
-                "release" to "src/androidMainRelease",
-                "debug" to "src/androidMainDebug",
-                "test" to "src/androidUnitTest",
-                "testRelease" to "src/androidUnitTestRelease",
-                "testDebug" to "src/androidUnitTestDebug"
-            ).forEach { (name, root) ->
-                getByName(name).run {
-                    setRoot(root)
-                }
-            }
-        }
-    }
-
     private fun setupMultiplatformTargets(
         kmpExtension: KotlinMultiplatformExtension,
         project: Project

src/main/resources/META-INF/gradle-plugins/dev.icerock.mobile.multiplatform.android-manifest.properties

@@ -0,0 +1 @@
+implementation-class=dev.icerock.gradle.AndroidManifestPlugin

src/main/resources/META-INF/gradle-plugins/dev.icerock.mobile.multiplatform.android-sources.properties

@@ -0,0 +1 @@
+implementation-class=dev.icerock.gradle.AndroidSourcesPlugin