Merge branch 'release/1.2.6'

Author: mshdabiola

.idea/gradle.xml

@@ -1,16 +1,18 @@
 import com.mshdabiola.app.BuildType
 
-@Suppress("DSL_SCOPE_VIOLATION")
+
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
+//    alias(libs.plugins.kotlinAndroid)
+
     id("mshdabiola.android.application")
     id("mshdabiola.android.application.compose")
     id("mshdabiola.android.application.jacoco")
     id("mshdabiola.android.application.flavor")
     id("mshdabiola.android.hilt")
     id("jacoco")
 //    id("mshdabiola.android.application.firebase")
-    alias(libs.plugins.androidx.baselineprofile)
-    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.baselineprofile)
     alias(libs.plugins.roborazzi)
 
 }
@@ -36,6 +38,7 @@ android {
         debug {
             applicationIdSuffix = BuildType.DEBUG.applicationIdSuffix
             versionNameSuffix=BuildType.DEBUG.versionNameSuffix
+
         }
         val release = getByName("release") {
             isMinifyEnabled = true
@@ -52,7 +55,7 @@ android {
             // TODO: Abstract the signing configuration to a separate file to avoid hardcoding this.
             // signingConfig = signingConfigs.getByName("debug")
             // Ensure Baseline Profile is fresh for release builds.
-            baselineProfile.automaticGenerationDuringBuild = false
+            baselineProfile.automaticGenerationDuringBuild = true
         }
         create("benchmark") {
             // Enable all the optimizations from release build through initWith(release).
@@ -80,13 +83,13 @@ android {
 }
 
 dependencies {
-    implementation(project(":modules:designsystem"))
-    implementation(project(":modules:data"))
-    implementation(project(":modules:ui"))
-    implementation(project(":modules:model"))
+    implementation(projects.modules.designsystem)
+    implementation(projects.modules.data)
+    implementation(projects.modules.ui)
 
 
-    implementation(project(":feature:mainscreen"))
+//    implementation(projects.features.main)
+//    implementation(projects.features.detail)
 
     implementation(project(":feature:editScreen"))
     implementation(project(":feature:labelscreen"))
@@ -95,47 +98,55 @@ dependencies {
     implementation(project(":feature:gallery"))
     implementation(project(":feature:drawing"))
     implementation(project(":feature:about"))
+    implementation(project(":feature:mainscreen"))
 
-    implementation(project(":modules:worker"))
+//    implementation(project(":modules:worker"))
 
     implementation(libs.kotlinx.serialization.json)
 
-    implementation(libs.timber)
-    debugImplementation(libs.leakcanary.android)
 
     implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.compose.material3.adaptive)
+    implementation(libs.androidx.compose.material3.adaptive.layout)
+    implementation(libs.androidx.compose.material3.adaptive.navigation)
+    implementation(libs.androidx.compose.material3.windowSizeClass)
+    implementation(libs.androidx.compose.runtime.tracing)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.core.splashscreen)
-    implementation(libs.androidx.tracing.ktx)
+    implementation(libs.androidx.hilt.navigation.compose)
     implementation(libs.androidx.lifecycle.runtimeCompose)
-    implementation(libs.androidx.compose.material3.windowSizeClass)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.profileinstaller)
-    implementation (libs.guava)
-
-//    implementation(libs.kotlinx.coroutines.guava)
+    implementation(libs.androidx.tracing.ktx)
+    implementation(libs.androidx.window.core)
+    implementation(libs.kotlinx.coroutines.guava)
     implementation(libs.coil.kt)
+    implementation(libs.timber)
+
+    ksp(libs.hilt.compiler)
 
     debugImplementation(libs.androidx.compose.ui.testManifest)
-//    debugImplementation(projects.uiTestHiltManifest)
+    debugImplementation(projects.uiTestHiltManifest)
 
     kspTest(libs.hilt.compiler)
 
-//    testImplementation(projects.core.dataTest)
-    testImplementation(project(":modules:testing"))
-    testImplementation(libs.accompanist.testharness)
+    testImplementation(projects.modules.testing)
+    testImplementation(libs.androidx.compose.ui.test)
+    testImplementation(libs.androidx.work.testing)
     testImplementation(libs.hilt.android.testing)
-//    testImplementation(libs.work.testing)
 
-    testImplementation(libs.robolectric)
-    testImplementation(libs.roborazzi)
+    testFossReliantImplementation(libs.robolectric)
+    testFossReliantImplementation(libs.roborazzi)
+    testFossReliantImplementation(projects.modules.screenshotTesting)
+
 
-    androidTestImplementation(project(":modules:testing"))
+    androidTestImplementation(projects.modules.testing)
+    androidTestImplementation(libs.androidx.test.espresso.core)
     androidTestImplementation(libs.androidx.navigation.testing)
-    androidTestImplementation(libs.accompanist.testharness)
+    androidTestImplementation(libs.androidx.compose.ui.test)
     androidTestImplementation(libs.hilt.android.testing)
-    debugImplementation (libs.androidx.monitor)
-    baselineProfile(project(":benchmarks"))
+
+    baselineProfile(projects.benchmarks)
 
 
     googlePlayImplementation(platform(libs.firebase.bom))
@@ -164,4 +175,4 @@ baselineProfile {
 dependencyGuard {
     configuration("fossReliantReleaseRuntimeClasspath")
     configuration("googlePlayReleaseRuntimeClasspath")
-}
+}