Merge pull request #210 from PatilShreyas/update-kotlin-2.0.20

Update to AGP 8.6.1, Kotlin 2.0.22 and use Compose Plugin

app/build.gradle

@@ -1,15 +1,16 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "dev.shreyaspatil.capturableExample"
         minSdk 21
-        targetSdk 34
+        targetSdk 35
         versionCode 1
         versionName "1.0"
 
@@ -57,7 +58,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6'
-    implementation 'androidx.activity:activity-compose:1.9.1'
+    implementation 'androidx.activity:activity-compose:1.9.2'
 
     // Jetpack Compose
     implementation platform("androidx.compose:compose-bom:$composeBomVersion")

build.gradle

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        agpVersion = '8.2.2'
-        kotlinVersion = '1.9.22'
+        agpVersion = '8.6.1'
+        kotlinVersion = '2.0.20'
         dokkaVersion = '1.9.20'
         coroutinesVersion = '1.8.1'
         androidCoreVersion = '1.13.1'
@@ -27,6 +27,7 @@ buildscript {
 
 plugins {
     id 'com.diffplug.spotless' version "$spotlessVersion"
+    id "org.jetbrains.kotlin.plugin.compose" version "$kotlinVersion" apply false
 }
 
 subprojects {

capturable/build.gradle

@@ -2,14 +2,15 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'org.jetbrains.dokka'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         minSdk 21
-        targetSdk 34
+        targetSdk 35
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

gradle.properties

@@ -19,6 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
+
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Jan 25 19:41:13 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists