From 097702fcebb4c4d57cbca673c0fae4983bbbcf5a Mon Sep 17 00:00:00 2001 From: rosariopf Date: Thu, 15 Sep 2022 15:28:58 +0100 Subject: [PATCH 1/8] chore(admob): add jetpack compose dependencies --- admob/app/build.gradle | 30 +++++++++++++++++++++++++++--- build.gradle | 3 +++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/admob/app/build.gradle b/admob/app/build.gradle index 31978c13a3..823250b0ad 100644 --- a/admob/app/build.gradle +++ b/admob/app/build.gradle @@ -7,17 +7,20 @@ plugins { check.dependsOn 'assembleDebugAndroidTest' android { - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "com.google.samples.quickstart.admobexample" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 21 // minSdk would be 19 without compose + targetSdk 33 versionCode 1 versionName "1.0" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary true + } } buildTypes { @@ -35,6 +38,17 @@ android { buildFeatures { viewBinding = true + compose true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + composeOptions { + kotlinCompilerExtensionVersion '1.3.0' } } @@ -46,6 +60,7 @@ dependencies { implementation 'androidx.browser:browser:1.0.0' implementation 'androidx.navigation:navigation-fragment-ktx:2.5.2' implementation 'androidx.navigation:navigation-ui-ktx:2.5.2' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' implementation 'com.google.android.gms:play-services-ads:21.2.0' @@ -56,9 +71,18 @@ dependencies { // for Google Analytics. This is recommended, but not required. implementation 'com.google.firebase:firebase-analytics' + // Jetpack Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.activity:activity-compose:1.5.1' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.fragment:fragment-testing:1.5.2" androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation 'androidx.test.ext:junit:1.1.3' + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" } diff --git a/build.gradle b/build.gradle index 140a2c37c5..687f6de113 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,7 @@ buildscript { + ext { + compose_version = '1.2.1' + } repositories { google() mavenCentral() From c5a5cbe337c6abab7345900ae48eaebbc0aad0dd Mon Sep 17 00:00:00 2001 From: rosariopf Date: Thu, 15 Sep 2022 15:32:23 +0100 Subject: [PATCH 2/8] chore(analytics): add jetpack compose dependencies --- analytics/app/build.gradle | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/analytics/app/build.gradle b/analytics/app/build.gradle index 15ac986a2e..d8d62acd1b 100644 --- a/analytics/app/build.gradle +++ b/analytics/app/build.gradle @@ -7,16 +7,19 @@ plugins { check.dependsOn 'assembleDebugAndroidTest' android { - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "com.google.firebase.quickstart.analytics" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 21 // minSdk would be 19 without compose + targetSdk 33 versionCode 1 versionName "1.0" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' multiDexEnabled true + vectorDrawables { + useSupportLibrary true + } } buildTypes { @@ -28,6 +31,22 @@ android { buildFeatures { viewBinding = true + compose true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + composeOptions { + kotlinCompilerExtensionVersion '1.3.0' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } } } @@ -40,6 +59,7 @@ dependencies { implementation "androidx.preference:preference-ktx:1.2.0" // Needed to override the version used by preference-ktx implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation platform('com.google.firebase:firebase-bom:30.4.1') @@ -50,8 +70,17 @@ dependencies { // Firebase Analytics (Kotlin) implementation 'com.google.firebase:firebase-analytics-ktx' + // Jetpack Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.activity:activity-compose:1.5.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" } From c88be10660094774017c7e0559d5f2ffac6ba8e4 Mon Sep 17 00:00:00 2001 From: rosariopf Date: Thu, 15 Sep 2022 15:39:55 +0100 Subject: [PATCH 3/8] chore(appdistribution): add jetpack compose dependencies --- appdistribution/app/build.gradle | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/appdistribution/app/build.gradle b/appdistribution/app/build.gradle index c28f92a1ff..8fb93c5393 100644 --- a/appdistribution/app/build.gradle +++ b/appdistribution/app/build.gradle @@ -5,15 +5,18 @@ plugins { } android { - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "com.google.firebase.appdistributionquickstart" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 21 // minSdk would be 19 without compose + targetSdk 33 versionCode 1 versionName "1.0" multiDexEnabled true + vectorDrawables { + useSupportLibrary true + } testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -27,6 +30,22 @@ android { buildFeatures { viewBinding = true + compose true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + composeOptions { + kotlinCompilerExtensionVersion '1.3.0' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } } lint { warning 'InvalidPackage' @@ -51,6 +70,12 @@ dependencies { // for Google Analytics. This is recommended, but not required. implementation 'com.google.firebase:firebase-analytics' + // Jetpack Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.activity:activity-compose:1.5.1' + androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test:rules:1.4.0' From 98e5d04e896bbaa4eb667f7765cb763d4ed5afc0 Mon Sep 17 00:00:00 2001 From: rosariopf Date: Thu, 15 Sep 2022 15:40:23 +0100 Subject: [PATCH 4/8] chore(auth): add jetpack compose dependencies --- auth/app/build.gradle | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/auth/app/build.gradle b/auth/app/build.gradle index 118af27676..fa79901c9e 100644 --- a/auth/app/build.gradle +++ b/auth/app/build.gradle @@ -12,11 +12,14 @@ android { defaultConfig { applicationId "com.google.firebase.quickstart.auth" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 21 // minSdk would be 19 without compose + targetSdk 33 versionCode 1 versionName "1.0" multiDexEnabled true + vectorDrawables { + useSupportLibrary true + } testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } @@ -27,13 +30,24 @@ android { } } - compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 - } - buildFeatures { viewBinding = true + compose true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + composeOptions { + kotlinCompilerExtensionVersion '1.3.0' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } } } @@ -48,6 +62,14 @@ dependencies { implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.navigation:navigation-fragment-ktx:2.5.2' implementation 'androidx.navigation:navigation-ui-ktx:2.5.2' + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' + + // Jetpack Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.activity:activity-compose:1.5.1' // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation platform('com.google.firebase:firebase-bom:30.4.1') From a398783dc7f42bc7efb2bb3411da31e2e39885b3 Mon Sep 17 00:00:00 2001 From: rosariopf Date: Thu, 15 Sep 2022 15:49:57 +0100 Subject: [PATCH 5/8] chore(crash, database): add jetpack compose dependencies --- crash/app/build.gradle | 33 ++++++++++++++++++++++++++++++--- database/app/build.gradle | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/crash/app/build.gradle b/crash/app/build.gradle index e466ec4e42..71fb045452 100644 --- a/crash/app/build.gradle +++ b/crash/app/build.gradle @@ -8,14 +8,17 @@ plugins { check.dependsOn 'assembleDebugAndroidTest' android { - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "com.google.samples.quickstart.crash" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 21 // minSdk would be 19 without compose + targetSdk 33 versionCode 1 versionName "1.0" + vectorDrawables { + useSupportLibrary true + } testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } @@ -33,6 +36,22 @@ android { buildFeatures { viewBinding = true + compose true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + composeOptions { + kotlinCompilerExtensionVersion '1.3.0' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } } } @@ -41,6 +60,8 @@ dependencies { implementation project(":internal:chooserx") implementation 'com.google.android.material:material:1.6.1' implementation "androidx.activity:activity-ktx:1.5.1" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation platform('com.google.firebase:firebase-bom:30.4.1') @@ -55,6 +76,12 @@ dependencies { // For use in the CustomKeySamples -- for testing Google Api Availability. implementation 'com.google.android.gms:play-services-base:18.1.0' + // Jetpack Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.activity:activity-compose:1.5.1' + testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test:rules:1.4.0' diff --git a/database/app/build.gradle b/database/app/build.gradle index 67c29b2e82..03e6d8c7e0 100644 --- a/database/app/build.gradle +++ b/database/app/build.gradle @@ -7,15 +7,18 @@ plugins { check.dependsOn 'assembleDebugAndroidTest' android { - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "com.google.firebase.quickstart.database" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 21 // minSdk would be 19 without compose + targetSdk 33 versionCode 1 versionName "1.0" multiDexEnabled true + vectorDrawables { + useSupportLibrary true + } testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } @@ -29,6 +32,22 @@ android { buildFeatures { viewBinding = true + compose true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + composeOptions { + kotlinCompilerExtensionVersion '1.3.0' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } } } @@ -41,6 +60,8 @@ dependencies { implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.navigation:navigation-fragment-ktx:2.5.2' implementation 'androidx.navigation:navigation-ui-ktx:2.5.2' + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation platform('com.google.firebase:firebase-bom:30.4.1') @@ -59,6 +80,12 @@ dependencies { implementation 'com.firebaseui:firebase-ui-database:8.0.1' + // Jetpack Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.activity:activity-compose:1.5.1' + // Needed to fix a dependency conflict with FirebaseUI' implementation 'androidx.arch.core:core-runtime:2.1.0' From 7a4918459f0edb4b19f1a207d346147afebc6136 Mon Sep 17 00:00:00 2001 From: rosariopf Date: Thu, 15 Sep 2022 15:50:29 +0100 Subject: [PATCH 6/8] chore(fdl, firestore): add jetpack compose dependencies --- dynamiclinks/app/build.gradle | 33 +++++++++++++++++++++++++++++---- firestore/app/build.gradle | 32 ++++++++++++++++++++++++++++---- 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/dynamiclinks/app/build.gradle b/dynamiclinks/app/build.gradle index 9e7804af81..7030331145 100644 --- a/dynamiclinks/app/build.gradle +++ b/dynamiclinks/app/build.gradle @@ -7,16 +7,19 @@ plugins { check.dependsOn 'assembleMainFlavorDebugAndroidTest' android { - compileSdkVersion 33 + compileSdk 33 flavorDimensions "irrelevant" defaultConfig { applicationId "com.google.firebase.quickstart.deeplinks" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 21 // minSdk would be 19 without compose + targetSdk 33 versionCode 1 versionName "1.0" - + multiDexEnabled true + vectorDrawables { + useSupportLibrary true + } testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -41,6 +44,22 @@ android { buildFeatures { viewBinding = true + compose = true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + composeOptions { + kotlinCompilerExtensionVersion '1.3.0' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } } } @@ -63,6 +82,12 @@ dependencies { // for Google Analytics. This is recommended, but not required. implementation 'com.google.firebase:firebase-analytics' + // Jetpack Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.activity:activity-compose:1.5.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' diff --git a/firestore/app/build.gradle b/firestore/app/build.gradle index e8599be4ae..294c4b78dd 100644 --- a/firestore/app/build.gradle +++ b/firestore/app/build.gradle @@ -7,16 +7,18 @@ plugins { android { testBuildType "release" - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "com.google.firebase.example.fireeats" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 21 // minSdk would be 19 without compose + targetSdk 33 versionCode 1 versionName "1.0" multiDexEnabled true - + vectorDrawables { + useSupportLibrary true + } vectorDrawables.useSupportLibrary true lintOptions { @@ -36,6 +38,22 @@ android { buildFeatures { viewBinding = true + compose = true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + composeOptions { + kotlinCompilerExtensionVersion '1.3.0' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } } } @@ -83,6 +101,12 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.5.1' + // Jetpack Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.activity:activity-compose:1.5.1' + // Third-party libraries implementation 'me.zhanghai.android.materialratingbar:library:1.4.0' implementation 'com.github.bumptech.glide:glide:4.12.0' From 61717c47842dcac83f934ec747542d40839a1e6e Mon Sep 17 00:00:00 2001 From: rosariopf Date: Thu, 15 Sep 2022 15:53:40 +0100 Subject: [PATCH 7/8] chore: add jetpack compose dependencies --- functions/app/build.gradle | 31 ++++++++++++++++++++++++++++--- inappmessaging/app/build.gradle | 31 ++++++++++++++++++++++++++++--- messaging/app/build.gradle | 32 ++++++++++++++++++++++++++++---- perf/app/build.gradle | 31 ++++++++++++++++++++++++++++--- storage/app/build.gradle | 31 ++++++++++++++++++++++++++++--- 5 files changed, 140 insertions(+), 16 deletions(-) diff --git a/functions/app/build.gradle b/functions/app/build.gradle index e4128ae0b4..8484680eb5 100644 --- a/functions/app/build.gradle +++ b/functions/app/build.gradle @@ -7,15 +7,18 @@ plugins { android { // Changes the test build type for instrumented tests to "stage". testBuildType "release" - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "com.google.samples.quickstart.functions" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 21 // minSdk would be 19 without compose + targetSdk 33 versionCode 1 versionName "1.0" multiDexEnabled true + vectorDrawables { + useSupportLibrary true + } testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } @@ -30,6 +33,22 @@ android { buildFeatures { viewBinding = true + compose = true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + composeOptions { + kotlinCompilerExtensionVersion '1.3.0' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } } } @@ -66,6 +85,12 @@ dependencies { // Google Play services implementation 'com.google.android.gms:play-services-auth:20.3.0' + // Jetpack Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.activity:activity-compose:1.5.1' + testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test:rules:1.4.0' diff --git a/inappmessaging/app/build.gradle b/inappmessaging/app/build.gradle index d9df028a08..8f4b8c2a6f 100644 --- a/inappmessaging/app/build.gradle +++ b/inappmessaging/app/build.gradle @@ -5,15 +5,18 @@ plugins { } android { - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "com.google.firebase.fiamquickstart" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 21 // minSdk would be 19 without compose + targetSdk 33 versionCode 1 versionName "1.0" multiDexEnabled true + vectorDrawables { + useSupportLibrary true + } testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -27,6 +30,22 @@ android { buildFeatures { viewBinding = true + compose = true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + composeOptions { + kotlinCompilerExtensionVersion '1.3.0' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } } lint { warning 'InvalidPackage' @@ -59,6 +78,12 @@ dependencies { implementation 'com.google.firebase:firebase-installations-ktx:17.0.2' + // Jetpack Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.activity:activity-compose:1.5.1' + androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test:rules:1.4.0' diff --git a/messaging/app/build.gradle b/messaging/app/build.gradle index 67e7f41421..95af22af67 100644 --- a/messaging/app/build.gradle +++ b/messaging/app/build.gradle @@ -7,16 +7,18 @@ plugins { check.dependsOn 'assembleDebugAndroidTest' android { - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "com.google.firebase.quickstart.fcm" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 21 // minSdk would be 19 without compose + targetSdk 33 versionCode 1 versionName "1.0" multiDexEnabled true - + vectorDrawables { + useSupportLibrary true + } testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -35,6 +37,22 @@ android { buildFeatures { viewBinding = true + compose = true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + composeOptions { + kotlinCompilerExtensionVersion '1.3.0' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } } lint { abortOnError false @@ -71,6 +89,12 @@ dependencies { implementation 'androidx.work:work-runtime:2.7.1' + // Jetpack Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.activity:activity-compose:1.5.1' + // Testing dependencies androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' diff --git a/perf/app/build.gradle b/perf/app/build.gradle index ec843ccb94..480548d838 100644 --- a/perf/app/build.gradle +++ b/perf/app/build.gradle @@ -8,14 +8,17 @@ plugins { check.dependsOn 'assembleDebugAndroidTest' android { - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "com.google.firebase.quickstart.perfmon" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 21 // minSdk would be 19 without compose + targetSdk 33 versionCode 1 versionName "1.0" multiDexEnabled true + vectorDrawables { + useSupportLibrary true + } testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -34,6 +37,22 @@ android { } buildFeatures { viewBinding = true + compose = true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + composeOptions { + kotlinCompilerExtensionVersion '1.3.0' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } } } @@ -56,6 +75,12 @@ dependencies { implementation 'com.github.bumptech.glide:glide:4.12.0' + // Jetpack Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.activity:activity-compose:1.5.1' + testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } diff --git a/storage/app/build.gradle b/storage/app/build.gradle index b09a0fe902..36bd6e04ec 100644 --- a/storage/app/build.gradle +++ b/storage/app/build.gradle @@ -7,15 +7,18 @@ plugins { check.dependsOn 'assembleDebugAndroidTest' android { - compileSdkVersion 33 + compileSdk 33 defaultConfig { applicationId "com.google.firebase.quickstart.firebasestorage" - minSdkVersion 19 - targetSdkVersion 33 + minSdk 21 // minSdk would be 19 without compose + targetSdk 33 versionCode 1 versionName "1.0" multiDexEnabled true + vectorDrawables { + useSupportLibrary true + } testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } @@ -28,6 +31,22 @@ android { buildFeatures { viewBinding = true + compose = true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + composeOptions { + kotlinCompilerExtensionVersion '1.3.0' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } } } @@ -50,6 +69,12 @@ dependencies { // Firebase Authentication (Kotlin) implementation 'com.google.firebase:firebase-auth-ktx' + // Jetpack Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.activity:activity-compose:1.5.1' + implementation 'androidx.activity:activity-ktx:1.5.1' implementation 'androidx.appcompat:appcompat:1.5.1' implementation 'com.google.android.material:material:1.6.1' From 00884de5b4efcbe2475370834dd445eb5258fe54 Mon Sep 17 00:00:00 2001 From: rosariopf Date: Thu, 15 Sep 2022 16:47:39 +0100 Subject: [PATCH 8/8] chore(*): add missing dependencies --- appdistribution/app/build.gradle | 4 ++++ auth/app/build.gradle | 3 +++ crash/app/build.gradle | 3 +++ database/app/build.gradle | 3 +++ dynamiclinks/app/build.gradle | 4 ++++ firestore/app/build.gradle | 3 +++ functions/app/build.gradle | 4 ++++ inappmessaging/app/build.gradle | 4 ++++ messaging/app/build.gradle | 4 ++++ perf/app/build.gradle | 3 +++ storage/app/build.gradle | 4 ++++ 11 files changed, 39 insertions(+) diff --git a/appdistribution/app/build.gradle b/appdistribution/app/build.gradle index 8fb93c5393..51efaeabf0 100644 --- a/appdistribution/app/build.gradle +++ b/appdistribution/app/build.gradle @@ -59,6 +59,7 @@ dependencies { implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.multidex:multidex:2.0.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation platform('com.google.firebase:firebase-bom:30.4.1') @@ -80,4 +81,7 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" } diff --git a/auth/app/build.gradle b/auth/app/build.gradle index fa79901c9e..676ccdb3ae 100644 --- a/auth/app/build.gradle +++ b/auth/app/build.gradle @@ -95,4 +95,7 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" } diff --git a/crash/app/build.gradle b/crash/app/build.gradle index 71fb045452..cc37ea276e 100644 --- a/crash/app/build.gradle +++ b/crash/app/build.gradle @@ -87,4 +87,7 @@ dependencies { androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" } diff --git a/database/app/build.gradle b/database/app/build.gradle index 03e6d8c7e0..9c1b5ef28d 100644 --- a/database/app/build.gradle +++ b/database/app/build.gradle @@ -93,4 +93,7 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" } diff --git a/dynamiclinks/app/build.gradle b/dynamiclinks/app/build.gradle index 7030331145..7b7b3bf268 100644 --- a/dynamiclinks/app/build.gradle +++ b/dynamiclinks/app/build.gradle @@ -68,6 +68,7 @@ dependencies { implementation project(":internal:chooserx") implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation platform('com.google.firebase:firebase-bom:30.4.1') @@ -92,4 +93,7 @@ dependencies { androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" } diff --git a/firestore/app/build.gradle b/firestore/app/build.gradle index 294c4b78dd..b83c913a28 100644 --- a/firestore/app/build.gradle +++ b/firestore/app/build.gradle @@ -119,5 +119,8 @@ dependencies { androidTestImplementation 'junit:junit:4.13.2' androidTestImplementation 'org.hamcrest:hamcrest-library:2.2' androidTestImplementation 'com.google.firebase:firebase-auth' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" } diff --git a/functions/app/build.gradle b/functions/app/build.gradle index 8484680eb5..73dec1bfe6 100644 --- a/functions/app/build.gradle +++ b/functions/app/build.gradle @@ -60,6 +60,7 @@ dependencies { implementation 'androidx.fragment:fragment-ktx:1.5.2' implementation 'androidx.appcompat:appcompat:1.5.1' implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation platform('com.google.firebase:firebase-bom:30.4.1') @@ -96,4 +97,7 @@ dependencies { androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" } diff --git a/inappmessaging/app/build.gradle b/inappmessaging/app/build.gradle index 8f4b8c2a6f..763f07360c 100644 --- a/inappmessaging/app/build.gradle +++ b/inappmessaging/app/build.gradle @@ -59,6 +59,7 @@ dependencies { implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.multidex:multidex:2.0.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation platform('com.google.firebase:firebase-bom:30.4.1') @@ -88,4 +89,7 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" } diff --git a/messaging/app/build.gradle b/messaging/app/build.gradle index 95af22af67..f3c8323b94 100644 --- a/messaging/app/build.gradle +++ b/messaging/app/build.gradle @@ -69,6 +69,7 @@ dependencies { // Required when asking for permission to post notifications (starting in Android 13) implementation 'androidx.activity:activity-ktx:1.5.1' implementation 'androidx.fragment:fragment-ktx:1.5.2' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' implementation 'com.google.android.material:material:1.6.1' @@ -100,4 +101,7 @@ dependencies { androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.annotation:annotation:1.4.0' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" } diff --git a/perf/app/build.gradle b/perf/app/build.gradle index 480548d838..c02b6a5307 100644 --- a/perf/app/build.gradle +++ b/perf/app/build.gradle @@ -83,4 +83,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" } diff --git a/storage/app/build.gradle b/storage/app/build.gradle index 36bd6e04ec..624a880272 100644 --- a/storage/app/build.gradle +++ b/storage/app/build.gradle @@ -78,8 +78,12 @@ dependencies { implementation 'androidx.activity:activity-ktx:1.5.1' implementation 'androidx.appcompat:appcompat:1.5.1' implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0' androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" }