From 147e4e371fd87eee7170c5e3bfcd76f19234de74 Mon Sep 17 00:00:00 2001 From: Arnau Mora Date: Mon, 28 Aug 2023 12:03:03 +0200 Subject: [PATCH 1/6] Upgrade Kotlin to 1.9.0 Signed-off-by: Arnau Mora --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 34436f6..c6d3e13 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id("com.android.library") version "8.0.2" apply false - id("org.jetbrains.kotlin.android") version "1.8.21" apply false - id("org.jetbrains.dokka") version "1.8.10" apply false + id("org.jetbrains.kotlin.android") version "1.9.0" apply false + id("org.jetbrains.dokka") version "1.9.0" apply false } group = "at.bitfire" From 20a40aecea8b6e60e23059674e151477dc840708 Mon Sep 17 00:00:00 2001 From: Arnau Mora Date: Mon, 28 Aug 2023 12:03:23 +0200 Subject: [PATCH 2/6] Upgrade Compose Compiler to 1.5.2 Signed-off-by: Arnau Mora --- lib/build.gradle.kts | 2 +- sample-app/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 6a013a4..30fad84 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -32,7 +32,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.4.7" + kotlinCompilerExtensionVersion = "1.5.2" } lint { diff --git a/sample-app/build.gradle b/sample-app/build.gradle index 7b2f51e..d1139ba 100644 --- a/sample-app/build.gradle +++ b/sample-app/build.gradle @@ -38,7 +38,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.4.7' // keep in sync with Kotlin version in top-level build.gradle + kotlinCompilerExtensionVersion '1.5.2' // keep in sync with Kotlin version in top-level build.gradle } packagingOptions { resources { From 0d53c43df0ca27f55e71a4835f53606b948b8a7b Mon Sep 17 00:00:00 2001 From: Arnau Mora Date: Mon, 28 Aug 2023 12:03:34 +0200 Subject: [PATCH 3/6] Upgrade Compose BOM to 2023.08.00 Signed-off-by: Arnau Mora --- lib/build.gradle.kts | 2 +- sample-app/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 30fad84..340620a 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -82,7 +82,7 @@ dependencies { implementation("org.conscrypt:conscrypt-android:2.5.2") // Jetpack Compose - val composeBom = platform("androidx.compose:compose-bom:2023.04.01") + val composeBom = platform("androidx.compose:compose-bom:2023.08.00") implementation(composeBom) androidTestImplementation(composeBom) implementation("androidx.activity:activity-compose:1.7.2") diff --git a/sample-app/build.gradle b/sample-app/build.gradle index d1139ba..3b4bc3a 100644 --- a/sample-app/build.gradle +++ b/sample-app/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation 'com.google.android.material:material:1.9.0' implementation 'androidx.activity:activity-compose:1.7.2' - implementation platform('androidx.compose:compose-bom:2023.06.01') + implementation platform('androidx.compose:compose-bom:2023.08.00') implementation 'androidx.compose.material:material' implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.ui:ui-graphics' From 2587a699dd7f902ef6d61df5581d5f09a3bd6b8f Mon Sep 17 00:00:00 2001 From: Arnau Mora Date: Mon, 28 Aug 2023 12:05:29 +0200 Subject: [PATCH 4/6] Removed unnecessary library Signed-off-by: Arnau Mora --- lib/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 340620a..588eb90 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -74,7 +74,6 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib") implementation("androidx.appcompat:appcompat:1.6.1") - implementation("androidx.cardview:cardview:1.0.0") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.1") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1") From 35779de044803a6b170b906600cc46badfe4b0eb Mon Sep 17 00:00:00 2001 From: Arnau Mora Date: Mon, 28 Aug 2023 12:07:00 +0200 Subject: [PATCH 5/6] Upgrade AGP to 8.1.0 Signed-off-by: Arnau Mora --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index c6d3e13..8303745 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.library") version "8.0.2" apply false + id("com.android.library") version "8.1.0" apply false id("org.jetbrains.kotlin.android") version "1.9.0" apply false id("org.jetbrains.dokka") version "1.9.0" apply false } From 72b70575e322ec605bcd789f3afc8fcf0963eba9 Mon Sep 17 00:00:00 2001 From: Arnau Mora Date: Mon, 28 Aug 2023 12:20:29 +0200 Subject: [PATCH 6/6] Downgrade Dokka to 1.8.20 Signed-off-by: Arnau Mora --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8303745..7373880 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("com.android.library") version "8.1.0" apply false id("org.jetbrains.kotlin.android") version "1.9.0" apply false - id("org.jetbrains.dokka") version "1.9.0" apply false + id("org.jetbrains.dokka") version "1.8.20" apply false } group = "at.bitfire"