Skip to content

chore: upgrade to AGP 7.2.2 and Kotlin 1.7.10 #2054

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.

Sign up for GitHub

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 5 commits into from
Aug 12, 2022
Merged

chore: upgrade to AGP 7.2.2 and Kotlin 1.7.10 #2054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c537bff
remove jcenter from build.gradle.kts
thatfiredev May 17, 2022
1d78eb9
chore: update kotlin code style and use nonTransitive R class
thatfiredev Aug 12, 2022
14945d0
refactor: upgrade to AGP 7.2.2
thatfiredev Aug 12, 2022
4b9af69
upgrade Kotlin to 1.7.10
thatfiredev Aug 12, 2022
6b15c63
Merge branch 'version-8.0.2-dev' into rpf-gradle-setup
thatfiredev Aug 12, 2022
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
13 changes: 7 additions & 6 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ android {

lint {
// Common lint options across all modules
disable(

disable += mutableSetOf(
"IconExpectedSize",
"InvalidPackage", // Firestore uses GRPC which makes lint mad
"NewerVersionAvailable", "GradleDependency", // For reproducible builds
Expand All @@ -49,13 +50,13 @@ android {
)

// Module-specific
disable("ResourceName", "MissingTranslation", "DuplicateStrings")
disable += mutableSetOf("ResourceName", "MissingTranslation", "DuplicateStrings")

isCheckAllWarnings = true
isWarningsAsErrors = true
isAbortOnError = true
checkAllWarnings = true
warningsAsErrors = true
abortOnError = true

baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
baseline = file("$rootDir/library/quality/lint-baseline.xml")
}

compileOptions {
Expand Down
12 changes: 6 additions & 6 deletions auth/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ android {

lint {
// Common lint options across all modules
disable(
disable += mutableSetOf(
"IconExpectedSize",
"InvalidPackage", // Firestore uses GRPC which makes lint mad
"NewerVersionAvailable", "GradleDependency", // For reproducible builds
"SelectableText", "SyntheticAccessor" // We almost never care about this
)

// Module specific
disable(
disable += mutableSetOf(
"UnusedQuantity",
"UnknownNullness", // TODO fix in future PR
"TypographyQuotes", // Straight versus directional quotes
Expand All @@ -50,11 +50,11 @@ android {
"VectorPath"
)

isCheckAllWarnings = true
isWarningsAsErrors = true
isAbortOnError = true
checkAllWarnings = true
warningsAsErrors = true
abortOnError = true

baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
baseline = file("$rootDir/library/quality/lint-baseline.xml")
}

testOptions {
Expand Down
2 changes: 0 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ buildscript {
repositories {
google()
mavenCentral()
jcenter()
mavenLocal()
}

Expand All @@ -25,7 +24,6 @@ allprojects {
repositories {
google()
mavenCentral()
jcenter()
mavenLocal()
}

Expand Down
1 change: 0 additions & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
repositories {
mavenCentral()
jcenter()
}

plugins {
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ object Config {
const val version = "8.0.2-SNAPSHOT"
val submodules = listOf("auth", "common", "firestore", "database", "storage")

private const val kotlinVersion = "1.3.72"
private const val kotlinVersion = "1.7.10"

object SdkVersions {
const val compile = 29
Expand All @@ -11,7 +11,7 @@ object Config {
}

object Plugins {
const val android = "com.android.tools.build:gradle:7.0.0"
const val android = "com.android.tools.build:gradle:7.2.2"
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
const val google = "com.google.gms:google-services:4.3.8"

Expand Down
10 changes: 5 additions & 5 deletions common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ android {

lint {
// Common lint options across all modules
disable(
disable += mutableSetOf(
"IconExpectedSize",
"InvalidPackage", // Firestore uses GRPC which makes lint mad
"NewerVersionAvailable", "GradleDependency", // For reproducible builds
"SelectableText", "SyntheticAccessor" // We almost never care about this
)

isCheckAllWarnings = true
isWarningsAsErrors = true
isAbortOnError = true
checkAllWarnings = true
warningsAsErrors = true
abortOnError = true

baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
baseline = file("$rootDir/library/quality/lint-baseline.xml")
}

buildTypes {
Expand Down
10 changes: 5 additions & 5 deletions database/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ android {

lint {
// Common lint options across all modules
disable(
disable += mutableSetOf(
"IconExpectedSize",
"InvalidPackage", // Firestore uses GRPC which makes lint mad
"NewerVersionAvailable", "GradleDependency", // For reproducible builds
"SelectableText", "SyntheticAccessor" // We almost never care about this
)

isCheckAllWarnings = true
isWarningsAsErrors = true
isAbortOnError = true
checkAllWarnings = true
warningsAsErrors = true
abortOnError = true

baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
baseline = file("$rootDir/library/quality/lint-baseline.xml")
}

buildTypes {
Expand Down
10 changes: 5 additions & 5 deletions firestore/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ android {

lint {
// Common lint options across all modules
disable(
disable += mutableSetOf(
"IconExpectedSize",
"InvalidPackage", // Firestore uses GRPC which makes lint mad
"NewerVersionAvailable", "GradleDependency", // For reproducible builds
"SelectableText", "SyntheticAccessor" // We almost never care about this
)

isCheckAllWarnings = true
isWarningsAsErrors = true
isAbortOnError = true
checkAllWarnings = true
warningsAsErrors = true
abortOnError = true

baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
baseline = file("$rootDir/library/quality/lint-baseline.xml")
}

buildTypes {
Expand Down
6 changes: 6 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ org.gradle.caching=true

android.useAndroidX=true
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=false

GROUP=com.firebaseui
VERSION_NAME=8.0.2-SNAPSHOT
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 5 additions & 5 deletions internal/lintchecks/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ android {

lint {
// Common lint options across all modules
disable(
disable += mutableSetOf(
"IconExpectedSize",
"InvalidPackage", // Firestore uses GRPC which makes lint mad
"NewerVersionAvailable", "GradleDependency", // For reproducible builds
"SelectableText", "SyntheticAccessor" // We almost never care about this
)

isCheckAllWarnings = true
isWarningsAsErrors = true
isAbortOnError = true
checkAllWarnings = true
warningsAsErrors = true
abortOnError = true

baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
baseline = file("$rootDir/library/quality/lint-baseline.xml")
}
}

Expand Down
10 changes: 5 additions & 5 deletions library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ android {

lint {
// Common lint options across all modules
disable(
disable += mutableSetOf(
"IconExpectedSize",
"InvalidPackage", // Firestore uses GRPC which makes lint mad
"NewerVersionAvailable", "GradleDependency", // For reproducible builds
"SelectableText", "SyntheticAccessor" // We almost never care about this
)

isCheckAllWarnings = true
isWarningsAsErrors = true
isAbortOnError = false // Override
checkAllWarnings = true
warningsAsErrors = true
abortOnError = false // Override

baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
baseline = file("$rootDir/library/quality/lint-baseline.xml")
}
}

Expand Down
18 changes: 9 additions & 9 deletions proguard-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ plugins {
val inCiBuild = System.getenv("CI") == "true"

android {
compileSdkVersion(Config.SdkVersions.compile)
compileSdk = Config.SdkVersions.compile

defaultConfig {
minSdkVersion(Config.SdkVersions.min)
targetSdkVersion(Config.SdkVersions.target)
minSdk = Config.SdkVersions.min
targetSdk = Config.SdkVersions.target

versionName = Config.version
versionCode = 1
Expand Down Expand Up @@ -45,21 +45,21 @@ android {
targetCompatibility = JavaVersion.VERSION_1_8
}

lintOptions {
lint {
// Common lint options across all modules
disable(
disable += mutableSetOf(
"IconExpectedSize",
"InvalidPackage", // Firestore uses GRPC which makes lint mad
"NewerVersionAvailable", "GradleDependency", // For reproducible builds
"SelectableText", "SyntheticAccessor", // We almost never care about this
"MediaCapabilities"
)

isCheckAllWarnings = true
isWarningsAsErrors = true
isAbortOnError = true
checkAllWarnings = true
warningsAsErrors = true
abortOnError = true

baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
baseline = file("$rootDir/library/quality/lint-baseline.xml")
}

variantFilter {
Expand Down
10 changes: 5 additions & 5 deletions storage/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ android {

lint {
// Common lint options across all modules
disable(
disable += mutableSetOf(
"IconExpectedSize",
"InvalidPackage", // Firestore uses GRPC which makes lint mad
"NewerVersionAvailable", "GradleDependency", // For reproducible builds
"SelectableText", "SyntheticAccessor" // We almost never care about this
)

isCheckAllWarnings = true
isWarningsAsErrors = true
isAbortOnError = true
checkAllWarnings = true
warningsAsErrors = true
abortOnError = true

baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
baseline = file("$rootDir/library/quality/lint-baseline.xml")
}

buildTypes {
Expand Down