From fe8bd4a6701eb94221b1ca89fe91e7442b551def Mon Sep 17 00:00:00 2001 From: Infi Date: Sat, 28 Jan 2023 15:23:09 +0100 Subject: [PATCH] chore: update android gradle plugin and compose via BOM --- app/build.gradle | 15 +++++++++------ build.gradle | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- markdown/build.gradle | 5 +++-- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0eed5313..f7ab3acf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,11 +59,14 @@ dependencies { // JSON Serialization implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1" + // Compose BOM + implementation platform("androidx.compose:compose-bom:$compose_bom_version") + // Jetpack Compose - implementation "androidx.compose.ui:ui:$compose_libraries_version" - implementation "androidx.compose.ui:ui-util:$compose_libraries_version" - implementation 'androidx.compose.material3:material3:1.0.1' - implementation "androidx.compose.ui:ui-tooling-preview:$compose_libraries_version" + implementation "androidx.compose.ui:ui" + implementation "androidx.compose.ui:ui-util" + implementation 'androidx.compose.material3:material3' + implementation "androidx.compose.ui:ui-tooling-preview" implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1' implementation 'androidx.activity:activity-compose:1.6.1' @@ -84,8 +87,8 @@ dependencies { implementation "androidx.navigation:navigation-compose:$nav_version" // Jetpack Compose Tooling - debugImplementation "androidx.compose.ui:ui-tooling:$compose_libraries_version" - debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_libraries_version" + debugImplementation "androidx.compose.ui:ui-tooling" + debugImplementation "androidx.compose.ui:ui-test-manifest" // Hilt - Dependency Injection implementation "com.google.dagger:hilt-android:$hilt_version" diff --git a/build.gradle b/build.gradle index 3a626d6f..4d0bbc13 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ buildscript { ext { - compose_version = '1.3.2' - compose_libraries_version = '1.3.2' - accompanist_version = '0.27.1' + compose_version = '1.4.0' + compose_bom_version = '2023.01.00' + accompanist_version = '0.28.0' okhttp_version = '4.10.0' nav_version = '2.5.3' hilt_version = '2.44' @@ -16,10 +16,10 @@ buildscript { // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false - id 'org.jetbrains.kotlin.android' version '1.7.20' apply false - id 'org.jetbrains.kotlin.plugin.serialization' version '1.7.20' apply false + id 'com.android.application' version '7.4.0' apply false + id 'com.android.library' version '7.4.0' apply false + id 'org.jetbrains.kotlin.android' version '1.8.0' apply false + id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.0' apply false id "com.google.dagger.hilt.android" version "2.44" apply false id 'com.mikepenz.aboutlibraries.plugin' version "10.5.2" apply false } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fde0865d..e8c195ef 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Nov 20 00:24:55 CET 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/markdown/build.gradle b/markdown/build.gradle index 87c7d51f..eb916bfe 100644 --- a/markdown/build.gradle +++ b/markdown/build.gradle @@ -39,9 +39,10 @@ android { dependencies { implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.0' - implementation 'com.google.android.material:material:1.7.0' + implementation 'com.google.android.material:material:1.8.0' - implementation "androidx.compose.ui:ui:$compose_libraries_version" + implementation platform("androidx.compose:compose-bom:$compose_bom_version") + implementation "androidx.compose.ui:ui" testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5'