[1.128.*] Pre-release merge (#565)

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Swiping a post from left to right now offers a share action
 
+### Changed
+
+- Upgrade to Kotlin 2.0.0
+
 ## [1.47.0] - 2024-05-14
 
 ### Changed

android/build.gradle.kts

@@ -23,17 +23,15 @@ plugins {
   alias(libs.plugins.baselineprofile)
   alias(libs.plugins.licensee)
   alias(libs.plugins.tracelog)
+  alias(libs.plugins.kotlin.composeCompiler)
 }
 
 android {
   namespace = "dev.msfjarvis.claw.android"
   defaultConfig.applicationId = "dev.msfjarvis.claw.android"
   defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   buildFeatures.compose = true
-  composeOptions {
-    useLiveLiterals = false
-    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-  }
+  composeOptions { useLiveLiterals = false }
   buildTypes.create("internal") {
     matchingFallbacks += "release"
     signingConfig = signingConfigs["debug"]

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinAndroidPlugin.kt

@@ -7,15 +7,12 @@
 package dev.msfjarvis.claw.gradle
 
 import dev.msfjarvis.claw.gradle.KotlinCommonPlugin.Companion.JVM_TOOLCHAIN_ACTION
-import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.getByType
-import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 @Suppress("Unused")
 class KotlinAndroidPlugin : Plugin<Project> {
@@ -26,29 +23,5 @@ class KotlinAndroidPlugin : Plugin<Project> {
       apply(KotlinCommonPlugin::class)
     }
     project.extensions.getByType<KotlinProjectExtension>().jvmToolchain(JVM_TOOLCHAIN_ACTION)
-    val libs = project.extensions.getByName("libs") as LibrariesForLibs
-    val composeCompilerVersion = libs.versions.composeCompiler.get()
-    val kotlinVersion = libs.versions.kotlin.get()
-    val matches = COMPOSE_COMPILER_VERSION_REGEX.find(composeCompilerVersion)
-    project.tasks.withType<KotlinCompile>().configureEach {
-      compilerOptions.freeCompilerArgs.addAll(
-        "-P",
-        "plugin:androidx.compose.compiler.plugins.kotlin:strongSkipping=true",
-      )
-      if (matches != null) {
-        val (compilerKotlinVersion) = matches.destructured
-        if (compilerKotlinVersion != kotlinVersion) {
-          compilerOptions.freeCompilerArgs.addAll(
-            "-P",
-            "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=$kotlinVersion",
-          )
-        }
-      }
-    }
-  }
-
-  private companion object {
-    // Matches against 1.5.0-dev-k1.9.0-6a60475e07f
-    val COMPOSE_COMPILER_VERSION_REGEX = "\\d.\\d.\\d-dev-k(\\d.\\d.\\d+)-[a-z0-9]+".toRegex()
   }
 }

common/build.gradle.kts

@@ -13,17 +13,15 @@ plugins {
   id("dev.msfjarvis.claw.kotlin-android")
   alias(libs.plugins.anvil)
   alias(libs.plugins.whetstone)
+  alias(libs.plugins.kotlin.composeCompiler)
 }
 
 android {
   buildFeatures {
     androidResources = true
     compose = true
   }
-  composeOptions {
-    useLiveLiterals = false
-    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-  }
+  composeOptions { useLiveLiterals = false }
   namespace = "dev.msfjarvis.claw.common"
 }
 

gradle/libs.versions.toml

@@ -1,19 +1,17 @@
 [versions]
-aboutLibraries = "11.1.4"
+aboutLibraries = "11.2.0"
 agp = "8.4.1"
 android-junit5 = "1.10.0.0"
 benchmark = "1.3.0-alpha05"
 coil = "2.6.0"
-# @keep used for kotlinCompilerExtensionVersion
-composeCompiler = "1.5.14"
 coroutines = "1.8.1"
 dagger = "2.51.1"
 glance = "1.0.0"
 junit = "5.10.2"
 konvert = "3.2.0"
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 kotlinResult = "2.0.0"
-leakcanary = "3.0-alpha-4"
+leakcanary = "3.0-alpha-5"
 lifecycle = "2.8.0"
 retrofit = "2.11.0"
 richtext = "1.0.0-alpha01"
@@ -103,7 +101,7 @@ retrofit-kotlinxSerializationConverter = { module = "com.squareup.retrofit2:conv
 sentry-android = { module = "io.sentry:sentry-android", version.ref = "sentry-sdk" }
 sentry-bom = { module = "io.sentry:sentry-bom", version.ref = "sentry-sdk" }
 slack-compose-lints = "com.slack.lint.compose:compose-lint-checks:1.3.1"
-slack-lints = "com.slack.lint:slack-lint-checks:0.7.3"
+slack-lints = "com.slack.lint:slack-lint-checks:0.7.4"
 sqldelight-androidDriver = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
 sqldelight-dialect338 = { module = "app.cash.sqldelight:sqlite-3-38-dialect", version.ref = "sqldelight" }
 sqldelight-extensions-coroutines = { module = "app.cash.sqldelight:coroutines-extensions-jvm", version.ref = "sqldelight" }
@@ -122,11 +120,12 @@ android-test = { id = "com.android.test", version.ref = "agp" }
 anvil = "com.squareup.anvil:2.5.0-beta09"
 baselineprofile = { id = "androidx.baselineprofile", version.ref = "benchmark" }
 dependencyAnalysis = "com.autonomousapps.dependency-analysis:1.31.0"
+kotlin-composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-ksp = "com.google.devtools.ksp:1.9.24-1.0.20"
+ksp = "com.google.devtools.ksp:2.0.0-1.0.21"
 licensee = "app.cash.licensee:1.11.0"
 modulegraphassert = "com.jraska.module.graph.assertion:2.5.0"
-poko = "dev.drewhamilton.poko:0.15.3"
+poko = "dev.drewhamilton.poko:0.16.0-beta01"
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
 tracelog = "dev.msfjarvis.tracelog:0.1.3"
 whetstone = { id = "dev.msfjarvis.whetstone", version.ref = "whetstone" }

web/build.gradle.kts

@@ -9,12 +9,12 @@
 plugins {
   id("dev.msfjarvis.claw.android-library")
   id("dev.msfjarvis.claw.kotlin-android")
+  alias(libs.plugins.kotlin.composeCompiler)
 }
 
 android {
   namespace = "com.google.accompanist.web"
   buildFeatures.compose = true
-  composeOptions.kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
   kotlin.explicitApi()
   // Don't quite care
   lint.disable += "DeprecatedCall"