Fixes for publishing

splendo · Jun 12, 2024 · 666653c · 666653c
1 parent efa24dc
commit 666653c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/kaluga-library-components/src/main/kotlin/extensions/BaseKalugaAndroidSubprojectExtension.kt b/kaluga-library-components/src/main/kotlin/extensions/BaseKalugaAndroidSubprojectExtension.kt
@@ -38,6 +38,8 @@ abstract class BaseKalugaAndroidSubprojectExtension(
     objects: ObjectFactory,
 ) : BaseKalugaSubprojectExtension(versionCatalog, libraryExtension, namespacePostfix, objects) {
 
+    override fun Project.setupSubproject() {}
+
     override fun Project.configureSubproject() {
         extensions.configure(KotlinAndroidProjectExtension::class) {
             compilerOptions {

diff --git a/kaluga-library-components/src/main/kotlin/extensions/BaseKalugaSubprojectExtension.kt b/kaluga-library-components/src/main/kotlin/extensions/BaseKalugaSubprojectExtension.kt
@@ -76,6 +76,7 @@ sealed class BaseKalugaSubprojectExtension(
     ).map { it.asDependency() }
 
     override fun Project.beforeEvaluated() {
+        setupSubproject()
         libraryExtension.apply {
             compileSdk = versionCatalog.findVersion("androidCompileSdk").get().displayName.toInt()
             buildToolsVersion = versionCatalog.findVersion("androidBuildTools").get().displayName
@@ -113,6 +114,9 @@ sealed class BaseKalugaSubprojectExtension(
             configure()
         }
     }
+
+    protected abstract fun Project.setupSubproject()
+
     override fun Project.afterProjectEvaluated() {
         if (moduleName.isEmpty()) {
             throw RuntimeException("moduleName must be configured")

diff --git a/...a-library-components/src/main/kotlin/extensions/KalugaMultiplatformSubprojectExtension.kt b/...a-library-components/src/main/kotlin/extensions/KalugaMultiplatformSubprojectExtension.kt
@@ -77,6 +77,16 @@ open class KalugaMultiplatformSubprojectExtension @Inject constructor(
         frameworkConfig = action
     }
 
+    override fun Project.setupSubproject() {
+        // Android Target must be setup before project is evaluated as publishing will break otherwise
+        extensions.configure(KotlinMultiplatformExtension::class) {
+            androidTarget("androidLib") {
+                instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
+                unitTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
+                publishAllLibraryVariants()
+            }
+        }
+    }
     @OptIn(ExperimentalKotlinGradlePluginApi::class)
     override fun Project.configureSubproject() {
         extensions.configure(KotlinMultiplatformExtension::class) {
@@ -142,12 +152,6 @@ open class KalugaMultiplatformSubprojectExtension @Inject constructor(
             }
         }
 
-        androidTarget("androidLib") {
-            instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
-            unitTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
-            publishLibraryVariants("release", "debug")
-        }
-
         val iosTargets = project.iosTargets.map { iosTarget ->
             when (iosTarget) {
                 IOSTarget.Arm64 -> iosArm64()

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 # kotlin version is included since it will affect building
-androidGradle = "8.5.0-rc01"
+androidGradle = "8.5.0-rc02"
 androidBuildTools = "34.0.0"
 androidCompileSdk = "34"
 androidMinSdk = "24"