Skip to content
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

Upgrade gradle wrapper to 6.7.1 #1471

Closed
wants to merge 20 commits into from
+230 −148
Closed

Upgrade gradle wrapper to 6.7.1 #1471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3a24508
Increment all gradle wrapper versions to 6.7.1.
jonsimantov Oct 11, 2023
d409953
Fix quote in classpath.
jonsimantov Oct 11, 2023
beb62f9
Update all gradle plugin versions to 4.2.1.
jonsimantov Oct 11, 2023
0018729
Force NDK path to environment variable for new Gradle version.
jonsimantov Oct 11, 2023
71bf35e
Update build tools version.
jonsimantov Oct 11, 2023
37d9e2f
Add gradle.properties with useAndroidX=true flag.
jonsimantov Oct 11, 2023
d79e8d2
Remove NDK path from unneeded gradle files.
jonsimantov Oct 11, 2023
317396b
Force name of included C++ SDK build to be firebase_cpp_sdk.
jonsimantov Oct 11, 2023
8415671
Update Firestore internal test also.
jonsimantov Oct 11, 2023
9a766ea
Add gradle.properties files.
jonsimantov Oct 11, 2023
26b3f68
Update readme with new version.
jonsimantov Oct 11, 2023
ec1e046
Add cleanup directory.
jonsimantov Oct 11, 2023
56bfadd
Add to .gitignore.
jonsimantov Oct 11, 2023
f7f8c35
Add changed .externalNativeBuild --> .cxx directory to script
jonsimantov Oct 11, 2023
3787b6d
Revert "Add cleanup directory."
jonsimantov Oct 11, 2023
9762fe9
Add cleanup directory (again).
jonsimantov Oct 11, 2023
3be9afc
Update the Messaging Java aar path
a-maurice Oct 17, 2023
dbd182d
Merge branch 'main' into upgrade-gradle-wrapper-6.7.1
jonsimantov Oct 17, 2023
e3d7beb
Merge branch 'main' into upgrade-gradle-wrapper-6.7.1
jonsimantov Oct 18, 2023
3d25c22
Merge branch 'main' into upgrade-gradle-wrapper-6.7.1
jonsimantov Oct 19, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ __pycache__/
.gradle
**/build/
**/.externalNativeBuild/
**/.cxx/

### IDE generated files
.vscode/
Expand Down
7 changes: 4 additions & 3 deletions analytics/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
}
}
allprojects {
Expand All @@ -31,8 +31,9 @@ allprojects {
apply plugin: 'com.android.library'

android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 31
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'

sourceSets {
main {
Expand Down
7 changes: 4 additions & 3 deletions analytics/integration_test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.0.1'
}
}
Expand All @@ -40,8 +40,9 @@ android {
sourceCompatibility 1.8
targetCompatibility 1.8
}
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 31
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'

sourceSets {
main {
Expand Down
1 change: 1 addition & 0 deletions analytics/integration_test/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
android.useAndroidX = true
2 changes: 1 addition & 1 deletion analytics/integration_test/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
4 changes: 3 additions & 1 deletion analytics/integration_test/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
firebase_cpp_sdk_dir))
}
gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
includeBuild "$firebase_cpp_sdk_dir"
includeBuild("$firebase_cpp_sdk_dir") {
name = "firebase_cpp_sdk"
}
2 changes: 1 addition & 1 deletion android_build_files/generate_proguard.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def defineGenerateProguardFile(String subproject, String buildType,
String nativeBuildDir =
project.android.externalNativeBuild.cmake.buildStagingDirectory
if (nativeBuildDir == null || nativeBuildDir.isEmpty()) {
nativeBuildDir = file('.externalNativeBuild/cmake').absolutePath
nativeBuildDir = file('.cxx/cmake').absolutePath
}

// Find the static library that was built. Note that there are multiple
Expand Down
4 changes: 2 additions & 2 deletions app/app_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
}
}
Expand All @@ -36,7 +36,7 @@ android {
sourceCompatibility 1.8
targetCompatibility 1.8
}
compileSdkVersion 28
compileSdkVersion 31

sourceSets {
main {
Expand Down
7 changes: 4 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
}
}
allprojects {
Expand All @@ -31,8 +31,9 @@ allprojects {
apply plugin: 'com.android.library'

android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 31
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'

sourceSets {
main {
Expand Down
4 changes: 2 additions & 2 deletions app/google_api_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
}
}
Expand All @@ -36,7 +36,7 @@ android {
sourceCompatibility 1.8
targetCompatibility 1.8
}
compileSdkVersion 28
compileSdkVersion 31

sourceSets {
main {
Expand Down
7 changes: 4 additions & 3 deletions app/integration_test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.0.1'
}
}
Expand All @@ -40,8 +40,9 @@ android {
sourceCompatibility 1.8
targetCompatibility 1.8
}
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 31
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'

sourceSets {
main {
Expand Down
1 change: 1 addition & 0 deletions app/integration_test/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
android.useAndroidX = true
2 changes: 1 addition & 1 deletion app/integration_test/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
4 changes: 3 additions & 1 deletion app/integration_test/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
firebase_cpp_sdk_dir))
}
gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
includeBuild "$firebase_cpp_sdk_dir"
includeBuild("$firebase_cpp_sdk_dir") {
name = "firebase_cpp_sdk"
}
4 changes: 2 additions & 2 deletions app/invites_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
}
}
Expand All @@ -36,7 +36,7 @@ android {
sourceCompatibility 1.8
targetCompatibility 1.8
}
compileSdkVersion 28
compileSdkVersion 31

sourceSets {
main {
Expand Down
4 changes: 2 additions & 2 deletions app/test_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
}
}
Expand All @@ -32,7 +32,7 @@ allprojects {
apply plugin: 'com.android.library'

android {
compileSdkVersion 28
compileSdkVersion 31

sourceSets {
main {
Expand Down
4 changes: 2 additions & 2 deletions app_check/app_check_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
}
}
Expand All @@ -36,7 +36,7 @@ android {
sourceCompatibility 1.8
targetCompatibility 1.8
}
compileSdkVersion 28
compileSdkVersion 31

sourceSets {
main {
Expand Down
7 changes: 4 additions & 3 deletions app_check/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
}
}
allprojects {
Expand All @@ -31,8 +31,9 @@ allprojects {
apply plugin: 'com.android.library'

android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 31
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'

sourceSets {
main {
Expand Down
7 changes: 4 additions & 3 deletions app_check/integration_test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.0.1'
}
}
Expand All @@ -40,8 +40,9 @@ android {
sourceCompatibility 1.8
targetCompatibility 1.8
}
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 31
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'

sourceSets {
main {
Expand Down
1 change: 1 addition & 0 deletions app_check/integration_test/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
android.useAndroidX = true
2 changes: 1 addition & 1 deletion app_check/integration_test/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
4 changes: 3 additions & 1 deletion app_check/integration_test/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
firebase_cpp_sdk_dir))
}
gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
includeBuild "$firebase_cpp_sdk_dir"
includeBuild("$firebase_cpp_sdk_dir") {
name = "firebase_cpp_sdk"
}
4 changes: 2 additions & 2 deletions auth/auth_resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
}
}
Expand All @@ -36,7 +36,7 @@ android {
sourceCompatibility 1.8
targetCompatibility 1.8
}
compileSdkVersion 28
compileSdkVersion 31

sourceSets {
main {
Expand Down
7 changes: 4 additions & 3 deletions auth/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
}
}
allprojects {
Expand All @@ -31,8 +31,9 @@ allprojects {
apply plugin: 'com.android.library'

android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 31
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'

sourceSets {
main {
Expand Down
7 changes: 4 additions & 3 deletions auth/integration_test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.3'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.0.1'
}
}
Expand All @@ -40,8 +40,9 @@ android {
sourceCompatibility 1.8
targetCompatibility 1.8
}
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 31
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'

sourceSets {
main {
Expand Down
1 change: 1 addition & 0 deletions auth/integration_test/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
android.useAndroidX = true
2 changes: 1 addition & 1 deletion auth/integration_test/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
4 changes: 3 additions & 1 deletion auth/integration_test/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@ if (!(new File(firebase_cpp_sdk_dir)).exists()) {
firebase_cpp_sdk_dir))
}
gradle.ext.firebase_cpp_sdk_dir = "$firebase_cpp_sdk_dir"
includeBuild "$firebase_cpp_sdk_dir"
includeBuild("$firebase_cpp_sdk_dir") {
name = "firebase_cpp_sdk"
}
9 changes: 6 additions & 3 deletions build_scripts/android/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ for retry in {1..10} error; do
done
set -e

# Gradle puts the build output inside the source tree, in various
# "build" and ".externalNativeBuild" directories. Grab them and place
# them in the build output directory.
# Gradle puts the build output inside the source tree, in various "build",
# ".externalNativeBuild", and ".cxx" directories. Grab them and place them in
# the build output directory.
declare -a paths
for lib in *; do
if [[ -d "${lib}/build" ]]; then
Expand All @@ -62,6 +62,9 @@ for lib in *; do
if [[ -d "${lib}/.externalNativeBuild" ]]; then
paths+=("${lib}/.externalNativeBuild")
fi
if [[ -d "${lib}/.cxx" ]]; then
paths+=("${lib}/.cxx")
fi
if [[ -d "${lib}/${lib}_resources/build" ]]; then
paths+=("${lib}/${lib}_resources/build")
fi
Expand Down
Loading
Loading