Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions admob/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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'
}
}

Expand All @@ -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'

Expand All @@ -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"
}
35 changes: 32 additions & 3 deletions analytics/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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}'
}
}
}

Expand All @@ -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')
Expand All @@ -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"
}
35 changes: 32 additions & 3 deletions appdistribution/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -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'
Expand All @@ -40,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')
Expand All @@ -51,8 +71,17 @@ 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'
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"
}
39 changes: 32 additions & 7 deletions auth/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand All @@ -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}'
}
}
}

Expand All @@ -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')
Expand All @@ -73,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"
}
3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
buildscript {
ext {
compose_version = '1.2.1'
}
repositories {
google()
mavenCentral()
Expand Down
36 changes: 33 additions & 3 deletions crash/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand All @@ -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}'
}
}
}

Expand All @@ -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')
Expand All @@ -55,9 +76,18 @@ 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'
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"
}
Loading