Compatibility check for Kotlin 2.0

build.gradle

@@ -9,6 +9,7 @@ plugins {
 
   id 'org.jetbrains.kotlin.android' version libs.versions.kotlin apply false
   id "com.vanniktech.maven.publish" version libs.versions.mavenPublish apply false
+  id 'org.jetbrains.kotlin.plugin.compose' version libs.versions.kotlin apply false
   // Just for Gradle Build, included build will be applied
   id("io.github.takahirom.roborazzi") version "1.0.0" apply false
 }

gradle/android.gradle

@@ -18,9 +18,6 @@ android {
   }
   buildFeatures {
   }
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-  }
   testOptions {
     unitTests {
       includeAndroidResources = true

gradle/libs.versions.toml

@@ -3,10 +3,10 @@ javaToolchain = "17"
 javaTarget = "11"
 agp = "7.3.1"
 commons-compress = "1.23.0"
-kotlin = "1.9.22"
+kotlin = "2.0.0"
 mavenPublish = "0.25.3"
 composeCompiler = "1.5.10"
-composeMultiplatform = "1.6.2"
+composeMultiplatform = "1.6.11"
 robolectric = "4.12.2"
 robolectric-android-all = "Q-robolectric-5415296"
 
@@ -36,7 +36,7 @@ dropbox-differ = "0.0.2"
 google-android-material = "1.5.0"
 junit = "4.13.2"
 ktor-serialization-kotlinx-xml = "2.3.11"
-kotlinx-serialization = "1.6.3"
+kotlinx-serialization = "1.7.2"
 squareup-okhttp = "5.0.0-alpha.11"
 kotlinx-io = "0.3.3"
 webjar-material-design-icons = "4.0.0"

include-build/roborazzi-gradle-plugin/src/integrationTest/java/io/github/takahirom/roborazzi/PreviewGenerateTest.kt

@@ -126,6 +126,7 @@ class PreviewModule(
               id("com.android.library")
               id("org.jetbrains.compose")
               id("io.github.takahirom.roborazzi")
+              id("org.jetbrains.kotlin.plugin.compose")
           }
 
           kotlin {

include-build/roborazzi-gradle-plugin/src/integrationTest/projects/sample-generate-preview-tests/build.gradle.kts

@@ -31,12 +31,6 @@ android {
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
-  buildFeatures {
-    compose = true
-  }
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-  }
 
   buildTypes {
     release {

roborazzi-compose-desktop/build.gradle

@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
   id 'org.jetbrains.kotlin.multiplatform'
   id 'org.jetbrains.compose'
+  id 'org.jetbrains.kotlin.plugin.compose'
 }
 if (System.getenv("INTEGRATION_TEST") != "true") {
   pluginManager.apply("com.vanniktech.maven.publish")

roborazzi-compose-ios/build.gradle

@@ -4,6 +4,7 @@ plugins {
   id 'io.github.takahirom.roborazzi'
   id("org.jetbrains.kotlin.plugin.serialization")
     .version(libs.versions.kotlin)
+  id 'org.jetbrains.kotlin.plugin.compose'
 }
 if (System.getenv("INTEGRATION_TEST") != "true") {
   pluginManager.apply("com.vanniktech.maven.publish")
@@ -43,7 +44,6 @@ kotlin {
       dependencies {
         implementation(compose.material3)
         implementation(libs.kotlin.test)
-        implementation(libs.kotlin.test.junit)
       }
     }
   }

roborazzi-compose-preview-scanner-support/build.gradle

@@ -1,6 +1,7 @@
 plugins {
   id 'com.android.library'
   id 'org.jetbrains.kotlin.android'
+  id 'org.jetbrains.kotlin.plugin.compose'
 }
 if (System.getenv("INTEGRATION_TEST") != "true") {
   pluginManager.apply("com.vanniktech.maven.publish")

roborazzi-compose/build.gradle

@@ -1,14 +1,14 @@
 plugins {
   id 'com.android.library'
   id 'org.jetbrains.kotlin.android'
+  id 'org.jetbrains.kotlin.plugin.compose'
 }
 if (System.getenv("INTEGRATION_TEST") != "true") {
   pluginManager.apply("com.vanniktech.maven.publish")
 }
 
 // TODO: Use build-logic
 apply from: rootProject.file('gradle/android.gradle')
-android.buildFeatures.compose = true
 
 android.namespace 'com.github.takahirom.roborazzi.compose'
 

roborazzi-junit-rule/build.gradle

@@ -26,9 +26,6 @@ android {
   }
   buildFeatures {
   }
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-  }
   testOptions {
     unitTests {
       includeAndroidResources = true

sample-android/build.gradle

@@ -2,6 +2,7 @@ plugins {
   id 'com.android.library'
   id 'org.jetbrains.kotlin.android'
   id 'io.github.takahirom.roborazzi'
+  id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -25,10 +26,6 @@ android {
   }
   buildFeatures {
     viewBinding true
-    compose true
-  }
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
   }
   testOptions {
     unitTests {

sample-compose-desktop-jvm/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
   kotlin("jvm")
   id("org.jetbrains.compose")
   id("io.github.takahirom.roborazzi")
+  id("org.jetbrains.kotlin.plugin.compose")
 }
 
 group = "com.github.takahirom.roborazzi.compose.desktop.jvm.sample"

sample-compose-desktop-multiplatform/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
   kotlin("multiplatform")
   id("org.jetbrains.compose")
   id("io.github.takahirom.roborazzi")
+  id("org.jetbrains.kotlin.plugin.compose")
 }
 
 group = "com.github.takahirom.roborazzi.compose.desktop.kmp.sample"

sample-generate-preview-tests/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
 //  id("com.android.library")
   id("org.jetbrains.kotlin.android")
   id("io.github.takahirom.roborazzi")
+  id("org.jetbrains.kotlin.plugin.compose")
 }
 
 roborazzi {
@@ -27,12 +28,6 @@ android {
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
-  buildFeatures {
-    compose = true
-  }
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-  }
 
   buildTypes {
     release {