Merge pull request #70 from ikarenkov/agp-gradle-upgrade

Updated gradle, agp, kotlin

Author: ikarenkov

.github/workflows/pr_checks.yml

@@ -1,9 +1,6 @@
 name: PR checks
 run-name: Running static code analysis and unit tests
 on:
-  push:
-    branches:
-      - "dev"
   pull_request:
     branches:
       - "dev"
@@ -65,4 +62,72 @@ jobs:
         uses: mikepenz/action-junit-report@v4
         if: always()
         with:
-          report_paths: '**/build/test-results/**/TEST-*.xml'
+          report_paths: '**/build/test-results/**/TEST-*.xml'
+
+  dependency-guard-check:
+    name: Dependency Guard Check
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: "Set up JDK 17"
+        uses: actions/setup-java@v4
+        with:
+          java-version: "17"
+          distribution: "temurin"
+          cache: gradle
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Run Dependency Guard
+        id: dependency-guard
+        run: |
+          if ./gradlew modo-compose:dependencyGuard; then
+            echo "result=success" >> $GITHUB_OUTPUT
+          else
+            echo "result=failure" >> $GITHUB_OUTPUT
+            exit 1
+          fi
+        continue-on-error: true
+
+      - name: Comment on PR if Dependency Guard fails
+        if: steps.dependency-guard.outputs.result == 'failure'
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          header: dependency-guard
+          recreate: true
+          message: |
+            ## 🚨 Dependency Guard Check Failed
+
+            The dependency guard check has detected changes in your dependencies that need review.
+
+            ### What to do:
+            1. **Review the dependency changes**: Check what dependencies were added, updated, or removed
+            2. **Check release notes**: For any updated dependencies, review their release notes for breaking changes, security fixes, or important updates
+            3. **Test thoroughly**: Ensure the dependency changes don't break existing functionality
+            4. **Update the baseline**: If the dependency changes are intentional and safe, update the dependency guard baseline by running:
+               ```bash
+               ./gradlew modo-compose:dependencyGuardBaseline
+               ```
+
+            ### More information:
+            - View the full dependency guard report in the workflow logs
+            - The dependency guard plugin helps prevent unintended dependency changes
+            - Always review dependency updates for security and compatibility implications
+
+            Please address these issues before merging this PR.
+
+      - name: Remove dependency guard comment if check passes
+        if: steps.dependency-guard.outputs.result == 'success'
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          header: dependency-guard
+          delete: true
+
+      - name: Fail job if Dependency Guard failed
+        if: steps.dependency-guard.outputs.result == 'failure'
+        run: exit 1

build-logic/convention/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -13,8 +14,8 @@ java {
     targetCompatibility = JavaVersion.VERSION_17
 }
 tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
     }
 }
 
@@ -23,6 +24,7 @@ dependencies {
     compileOnly(libs.android.tools.common)
     compileOnly(libs.kotlin.gradlePlugin)
     compileOnly(libs.detektPlugin)
+    compileOnly(libs.compose.compile.gradlePlugin)
     // workaround for https://github.com/gradle/gradle/issues/15383
     compileOnly(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }
@@ -41,6 +43,14 @@ gradlePlugin {
             id = "modo-android-app"
             implementationClass = "com.github.terrakok.AndroidAppPlugin"
         }
+        register("modo-jetpack-compose-library") {
+            id = "modo-jetpack-compose-library"
+            implementationClass = "com.github.terrakok.JetpackComposeLibraryPlugin"
+        }
+        register("modo-jetpack-compose-app") {
+            id = "modo-jetpack-compose-app"
+            implementationClass = "com.github.terrakok.JetpackComposeAppPlugin"
+        }
         register("modo-publishing") {
             id = "modo-publishing"
             implementationClass = "com.github.terrakok.PublishingPlugin"

build-logic/convention/src/main/kotlin/com/github/terrakok/JetpackComposeAppPlugin.kt

@@ -0,0 +1,17 @@
+package com.github.terrakok
+
+import com.android.build.api.dsl.ApplicationExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+
+class JetpackComposeAppPlugin : Plugin<Project> {
+    override fun apply(project: Project) {
+        with(project) {
+            withVersionCatalog {
+                pluginManager.apply(libs.plugins.compose.compiler.get().pluginId)
+            }
+            configureJetpackCompose(extensions.getByType<ApplicationExtension>())
+        }
+    }
+}

build-logic/convention/src/main/kotlin/com/github/terrakok/JetpackComposeLibraryPlugin.kt

@@ -0,0 +1,17 @@
+package com.github.terrakok
+
+import com.android.build.gradle.LibraryExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+
+class JetpackComposeLibraryPlugin : Plugin<Project> {
+    override fun apply(project: Project) {
+        with(project) {
+            withVersionCatalog {
+                pluginManager.apply(libs.plugins.compose.compiler.get().pluginId)
+            }
+            configureJetpackCompose(extensions.getByType<LibraryExtension>())
+        }
+    }
+}

build-logic/convention/src/main/kotlin/com/github/terrakok/KotlinAndroid.kt

@@ -7,14 +7,18 @@ import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-private val JAVA_VERSION = JavaVersion.VERSION_1_8
+private val JAVA_VERSION = JavaVersion.VERSION_11
+private val JVM_TARGET = JvmTarget.JVM_11
 
 /**
  * Configure base Kotlin with Android options
  */
-fun Project.configureKotlinAndroid(
+internal fun Project.configureKotlinAndroid(
     commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
@@ -36,23 +40,14 @@ fun Project.configureKotlinAndroid(
     configureKotlin()
 }
 
-fun Project.configureJetpackCompose(
+internal fun Project.configureJetpackCompose(
     commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         buildFeatures.compose = true
-        withVersionCatalog {
-            composeOptions.kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtension.get()
-        }
     }
-    tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-            freeCompilerArgs = freeCompilerArgs + listOf(
-                "-P",
-                "plugin:androidx.compose.compiler.plugins.kotlin:stabilityConfigurationPath=" +
-                    "${rootProject.projectDir.absoluteFile}/config/compose/compose_compiler_config.conf"
-            )
-        }
+    configure<ComposeCompilerGradlePluginExtension> {
+        stabilityConfigurationFile.set(rootProject.layout.projectDirectory.file("config/compose/compose_compiler_config.conf"))
     }
 }
 
@@ -75,15 +70,15 @@ internal fun Project.configureKotlinJvm() {
  */
 private fun Project.configureKotlin() {
     // Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
-    tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions {
+    configure<KotlinAndroidProjectExtension>() {
+        compilerOptions {
             // Set JVM target to 8
-            jvmTarget = JAVA_VERSION.toString()
+            jvmTarget.set(JVM_TARGET)
             // 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(
+            allWarningsAsErrors.set(warningsAsErrors.toBoolean())
+            freeCompilerArgs.addAll(
                 "-opt-in=kotlin.RequiresOptIn",
                 // Enable experimental coroutines APIs, including Flow
                 "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",

build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.detekt) apply false
@@ -14,7 +15,7 @@ plugins {
 
 tasks.named<Wrapper>("wrapper") {
     distributionType = Wrapper.DistributionType.ALL
-    gradleVersion = "8.7"
+    gradleVersion = "9.1.0"
 }
 
 // PUBLISHING './gradlew clean modo-compose:bundleReleaseAar modo-compose:publishAllPublicationsToSonatypeRepository'

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 composeWheelPicker = "1.0.0-beta05"
 leakcanaryAndroid = "2.14"
 modo = "0.10.1"
-androidGradlePlugin = "8.4.0"
+androidGradlePlugin = "8.13.0"
 detektComposeVersion = "0.3.20"
 detektVersion = "1.23.6"
 junit = "4.13.2"
@@ -15,7 +15,7 @@ androidxFragment = "1.5.7"
 androidxAppCompat = "1.6.1"
 androidxJunit = "1.1.5"
 androidTools = "31.4.0"
-kotlin = "1.9.23"
+kotlin = "2.0.21"
 kotlinCompilerExtension = "1.5.12"
 minSdk = "21"
 compileSdk = "34"
@@ -56,19 +56,23 @@ android-tools-common = { group = "com.android.tools", name = "common", version.r
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxJunit" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 detektPlugin = { group = "io.gitlab.arturbosch.detekt", name = "detekt-gradle-plugin", version.ref = "detektVersion" }
+compose-compile-gradlePlugin = { group = "org.jetbrains.kotlin.plugin.compose", name = "org.jetbrains.kotlin.plugin.compose.gradle.plugin", version.ref = "kotlin" }
 
 koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
 koin-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin" }
 [plugins]
-modo-detekt = { id = "modo-detekt", version = "unspecified" }
-modo-android-library = { id = "modo-android-library", version = "unspecified" }
-modo-android-app = { id = "modo-android-app", version = "unspecified" }
-modo-publishing = { id = "modo-publishing", version = "unspecified" }
-modo-collectSarif = { id = "modo-collect-sarif", version = "unspecified" }
+modo-detekt = { id = "modo-detekt" }
+modo-android-library = { id = "modo-android-library" }
+modo-android-app = { id = "modo-android-app" }
+modo-publishing = { id = "modo-publishing" }
+modo-compose-app = { id = "modo-jetpack-compose-app" }
+modo-compose-library = { id = "modo-jetpack-compose-library" }
+modo-collectSarif = { id = "modo-collect-sarif" }
 
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektVersion" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 dependencyGuard = { id = "com.dropbox.dependency-guard", version = "0.5.0" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME