Merge pull request #87 from KakaoCup/prepare-release

Prepare release

README.md

@@ -1,5 +1,5 @@
 # Kakao Compose
-[![Kotlin version badge](https://img.shields.io/badge/kotlin-1.9.20-blue.svg)](https://kotlinlang.org/)
+[![Kotlin version badge](https://img.shields.io/badge/kotlin-2.0.0-blue.svg)](https://kotlinlang.org/)
 [![Telegram](https://img.shields.io/static/v1?label=Telegram&message=RU&color=0088CC)](https://t.me/kaspresso)
 [![Telegram](https://img.shields.io/static/v1?label=Telegram&message=EN&color=0088CC)](https://t.me/kaspresso_en)
 

build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+    alias(libs.plugins.compose.compiler) apply false
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}

buildSrc/build.gradle.kts

@@ -9,8 +9,8 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
-    implementation("com.android.tools.build:gradle:8.1.4")
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
+    implementation("com.android.tools.build:gradle:8.5.0")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
     implementation("org.kohsuke:github-api:1.129")
 }

buildsystem/version

@@ -1 +1 @@
-0.3.0
+0.4.0

compose/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("com.android.library")
     kotlin ("android")
     id("org.jetbrains.dokka")
+    alias(libs.plugins.compose.compiler)
 }
 
 android {

compose/src/main/kotlin/io/github/kakaocup/compose/rule/KakaoComposeTestRule.kt

@@ -1,25 +1,28 @@
 package io.github.kakaocup.compose.rule
 
-import androidx.compose.ui.test.SemanticsMatcher
-import androidx.compose.ui.test.SemanticsNodeInteraction
-import androidx.compose.ui.test.SemanticsNodeInteractionCollection
 import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
-import androidx.compose.ui.test.junit4.ComposeContentTestRule
 import io.github.kakaocup.compose.KakaoCompose
 import org.junit.rules.TestRule
 import org.junit.runner.Description
 import org.junit.runners.model.Statement
 
 class KakaoComposeTestRule(
-    val semanticsProvider: SemanticsNodeInteractionsProvider,
+    val semanticsProvider: SemanticsNodeInteractionsProvider? = null,
+    val useUnmergedTree: Boolean? = null
 ) : TestRule {
     override fun apply(base: Statement, description: Description): Statement =
         object : Statement() {
             override fun evaluate() {
-                val oldSemanticsProvided = KakaoCompose.Global.semanticsProvider
-                KakaoCompose.Global.semanticsProvider = semanticsProvider
+                val preEvaluatedSemanticsProvided = KakaoCompose.Global.semanticsProvider
+                semanticsProvider?.let { KakaoCompose.Global.semanticsProvider = it }
+                val preUseUnmergedTree = KakaoCompose.Override.useUnmergedTree
+                useUnmergedTree?.let { KakaoCompose.Override.useUnmergedTree = it }
+
                 base.evaluate()
-                KakaoCompose.Global.semanticsProvider = oldSemanticsProvided
+
+                KakaoCompose.Global.semanticsProvider = preEvaluatedSemanticsProvided
+                KakaoCompose.Override.useUnmergedTree = preUseUnmergedTree
             }
         }
 }
+

gradle/libs.versions.toml

@@ -1,20 +1,20 @@
 [versions]
-gradleVersion = "8.1.4"
-kotlinVersion = "1.9.20"
+kotlin = "2.0.0"
+gradleVersion = "8.5.0"
 
 dokkaVersion = "1.9.10"
-appcompatVersion = "1.6.1"
-espressoVersion = "3.5.1"
+appcompatVersion = "1.7.0"
+espressoVersion = "3.6.1"
 
 junitVersion = "4.13.2"
-junitExtVersion = "1.1.5"
+junitExtVersion = "1.2.1"
 multidexVersion = "2.0.1"
-materialVersion = "1.10.0"
-activityComposeVersion = "1.8.0"
+materialVersion = "1.12.0"
+activityComposeVersion = "1.9.0"
 composeMaterialVersion = "1.3.1"
 composeCompilerVersion = "1.5.4"
 
-androidxComposeBom = "2023.10.01"
+androidxComposeBom = "2024.06.00"
 
 [libraries]
 gradle = { module = "com.android.tools.build:gradle", version.ref = "gradleVersion" }
@@ -37,3 +37,8 @@ androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version
 
 androidx-multidex-multidex = { group = "androidx.multidex", name = "multidex", version.ref = "multidexVersion" }
 org-jetbrains-dokka-kotlinAsJavaPlugin = { group = "org.jetbrains.dokka", name = "kotlin-as-java-plugin", version.ref = "dokkaVersion" }
+
+[plugins]
+org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Sep 18 21:53:15 PDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

sample/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     id("com.android.application")
     kotlin("android")
+    alias(libs.plugins.compose.compiler)
 }
 
 android {