From 1ac9ce1ec0e7fc58e90a75566585587b2df739c5 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Sat, 22 Oct 2022 12:16:31 +0100 Subject: [PATCH 1/4] extracting the firebase version to the dependencies file and updating to latest --- dependencies.gradle | 2 ++ domains/firebase/crashlytics/build.gradle | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 6e77fe3..dae5794 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -114,6 +114,8 @@ ext.Dependencies.with { kotlinCompilerExtensionVersion = "1.3.2" firebaseCrashlyticsPlugin = "com.google.firebase:firebase-crashlytics-gradle:2.9.1" + firebaseBom = "com.google.firebase:firebase-bom:31.0.1" + jdkLibs = "com.android.tools:desugar_jdk_libs:1.1.5" } diff --git a/domains/firebase/crashlytics/build.gradle b/domains/firebase/crashlytics/build.gradle index f502422..cbb5990 100644 --- a/domains/firebase/crashlytics/build.gradle +++ b/domains/firebase/crashlytics/build.gradle @@ -2,6 +2,6 @@ applyAndroidLibraryModule(project) dependencies { implementation project(':core') - implementation platform('com.google.firebase:firebase-bom:29.0.3') + implementation platform(Dependencies.google.firebaseBom) implementation 'com.google.firebase:firebase-crashlytics' } From 80c1847a481bc58e1d22f46cb3035be54db81a5f Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Sat, 22 Oct 2022 12:34:34 +0100 Subject: [PATCH 2/4] reusing mockk version and upgrading crashlytics gradle plugin --- build.gradle | 4 ++-- dependencies.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index cc4e835..997f289 100644 --- a/build.gradle +++ b/build.gradle @@ -132,7 +132,7 @@ ext.kotlinTest = { dependencies -> dependencies.testImplementation Dependencies.mavenCentral.kluent dependencies.testImplementation Dependencies.mavenCentral.kotlinTest dependencies.testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.7.20" - dependencies.testImplementation 'io.mockk:mockk:1.13.2' + dependencies.testImplementation Dependencies.mavenCentral.mockk dependencies.testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4' dependencies.testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1' @@ -140,7 +140,7 @@ ext.kotlinTest = { dependencies -> } ext.kotlinFixtures = { dependencies -> - dependencies.testFixturesImplementation 'io.mockk:mockk:1.13.1' + dependencies.testFixturesImplementation Dependencies.mavenCentral.mockk dependencies.testFixturesImplementation Dependencies.mavenCentral.kluent dependencies.testFixturesImplementation Dependencies.mavenCentral.kotlinCoroutinesCore } diff --git a/dependencies.gradle b/dependencies.gradle index dae5794..c3417d1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -113,7 +113,7 @@ ext.Dependencies.with { androidxActivityCompose = "androidx.activity:activity-compose:1.4.0" kotlinCompilerExtensionVersion = "1.3.2" - firebaseCrashlyticsPlugin = "com.google.firebase:firebase-crashlytics-gradle:2.9.1" + firebaseCrashlyticsPlugin = "com.google.firebase:firebase-crashlytics-gradle:2.9.2" firebaseBom = "com.google.firebase:firebase-bom:31.0.1" jdkLibs = "com.android.tools:desugar_jdk_libs:1.1.5" From e87e97fa82cdee3c36225c809e51ffc456fa43de Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Sat, 22 Oct 2022 12:38:15 +0100 Subject: [PATCH 3/4] upgrading material3 library --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index c3417d1..b847b66 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -108,7 +108,7 @@ ext.Dependencies.with { androidxComposeUi = "androidx.compose.ui:ui:${composeVer}" androidxComposeFoundation = "androidx.compose.foundation:foundation:${composeVer}" - androidxComposeMaterial = "androidx.compose.material3:material3:1.0.0-beta03" + androidxComposeMaterial = "androidx.compose.material3:material3:1.0.0-rc01" androidxComposeIconsExtended = "androidx.compose.material:material-icons-extended:${composeVer}" androidxActivityCompose = "androidx.activity:activity-compose:1.4.0" kotlinCompilerExtensionVersion = "1.3.2" From 400e1812ddf695aa623d2a0d7a3f585a5d160718 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Sat, 22 Oct 2022 12:41:27 +0100 Subject: [PATCH 4/4] upgrading activity-compose to latest --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index b847b66..6b00507 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -110,7 +110,7 @@ ext.Dependencies.with { androidxComposeFoundation = "androidx.compose.foundation:foundation:${composeVer}" androidxComposeMaterial = "androidx.compose.material3:material3:1.0.0-rc01" androidxComposeIconsExtended = "androidx.compose.material:material-icons-extended:${composeVer}" - androidxActivityCompose = "androidx.activity:activity-compose:1.4.0" + androidxActivityCompose = "androidx.activity:activity-compose:1.6.0" kotlinCompilerExtensionVersion = "1.3.2" firebaseCrashlyticsPlugin = "com.google.firebase:firebase-crashlytics-gradle:2.9.2"