chore: update CommonExtension signature

daniel-waiguru · Jun 19, 2024 · fabe8b0 · fabe8b0
1 parent 65539fb
commit fabe8b0
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 77 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -71,6 +71,7 @@ android {
 
 dependencies {
     implementation(project(":presentation"))
+    implementation(project(":data"))
     implementation(project(":designsystem"))
     coreLibraryDesugaring(libs.android.desugarJdkLibs)
     debugImplementation(libs.leakcanary.android)

diff --git a/app/src/main/java/com/danielwaiguru/weatherapp/activity/MainActivity.kt b/app/src/main/java/com/danielwaiguru/weatherapp/activity/MainActivity.kt
@@ -27,22 +27,15 @@ package com.danielwaiguru.weatherapp.activity
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.danielwaiguru.weatherapp.navigation.WeatherApp
 import dagger.hilt.android.AndroidEntryPoint
-import androidx.compose.ui.platform.LocalLifecycleOwner as PlatformLifecycleOwner
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            CompositionLocalProvider(
-                LocalLifecycleOwner provides PlatformLifecycleOwner.current
-            ) {
-                WeatherApp()
-            }
+            WeatherApp()
         }
     }
 }
diff --git a/...-logic/convention/src/main/java/com/danielwaiguru/weatherapp/convention/AndroidCompose.kt b/...-logic/convention/src/main/java/com/danielwaiguru/weatherapp/convention/AndroidCompose.kt
@@ -29,22 +29,18 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getByType
-import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 /**
  * Configure Compose-specific options
  */
 internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         buildFeatures {
             compose = true
         }
         val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
-//        composeOptions {
-//            kotlinCompilerExtensionVersion = libs.findVersion("androidxComposeCompiler").get().toString()
-//        }
         packaging {
             resources {
                 excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -63,10 +59,7 @@ internal fun Project.configureAndroidCompose(
             add("debugImplementation", libs.findBundle("compose-testing-manifest").get())
         }
     }
-
-    tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-            freeCompilerArgs = freeCompilerArgs
-        }
-    }
+//    extensions.configure<ComposeCompilerGradlePluginExtension> {
+//        enableStrongSkippingMode = true
+//    }
 }
diff --git a/build-logic/convention/src/main/java/com/danielwaiguru/weatherapp/convention/Jacoco.kt b/build-logic/convention/src/main/java/com/danielwaiguru/weatherapp/convention/Jacoco.kt
@@ -40,7 +40,9 @@ private val coverageExclusions = listOf(
     "**/R.class",
     "**/R\$*.class",
     "**/BuildConfig.*",
-    "**/Manifest*.*"
+    "**/Manifest*.*",
+    "**/*_Hilt*.class",
+    "**/Hilt_*.class",
 )
 
 private fun String.capitalize() = replaceFirstChar {
@@ -85,12 +87,9 @@ internal fun Project.configureJacoco(
     tasks.withType<Test>().configureEach {
         configure<JacocoTaskExtension> {
             // Required for JaCoCo + Robolectric
-            // https://github.com/robolectric/robolectric/issues/2230
-            // TODO: Consider removing if not we don't add Robolectric
             isIncludeNoLocationClasses = true
 
-            // Required for JDK 11 with the above
-            // https://github.com/gradle/gradle/issues/5184#issuecomment-391982009
+            // Required for JDK 11 or the above
             excludes = listOf("jdk.internal.*")
         }
     }

diff --git a/...d-logic/convention/src/main/java/com/danielwaiguru/weatherapp/convention/KotlinAndroid.kt b/...d-logic/convention/src/main/java/com/danielwaiguru/weatherapp/convention/KotlinAndroid.kt
@@ -27,17 +27,17 @@
 package com.danielwaiguru.weatherapp.convention
 
 import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.CompileOptions
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.plugins.ExtensionAware
-import org.gradle.kotlin.dsl.provideDelegate
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
+import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 
 /**
  * Configure base Kotlin with Android options
  */
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         compileSdk = 34
@@ -47,13 +47,6 @@ internal fun Project.configureKotlinAndroid(
                 getByName("release") {
                     isMinifyEnabled = true
                 }
-                getByName("debug") {
-                    isMinifyEnabled = true
-                    proguardFiles(
-                        getDefaultProguardFile("proguard-android-optimize.txt"),
-                        "proguard-rules.pro"
-                    )
-                }
             }
         }
 
@@ -63,25 +56,10 @@ internal fun Project.configureKotlinAndroid(
             isCoreLibraryDesugaringEnabled = true
         }
 
-        kotlinOptions {
-            // Treat all Kotlin warnings as errors (disabled by default)
-            // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
-            val warningsAsErrors: String? by project
-            allWarningsAsErrors = warningsAsErrors.toBoolean()
-
-            freeCompilerArgs = freeCompilerArgs + listOf(
-                "-opt-in=kotlin.RequiresOptIn",
-                // Enable experimental coroutines APIs, including Flow
-                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                "-opt-in=kotlinx.coroutines.FlowPreview"
-            )
-
-            // Set JVM target to 17
-            jvmTarget = JavaVersion.VERSION_17.toString()
-        }
+        configureKotlin<KotlinAndroidProjectExtension>()
     }
 }
 
-fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: CompileOptions.() -> Unit) {
     (this as ExtensionAware).extensions.configure("kotlinOptions", block)
 }
diff --git a/build-logic/convention/src/main/java/com/danielwaiguru/weatherapp/convention/KotlinJvm.kt b/build-logic/convention/src/main/java/com/danielwaiguru/weatherapp/convention/KotlinJvm.kt
@@ -26,44 +26,45 @@ package com.danielwaiguru.weatherapp.convention
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.provideDelegate
-import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
 
 /**
  * Configure base Kotlin options for JVM (non-Android)
  */
 internal fun Project.configureKotlinJvm() {
     extensions.configure<JavaPluginExtension> {
-        // Up to Java 17 APIs are available through desugaring
+        // Up to Java 11 APIs are available through desugaring
         // https://developer.android.com/studio/write/java11-minimal-support-table
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    configureKotlin()
+    configureKotlin<KotlinJvmProjectExtension>()
 }
 
 /**
  * Configure base Kotlin options
  */
-private fun Project.configureKotlin() {
-    // Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
-    tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-            // Set JVM target to 17
-            jvmTarget = JavaVersion.VERSION_17.toString()
-            // Treat all Kotlin warnings as errors (disabled by default)
-            // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
-            val warningsAsErrors: String? by project
-            allWarningsAsErrors = warningsAsErrors.toBoolean()
-            freeCompilerArgs = freeCompilerArgs + listOf(
-                "-opt-in=kotlin.RequiresOptIn",
-                // Enable experimental coroutines APIs, including Flow
-                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                "-opt-in=kotlinx.coroutines.FlowPreview",
-            )
-        }
+inline fun <reified T : KotlinTopLevelExtension> Project.configureKotlin() = configure<T> {
+    // Treat all Kotlin warnings as errors (disabled by default)
+    // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
+    val warningsAsErrors: String? by project
+    when (this) {
+        is KotlinAndroidProjectExtension -> compilerOptions
+        is KotlinJvmProjectExtension -> compilerOptions
+        else -> TODO("Unsupported project extension $this ${T::class}")
+    }.apply {
+        jvmTarget = JvmTarget.JVM_17
+        allWarningsAsErrors = warningsAsErrors.toBoolean()
+        freeCompilerArgs.add(
+            // Enable experimental coroutines APIs, including Flow
+            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+        )
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.5.0"
+agp = "8.4.2"
 kotlin = "2.0.0"
 ksp = "2.0.0-1.0.22"
 core-ktx = "1.13.1"