#843 support jetbrains android multipaltform

gradle.properties

@@ -5,7 +5,6 @@ org.gradle.caching=true
 kotlin.code.style=official
 
 kotlin.mpp.stability.nowarn=true
-kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.applyDefaultHierarchyTemplate=false
 kotlin.mpp.enableCInteropCommonization=true

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-kotlinVersion = "1.9.25"
-androidGradleVersion = "8.1.4"
+kotlinVersion = "2.2.10"
+androidGradleVersion = "8.12.0"
 androidSdkCommonVersion = "31.1.2"
 
 # kotlinx
@@ -63,3 +63,6 @@ detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugi
 mokoMultiplatformPlugin = { module = "dev.icerock:mobile-multiplatform", version.ref = "mokoMultiplatformPluginVersion" }
 composeJetBrainsPlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "composeJetbrainsVersion" }
 nexusPublishing = { module = "io.github.gradle-nexus:publish-plugin", version = "2.0.0" }
+
+[plugins]
+composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinVersion" }

gradle/moko.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-resourcesVersion = "0.25.2"
+resourcesVersion = "0.26.0"
 
 [libraries]
 resources = { module = "dev.icerock.moko:resources", version.ref = "resourcesVersion" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #Tue Jul 25 10:40:31 NOVT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

local-samples-check.sh

@@ -17,3 +17,4 @@ set -e
 (cd samples/kotlin-2-dynamic-sample && ./local-check.sh)
 (cd samples/kotlin-2-tests && ./local-check.sh)
 (cd samples/cm-resources-sample && ./local-check.sh)
+(cd samples/gradle-agp-9-sample && ./local-check.sh)

resources-build-logic/src/main/kotlin/multiplatform-android-publish-convention.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 
 kotlin {
  androidTarget {
- publishAllLibraryVariants()
+ publishLibraryVariants()
  publishLibraryVariantsGroupedByFlavor = true
  }
 }

resources-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts

@@ -2,8 +2,11 @@
  * Copyright 2024 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
+@file:OptIn(ExperimentalWasmDsl::class)
+
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
  id("com.android.library")

resources-compose/build.gradle.kts

@@ -1,3 +1,7 @@
+@file:OptIn(ExperimentalWasmDsl::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+
 /*
  * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
@@ -13,6 +17,7 @@ plugins {
  id("org.jetbrains.compose")
  id("javadoc-stub-convention")
  id("publication-convention")
+ alias(libs.plugins.composeCompiler)
 }
 
 android {
@@ -34,6 +39,7 @@ kotlin {
  js(IR) {
  browser()
  }
+
  wasmJs {
  browser()
  }

resources-generator/src/main/kotlin/dev/icerock/gradle/MultiplatformResourcesPlugin.kt

@@ -5,7 +5,12 @@
 package dev.icerock.gradle
 
 import com.android.build.api.dsl.AndroidSourceSet
+import com.android.build.api.dsl.KotlinMultiplatformAndroidCompilation
+import com.android.build.api.dsl.KotlinMultiplatformAndroidLibraryTarget
+import com.android.build.api.extension.impl.CurrentAndroidGradlePluginVersion
 import dev.icerock.gradle.extra.getOrRegisterGenerateResourcesTask
+import dev.icerock.gradle.generator.platform.android.AGP_8_11_0
+import dev.icerock.gradle.generator.platform.android.AndroidLibraryType
 import dev.icerock.gradle.generator.platform.android.getAndroidSourceSetOrNull
 import dev.icerock.gradle.generator.platform.android.setupAndroidTasks
 import dev.icerock.gradle.generator.platform.android.setupAndroidVariantsSync
@@ -17,6 +22,8 @@ import dev.icerock.gradle.generator.platform.apple.setupFrameworkResources
 import dev.icerock.gradle.generator.platform.js.setupJsKLibResources
 import dev.icerock.gradle.generator.platform.js.setupJsResourcesWithLinkTask
 import dev.icerock.gradle.tasks.GenerateMultiplatformResourcesTask
+import dev.icerock.gradle.utils.enableAndroidResources
+import dev.icerock.gradle.utils.hasMinimalVersion
 import dev.icerock.gradle.utils.kotlinSourceSetsObservable
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -29,11 +36,13 @@ import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmAndroidCompilation
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget
+import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
@@ -61,6 +70,18 @@ open class MultiplatformResourcesPlugin : Plugin<Project> {
  setupAndroidVariantsSync(project = project)
  setupGradleSync(project = project)
  }
+
+ // Enable android resources for "com.android.kotlin.multiplatform.library" plugin
+ project.plugins.withId(AndroidLibraryType.KmpLibrary.pluginId) {
+ val hasEnableAndroidResourcesFlag = hasMinimalVersion(
+ minVersion = AGP_8_11_0,
+ currentVersion = CurrentAndroidGradlePluginVersion.CURRENT_AGP_VERSION.version
+ )
+
+ if (hasEnableAndroidResourcesFlag) {
+ project.enableAndroidResources()
+ }
+ }
  }
 
  private fun setupGradleSync(project: Project) {
@@ -90,6 +111,30 @@ open class MultiplatformResourcesPlugin : Plugin<Project> {
  setupJsResourcesWithLinkTask(target = target, project = project)
  }
 
+ if (target is KotlinMultiplatformAndroidLibraryTarget) {
+ target.compilations
+ .withType(KotlinMultiplatformAndroidCompilation::class)
+ .configureEach { compilation ->
+ compilation.kotlinSourceSetsObservable.forAll { sourceSet ->
+ println("DBG: sourceSets kmpat $sourceSet")
+ val genTaskProvider: TaskProvider<GenerateMultiplatformResourcesTask> =
+ sourceSet.getOrRegisterGenerateResourcesTask(mrExtension)
+println("DBG: compilations KotlinMultiplatformAndroidCompilation: ${target.platformType.name}")
+ genTaskProvider.configure {
+ it.platformType.set(target.platformType.name)
+ }
+
+ setupAndroidTasks(
+ target = target,
+ sourceSet = sourceSet,
+ genTaskProvider = genTaskProvider,
+ compilation = compilation
+ )
+ }
+ }
+
+ }
+
  target.compilations.configureEach { compilation ->
  compilation.kotlinSourceSetsObservable.forAll { sourceSet: KotlinSourceSet ->
  val genTaskProvider: TaskProvider<GenerateMultiplatformResourcesTask> =
@@ -172,20 +217,21 @@ open class MultiplatformResourcesPlugin : Plugin<Project> {
  }
  }
 
+ @OptIn(ExperimentalKotlinGradlePluginApi::class)
  private fun setupSourceSets(
  target: KotlinTarget,
  sourceSet: KotlinSourceSet,
  genTaskProvider: TaskProvider<GenerateMultiplatformResourcesTask>,
  ) {
  sourceSet.kotlin.srcDir(genTaskProvider.map { it.outputSourcesDir })
 
- when (target.platformType) {
- KotlinPlatformType.jvm, KotlinPlatformType.js -> {
+ when (target) {
+ is KotlinJsIrTarget, is KotlinJvmTarget -> {
  sourceSet.resources.srcDir(genTaskProvider.map { it.outputResourcesDir })
  sourceSet.resources.srcDir(genTaskProvider.map { it.outputAssetsDir })
  }
 
- KotlinPlatformType.androidJvm -> {
+ is KotlinAndroidTarget -> {
  // Fix: android sourceSets indexation in IDE
  // Usage of api of v2.model in AGP broken for IDE resources indexing
  // For correct indexing of resources set resource directory
@@ -196,12 +242,11 @@ open class MultiplatformResourcesPlugin : Plugin<Project> {
  androidSourceSet.res.srcDir(genTaskProvider.map { it.outputResourcesDir })
 
  // Assets added in variants for correct generation
- // see: dev.icerock.gradle.generator.platform.android.SetupAndroidUtilsKt.addGenerationTaskDependency
+ // see: dev.icerock.gradle.generator.platform.android
+ // .SetupAndroidUtilsKt.addGenerationTaskDependency
  // androidSourceSet.assets.srcDir(genTaskProvider.map { it.outputAssetsDir })
  }
-
- KotlinPlatformType.common, KotlinPlatformType.native,
- KotlinPlatformType.wasm -> Unit
+ else -> Unit
  }
  }
 }

resources-generator/src/main/kotlin/dev/icerock/gradle/MultiplatformResourcesPluginExtension.kt

@@ -5,6 +5,7 @@
 package dev.icerock.gradle
 
 import dev.icerock.gradle.generator.platform.apple.registerCopyXCFrameworkResourcesToAppTask
+import dev.icerock.gradle.utils.capitalize
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Project
 import org.gradle.api.file.SourceDirectorySet
@@ -21,7 +22,7 @@ abstract class MultiplatformResourcesPluginExtension {
  abstract val resourcesSourceSets: NamedDomainObjectContainer<SourceDirectorySet>
 
  fun Project.configureCopyXCFrameworkResources(xcFrameworkName: String = name) {
- NativeBuildType.values()
+ NativeBuildType.entries
  .map { it.name.lowercase().capitalize() }
  .plus("")
  .map { xcFrameworkName.capitalize() + it + "XCFramework" }

resources-generator/src/main/kotlin/dev/icerock/gradle/extra/mokoResourcesGenTask.kt

@@ -111,10 +111,20 @@ private fun registerGenerateTask(
  task as GenerateMultiplatformResourcesTask
 
  val platform: String = task.platformType.get()
+ println("DBG: platform $platform")
+
  if (platform != KotlinPlatformType.androidJvm.name) return@onlyIf true
 
  val flavor: String = task.androidSourceSetName.get()
- flavor in listOf("main", "test", "androidTest")
+ println("DBG: flavor $flavor")
+
+ flavor in listOf(
+ "androidMain",
+ "androidTest",
+ "androidInstrumentedTest",
+ "main",
+ "test"
+ )
  }
  }
 

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/platform/android/AgpConstants.kt

@@ -0,0 +1,8 @@
+/*
+ * Copyright 2025 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.gradle.generator.platform.android
+
+internal const val AGP_8_10_0 = "8.10.0"
+internal const val AGP_8_11_0 = "8.11.0"

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/platform/android/AndroidLibraryType.kt

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2025 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.gradle.generator.platform.android
+
+internal enum class AndroidLibraryType(val pluginId: String) {
+ Application(pluginId = "com.android.application"),
+ Library(pluginId = "com.android.library"),
+ KmpLibrary(pluginId = "com.android.kotlin.multiplatform.library")
+}
+
+internal fun androidPlugins(): List<String> {
+ return AndroidLibraryType.entries.map { it.pluginId }
+}