Skip to content

Migrate all quickstart apps to most recent AGP and kts syntax #1493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 34 commits into from
May 17, 2023
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8b3b392
Migrated admob module to most recent AGP and KTS syntax
marinacoelho May 9, 2023
8197b33
Removed commented lines
marinacoelho May 9, 2023
68bd773
Migrated analytics module to most recent AGP and KTS syntax
marinacoelho May 9, 2023
da6cb00
Migrated app distro module to most recent AGP and KTS syntax
marinacoelho May 9, 2023
f7fd3ef
Migrated auth module to most recent AGP and KTS syntax
marinacoelho May 9, 2023
4ba279f
Migrated config module to most recent AGP and KTS syntax
marinacoelho May 9, 2023
5d09752
Migrated crashlytics module to most recent AGP and KTS syntax
marinacoelho May 9, 2023
7f94a3b
Updating material and Firebase bom to latest version
marinacoelho May 10, 2023
e846c0a
Auto-update dependencies. (#1489)
dpebot May 2, 2023
e75eb36
Auto-update dependencies. (#1490)
dpebot May 3, 2023
dd0b221
Auto-update dependencies. (#1492)
dpebot May 4, 2023
52dbe13
Migrated admob module to most recent AGP and KTS syntax
marinacoelho May 9, 2023
32d5f9a
Removed commented lines
marinacoelho May 9, 2023
1a005c4
Migrated config module to most recent AGP and KTS syntax
marinacoelho May 9, 2023
d1e041f
Migrated crashlytics module to most recent AGP and KTS syntax
marinacoelho May 9, 2023
1c856c9
Updating material and Firebase bom to latest version
marinacoelho May 10, 2023
03f905d
Merge remote-tracking branch 'origin' into mc/update-agp-kts
marinacoelho May 10, 2023
668aa31
Migrated database module to most recent AGP and KTS syntax
marinacoelho May 10, 2023
c201ddf
Migrated firestore module to most recent AGP and KTS syntax
marinacoelho May 10, 2023
36756d3
Migrated functions module to most recent AGP and KTS syntax
marinacoelho May 10, 2023
ef18afa
Migrated dynamic links module to most recent AGP and KTS syntax
marinacoelho May 10, 2023
ea990f2
Migrated in app messaging module to most recent AGP and KTS syntax
marinacoelho May 10, 2023
aaa0f0e
Migrated messaging module to most recent AGP and KTS syntax
marinacoelho May 10, 2023
aaa57be
Migrated perf module to most recent AGP and KTS syntax
marinacoelho May 10, 2023
7daa3c4
Migrated storage module to most recent AGP and KTS syntax
marinacoelho May 10, 2023
827fc50
converted main gradle files to kts
marinacoelho May 11, 2023
1ef2fdd
configured ktlint tasks
marinacoelho May 11, 2023
ad270be
Worked on comments made on PR
marinacoelho May 11, 2023
25497f6
chore(dynamiclinks): assembleDebugAndroidTest --> assembleMainFlavorD…
thatfiredev May 15, 2023
5bebce8
chore(perf): configure the FirebasePerfExtension
thatfiredev May 15, 2023
59d618f
Merge branch 'master' of github.com:firebase/quickstart-android into …
thatfiredev May 15, 2023
6d1391c
chore(ktlint): input.file() --> input.files()
thatfiredev May 16, 2023
d4052b0
chore(crash): enable multiDex
thatfiredev May 16, 2023
4fc2d24
Update build.gradle.kts
thatfiredev May 16, 2023
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
70 changes: 0 additions & 70 deletions admob/app/build.gradle

This file was deleted.

72 changes: 72 additions & 0 deletions admob/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
import com.android.build.gradle.internal.tasks.factory.dependsOn

plugins {
id("com.android.application")
id("kotlin-android")
id("com.google.gms.google-services")
}

tasks {
check.dependsOn("assembleDebugAndroidTest")
}

android {
namespace = "com.google.samples.quickstart.admobexample"
compileSdk = 33

defaultConfig {
applicationId = "com.google.samples.quickstart.admobexample"
minSdk = 19
targetSdk = 33
versionCode = 1
versionName = "1.0"
multiDexEnabled = true

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
}
}
packaging {
resources.excludes += "LICENSE.txt"
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "17"
}
buildFeatures {
viewBinding = true
}
}

dependencies {
implementation(project(":internal:lintchecks"))
implementation(project(":internal:chooserx"))
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.9.0")
implementation("androidx.browser:browser:1.5.0")
implementation("androidx.navigation:navigation-fragment-ktx:2.5.3")
implementation("androidx.navigation:navigation-ui-ktx:2.5.3")

implementation("com.google.android.gms:play-services-ads:22.0.0")

// Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
implementation(platform("com.google.firebase:firebase-bom:32.0.0"))

// For an optimal experience using AdMob, add the Firebase SDK
// for Google Analytics. This is recommended, but not required.
implementation("com.google.firebase:firebase-analytics")

debugImplementation("androidx.fragment:fragment-testing:1.5.7")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("androidx.test:rules:1.5.0")
androidTestImplementation("androidx.test:runner:1.5.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
}
2 changes: 1 addition & 1 deletion admob/app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# By default, the flags in this file are appended to flags specified
# in ${sdk.dir}/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
# directive in build.gradle.kts.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
Expand Down
22 changes: 0 additions & 22 deletions admob/build.gradle

This file was deleted.

16 changes: 16 additions & 0 deletions admob/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

plugins {
id("com.android.application") version "8.0.0" apply false
id("com.android.library") version "8.0.0" apply false
id("org.jetbrains.kotlin.android") version "1.8.20" apply false
id("com.google.gms.google-services") version "4.3.15" apply false
}

allprojects {
repositories {
mavenLocal()
google()
mavenCentral()
}
}
3 changes: 2 additions & 1 deletion admob/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Tue May 09 14:39:59 BST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 0 additions & 10 deletions admob/settings.gradle

This file was deleted.

18 changes: 18 additions & 0 deletions admob/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
pluginManagement {
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}

include(":app")

// Required so that gradle can resolve these dependencies even when
// building only a single project.
include(":internal:lintchecks")
project(":internal:lintchecks").projectDir = file("../internal/lintchecks")
include(":internal:lint")
project(":internal:lint").projectDir = file("../internal/lint")
include(":internal:chooserx")
project(":internal:chooserx").projectDir = file("../internal/chooserx")
66 changes: 0 additions & 66 deletions analytics/app/build.gradle

This file was deleted.

71 changes: 71 additions & 0 deletions analytics/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import com.android.build.gradle.internal.tasks.factory.dependsOn

plugins {
id("com.android.application")
id("kotlin-android")
id("com.google.gms.google-services")
}

tasks {
check.dependsOn("assembleDebugAndroidTest")
}

android {
namespace = "com.google.firebase.quickstart.analytics"
compileSdk = 33

defaultConfig {
applicationId = "com.google.firebase.quickstart.analytics"
minSdk = 19
targetSdk = 33
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled = true
}

buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "17"
}

buildFeatures {
viewBinding = true
}
}

dependencies {
implementation(project(":internal:lintchecks"))
implementation(project(":internal:chooserx"))

implementation("com.google.android.material:material:1.9.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("androidx.preference:preference-ktx:1.2.0")
// Needed to override the version used by preference-ktx
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")

// Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
implementation(platform("com.google.firebase:firebase-bom:32.0.0"))

// Firebase Analytics (Java)
implementation("com.google.firebase:firebase-analytics")

// Firebase Analytics (Kotlin)
implementation("com.google.firebase:firebase-analytics-ktx")

androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("androidx.test:rules:1.5.0")
androidTestImplementation("androidx.test:runner:1.5.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
}
2 changes: 1 addition & 1 deletion analytics/app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# By default, the flags in this file are appended to flags specified
# in ${sdk.dir}/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
# directive in build.gradle.kts.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
Expand Down
Loading