[fix] issue #270

app/proguard-rules.pro

@@ -21,4 +21,4 @@
 #-renamesourcefileattribute SourceFile
 
 -keep class com.unifest.android.feature.map.model.** { *; }
-
+-keep class com.unifest.android.core.navigation.** { *; }

build-logic/build.gradle.kts

@@ -27,12 +27,6 @@ gradlePlugin {
     }
 }
 
-repositories {
-    google()
-    mavenCentral()
-    gradlePluginPortal()
-}
-
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
@@ -47,7 +41,7 @@ dependencies {
     compileOnly(libs.gradle.android)
     compileOnly(libs.gradle.kotlin)
     compileOnly(libs.gradle.androidx.room)
-    // compileOnly(libs.compose.compiler.extension)
+    compileOnly(libs.compose.compiler.extension)
 
     compileOnly(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }

build-logic/settings.gradle.kts

@@ -1,9 +1,15 @@
 rootProject.name = "build-logic"
 
 dependencyResolutionManagement {
-  versionCatalogs {
-    create("libs") {
-      from(files("../gradle/libs.versions.toml"))
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
     }
-  }
 }

build-logic/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt

@@ -1,13 +1,12 @@
 import com.android.build.api.dsl.ApplicationExtension
-import com.unifest.android.Plugins
-import com.unifest.android.applyPlugins
-import com.unifest.android.configureCompose
+import com.unifest.android.convention.Plugins
+import com.unifest.android.convention.applyPlugins
+import com.unifest.android.convention.configureCompose
 import org.gradle.kotlin.dsl.configure
 
 internal class AndroidApplicationComposeConventionPlugin : BuildLogicConventionPlugin(
     {
-        // applyPlugins(Plugins.ANDROID_APPLICATION, Plugins.COMPOSE_COMPILER)
-        applyPlugins(Plugins.ANDROID_APPLICATION)
+        applyPlugins(Plugins.ANDROID_APPLICATION, Plugins.KOTLIN_COMPOSE)
 
         extensions.configure<ApplicationExtension> {
             configureCompose(this)

build-logic/src/main/kotlin/AndroidApplicationConventionPlugin.kt

@@ -1,8 +1,8 @@
 import com.android.build.api.dsl.ApplicationExtension
-import com.unifest.android.Plugins
-import com.unifest.android.applyPlugins
-import com.unifest.android.configureAndroid
-import com.unifest.android.libs
+import com.unifest.android.convention.Plugins
+import com.unifest.android.convention.applyPlugins
+import com.unifest.android.convention.configureAndroid
+import com.unifest.android.convention.libs
 import org.gradle.kotlin.dsl.configure
 
 internal class AndroidApplicationConventionPlugin : BuildLogicConventionPlugin(

build-logic/src/main/kotlin/AndroidFeatureConventionPlugin.kt

@@ -1,7 +1,7 @@
-import com.unifest.android.applyPlugins
-import com.unifest.android.implementation
-import com.unifest.android.libs
-import com.unifest.android.project
+import com.unifest.android.convention.applyPlugins
+import com.unifest.android.convention.implementation
+import com.unifest.android.convention.libs
+import com.unifest.android.convention.project
 import org.gradle.kotlin.dsl.dependencies
 
 internal class AndroidFeatureConventionPlugin : BuildLogicConventionPlugin(

build-logic/src/main/kotlin/AndroidFirebaseConventionPlugin.kt

@@ -1,7 +1,7 @@
-import com.unifest.android.Plugins
-import com.unifest.android.applyPlugins
-import com.unifest.android.implementation
-import com.unifest.android.libs
+import com.unifest.android.convention.Plugins
+import com.unifest.android.convention.applyPlugins
+import com.unifest.android.convention.implementation
+import com.unifest.android.convention.libs
 import org.gradle.kotlin.dsl.dependencies
 
 internal class AndroidFirebaseConventionPlugin : BuildLogicConventionPlugin(

build-logic/src/main/kotlin/AndroidHiltConventionPlugin.kt

@@ -1,8 +1,8 @@
-import com.unifest.android.Plugins
-import com.unifest.android.applyPlugins
-import com.unifest.android.implementation
-import com.unifest.android.ksp
-import com.unifest.android.libs
+import com.unifest.android.convention.Plugins
+import com.unifest.android.convention.applyPlugins
+import com.unifest.android.convention.implementation
+import com.unifest.android.convention.ksp
+import com.unifest.android.convention.libs
 import org.gradle.kotlin.dsl.dependencies
 
 internal class AndroidHiltConventionPlugin : BuildLogicConventionPlugin(

build-logic/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt

@@ -1,13 +1,12 @@
 import com.android.build.gradle.LibraryExtension
-import com.unifest.android.Plugins
-import com.unifest.android.applyPlugins
-import com.unifest.android.configureCompose
+import com.unifest.android.convention.Plugins
+import com.unifest.android.convention.applyPlugins
+import com.unifest.android.convention.configureCompose
 import org.gradle.kotlin.dsl.configure
 
 internal class AndroidLibraryComposeConventionPlugin : BuildLogicConventionPlugin(
     {
-        // applyPlugins(Plugins.ANDROID_LIBRARY, Plugins.COMPOSE_COMPILER)
-        applyPlugins(Plugins.ANDROID_LIBRARY)
+        applyPlugins(Plugins.ANDROID_LIBRARY, Plugins.KOTLIN_COMPOSE)
 
         extensions.configure<LibraryExtension> {
             configureCompose(this)

build-logic/src/main/kotlin/AndroidLibraryConventionPlugin.kt

@@ -1,8 +1,8 @@
 import com.android.build.gradle.LibraryExtension
-import com.unifest.android.Plugins
-import com.unifest.android.applyPlugins
-import com.unifest.android.configureAndroid
-import com.unifest.android.libs
+import com.unifest.android.convention.Plugins
+import com.unifest.android.convention.applyPlugins
+import com.unifest.android.convention.configureAndroid
+import com.unifest.android.convention.libs
 import org.gradle.kotlin.dsl.configure
 
 internal class AndroidLibraryConventionPlugin : BuildLogicConventionPlugin({

build-logic/src/main/kotlin/AndroidRetrofitConventionPlugin.kt

@@ -1,7 +1,7 @@
-import com.unifest.android.Plugins
-import com.unifest.android.applyPlugins
-import com.unifest.android.implementation
-import com.unifest.android.libs
+import com.unifest.android.convention.Plugins
+import com.unifest.android.convention.applyPlugins
+import com.unifest.android.convention.implementation
+import com.unifest.android.convention.libs
 import org.gradle.kotlin.dsl.dependencies
 
 internal class AndroidRetrofitConventionPlugin : BuildLogicConventionPlugin(

build-logic/src/main/kotlin/AndroidRoomConventionPlugin.kt

@@ -1,9 +1,9 @@
 import androidx.room.gradle.RoomExtension
-import com.unifest.android.Plugins
-import com.unifest.android.applyPlugins
-import com.unifest.android.implementation
-import com.unifest.android.ksp
-import com.unifest.android.libs
+import com.unifest.android.convention.Plugins
+import com.unifest.android.convention.applyPlugins
+import com.unifest.android.convention.implementation
+import com.unifest.android.convention.ksp
+import com.unifest.android.convention.libs
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 

build-logic/src/main/kotlin/JvmKotlinConventionPlugin.kt

@@ -1,8 +1,8 @@
-import com.unifest.android.Plugins
-import com.unifest.android.ApplicationConfig
-import com.unifest.android.applyPlugins
-import com.unifest.android.detektPlugins
-import com.unifest.android.libs
+import com.unifest.android.convention.Plugins
+import com.unifest.android.convention.ApplicationConfig
+import com.unifest.android.convention.applyPlugins
+import com.unifest.android.convention.detektPlugins
+import com.unifest.android.convention.libs
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies

build-logic/src/main/kotlin/com/unifest/android/Android.kt → build-logic/src/main/kotlin/com/unifest/android/convention/Android.kt

@@ -1,4 +1,4 @@
-package com.unifest.android
+package com.unifest.android.convention
 
 import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.JavaVersion
@@ -7,7 +7,7 @@ import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 
-internal fun Project.configureAndroid(extension: CommonExtension<*, *, *, *, *, >) {
+internal fun Project.configureAndroid(extension: CommonExtension<*, *, *, *, *, *>) {
     extension.apply {
         compileSdk = libs.versions.compileSdk.get().toInt()
 

build-logic/src/main/kotlin/com/unifest/android/convention/Compose.kt

@@ -0,0 +1,56 @@
+package com.unifest.android.convention
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+internal fun Project.configureCompose(extension: CommonExtension<*, *, *, *, *, *>) {
+    extension.apply {
+        dependencies {
+            implementation(libs.bundles.androidx.compose)
+            debugImplementation(libs.androidx.compose.ui.tooling)
+        }
+
+        configure<ComposeCompilerGradlePluginExtension> {
+            enableStrongSkippingMode.set(true)
+            includeSourceInformation.set(true)
+
+            metricsDestination.file("build/composeMetrics")
+            reportsDestination.file("build/composeReports")
+
+            stabilityConfigurationFile.set(project.rootDir.resolve("stability.config.conf"))
+        }
+
+        tasks.withType<KotlinCompile>().configureEach {
+            compilerOptions {
+                freeCompilerArgs.addAll(buildComposeMetricsParameters())
+            }
+        }
+    }
+}
+
+private fun Project.buildComposeMetricsParameters(): List<String> {
+    val metricParameters = mutableListOf<String>()
+    val enableMetricsProvider = project.providers.gradleProperty("enableComposeCompilerMetrics")
+    val relativePath = projectDir.relativeTo(rootDir)
+    val buildDir = layout.buildDirectory.get().asFile
+    val enableMetrics = (enableMetricsProvider.orNull == "true")
+    if (enableMetrics) {
+        val metricsFolder = buildDir.resolve("compose-metrics").resolve(relativePath)
+        metricParameters.add("-P")
+        metricParameters.add("plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" + metricsFolder.absolutePath)
+    }
+
+    val enableReportsProvider = project.providers.gradleProperty("enableComposeCompilerReports")
+    val enableReports = (enableReportsProvider.orNull == "true")
+    if (enableReports) {
+        val reportsFolder = buildDir.resolve("compose-reports").resolve(relativePath)
+        metricParameters.add("-P")
+        metricParameters.add("plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" + reportsFolder.absolutePath)
+    }
+    return metricParameters.toList()
+}

build-logic/src/main/kotlin/com/unifest/android/Config.kt → build-logic/src/main/kotlin/com/unifest/android/convention/Config.kt

@@ -1,4 +1,4 @@
-package com.unifest.android
+package com.unifest.android.convention
 
 internal object ApplicationConfig {
     val JavaVersion = org.gradle.api.JavaVersion.VERSION_17

build-logic/src/main/kotlin/com/unifest/android/Dependencies.kt → build-logic/src/main/kotlin/com/unifest/android/convention/Dependencies.kt

@@ -1,4 +1,4 @@
-package com.unifest.android
+package com.unifest.android.convention
 
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.dsl.DependencyHandler

build-logic/src/main/kotlin/com/unifest/android/Extensions.kt → build-logic/src/main/kotlin/com/unifest/android/convention/Extensions.kt

@@ -1,6 +1,6 @@
 @file:Suppress("NOTHING_TO_INLINE")
 
-package com.unifest.android
+package com.unifest.android.convention
 
 import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.dsl.LibraryExtension
@@ -25,7 +25,7 @@ internal val Project.isAndroidProject: Boolean
     get() = pluginManager.hasPlugin(Plugins.ANDROID_APPLICATION) ||
         pluginManager.hasPlugin(Plugins.ANDROID_LIBRARY)
 
-internal val Project.androidExtensions: CommonExtension<*, *, *, *, *>
+internal val Project.androidExtensions: CommonExtension<*, *, *, *, *, *>
     get() {
         return if (pluginManager.hasPlugin(Plugins.ANDROID_APPLICATION)) {
             extensions.getByType<BaseAppModuleExtension>()

build-logic/src/main/kotlin/com/unifest/android/Plugins.kt → build-logic/src/main/kotlin/com/unifest/android/convention/Plugins.kt

@@ -1,15 +1,15 @@
-package com.unifest.android
+package com.unifest.android.convention
 
 internal object Plugins {
     const val JAVA_LIBRARY = "java-library"
 
     const val KOTLIN_JVM = "org.jetbrains.kotlin.jvm"
     const val KOTLIN_ANDROID = "org.jetbrains.kotlin.android"
     const val KOTLINX_SERIALIZATION = "org.jetbrains.kotlin.plugin.serialization"
+    const val KOTLIN_COMPOSE = "org.jetbrains.kotlin.plugin.compose"
 
     const val ANDROID_APPLICATION = "com.android.application"
     const val ANDROID_LIBRARY = "com.android.library"
-    const val COMPOSE_COMPILER = "org.jetbrains.kotlin.plugin.compose"
 
     const val ANDROIDX_ROOM = "androidx.room"
 

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.androidx.room) apply false
-    // alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.google.service) apply false
     alias(libs.plugins.firebase.crashlytics) apply false