From aa1f4cb8274f409d1439e0096b2de829db1af8d5 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Fri, 8 Jul 2022 19:55:53 +0000
Subject: [PATCH] gradle: bump Compose and Kotlin

---
 .../dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt       | 2 --
 gradle.properties                                        | 9 +++++++--
 gradle/libs.versions.toml                                | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt b/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt
index 65671fdc..9a9f657e 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt
+++ b/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinCommonPlugin.kt
@@ -43,8 +43,6 @@ class KotlinCommonPlugin : Plugin<Project> {
     private val ADDITIONAL_COMPILER_ARGS =
       listOf(
         "-opt-in=kotlin.RequiresOptIn",
-        "-P",
-        "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true",
       )
   }
 }
diff --git a/gradle.properties b/gradle.properties
index 8783aebb..08f63536 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,6 +26,13 @@ kapt.include.compile.classpath=false
 # Force disable testOnly flag in manifest
 android.injected.testOnly=false
 
+# New incremental compilation for Kotlin
+kotlin.incremental.useClasspathSnapshot=true
+kotlin.build.report.output=file
+
+# Disable Gradle task that breaks configuration caching
+kotlin.mpp.enableKotlinToolingMetadataArtifact=false
+
 # Use R8 instead of ProGuard for code shrinking.
 android.enableR8.fullMode=false
 
@@ -33,8 +40,6 @@ android.enableR8.fullMode=false
 android.useAndroidX=true
 
 # Kotlin Multiplatform
-kotlin.mpp.enableGranularSourceSetsMetadata=false
-kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.stability.nowarn=true
 
 # Enable non-transitive R class namespacing where each library only contains
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 157bb7de..3e8df4e6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ coil = "2.1.0"
 coroutines = "1.6.3"
 dagger = "2.42"
 hilt = "1.0.0"
-kotlin = "1.6.10"
+kotlin = "1.7.0"
 material_motion = "0.8.4"
 retrofit = "2.9.0"
 richtext = "0.13.0"
@@ -76,7 +76,7 @@ testparameterinjector = "com.google.testparameterinjector:test-parameter-injecto
 [plugins]
 android-test = { id = "com.android.test", version.ref = "agp" }
 aurora-svg-transcoder = { id = "org.pushing-pixels.aurora.tools.svgtranscoder.gradle", version.ref = "aurora" }
-compose = "org.jetbrains.compose:1.1.1"
+compose = "org.jetbrains.compose:1.2.0-alpha01-dev741"
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }
 paparazzi = "app.cash.paparazzi:1.0.0"
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }