Skip to content

Commit 020f0d2

Browse files
jonsimantovjonsimantov
authored
Merge 0fd8159 into 06ab3ec 
2 parents 06ab3ec + 0fd8159 commit 020f0d2

File tree

66 files changed

+237
-234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+237
-234
lines changed

‎.github/workflows/integration_tests.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -426,10 +426,9 @@ jobs:
426426
with:
427427
ref: ${{needs.check_and_prepare.outputs.github_ref}}
428428
submodules: true
429-
- name: Force Java 8 (macOS)
430-
if: startsWith(matrix.os, 'macos')
429+
- name: Force Java 11
431430
shell: bash
432-
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
431+
run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
433432
- name: Add msbuild to PATH (Windows)
434433
if: startsWith(matrix.os, 'windows')
435434
uses: microsoft/[email protected]
@@ -1058,11 +1057,11 @@ jobs:
10581057
run: |
10591058
echo "device_type=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.android_device }} -get_device_type)" >> $GITHUB_OUTPUT
10601059
echo "device=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.android_device }} -get_ftl_device_list)" >> $GITHUB_OUTPUT
1061-
- name: Setup java 8 for test_simulator.py
1060+
- name: Setup java 11 for test_simulator.py
10621061
uses: actions/setup-java@v3
10631062
with:
10641063
distribution: 'temurin'
1065-
java-version: '8'
1064+
java-version: '11'
10661065
- name: Run Android integration tests on Emulator locally
10671066
timeout-minutes: 180
10681067
if: steps.device-info.outputs.device_type == 'virtual'

‎Android/firebase_dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ project.afterEvaluate {
159159

160160
// Add the bill-of-materials
161161
project.dependencies {
162-
implementation platform('com.google.firebase:firebase-bom:33.1.2')
162+
implementation platform('com.google.firebase:firebase-bom:33.2.0')
163163
}
164164
for (String lib : firebaseCpp.dependencies.libSet) {
165165
// Generate and include the proguard file

‎analytics/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildscript {
1818
mavenCentral()
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:4.2.1'
21+
classpath 'com.android.tools.build:gradle:7.4.2'
2222
}
2323
}
2424
allprojects {
@@ -33,7 +33,7 @@ apply plugin: 'com.android.library'
3333
android {
3434
compileSdkVersion 34
3535
ndkPath System.getenv('ANDROID_NDK_HOME')
36-
buildToolsVersion '30.0.2'
36+
buildToolsVersion '32.0.0'
3737

3838
sourceSets {
3939
main {
@@ -48,7 +48,7 @@ android {
4848
}
4949

5050
defaultConfig {
51-
minSdkVersion 23
51+
minSdkVersion 24
5252
targetSdkVersion 34
5353
versionCode 1
5454
versionName "1.0"

‎analytics/integration_test/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ buildscript {
2020
mavenCentral()
2121
}
2222
dependencies {
23-
classpath 'com.android.tools.build:gradle:4.2.1'
24-
classpath 'com.google.gms:google-services:4.0.1'
23+
classpath 'com.android.tools.build:gradle:7.4.2'
24+
classpath 'com.google.gms:google-services:4.4.1'
2525
}
2626
}
2727

@@ -37,12 +37,12 @@ apply plugin: 'com.android.application'
3737

3838
android {
3939
compileOptions {
40-
sourceCompatibility 1.8
41-
targetCompatibility 1.8
40+
sourceCompatibility JavaVersion.VERSION_11
41+
targetCompatibility JavaVersion.VERSION_11
4242
}
4343
compileSdkVersion 34
4444
ndkPath System.getenv('ANDROID_NDK_HOME')
45-
buildToolsVersion '30.0.2'
45+
buildToolsVersion '32.0.0'
4646

4747
sourceSets {
4848
main {
@@ -55,7 +55,7 @@ android {
5555

5656
defaultConfig {
5757
applicationId 'com.google.android.analytics.testapp'
58-
minSdkVersion 23
58+
minSdkVersion 24
5959
targetSdkVersion 34
6060
versionCode 1
6161
versionName '1.0'

‎analytics/integration_test/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip

‎android_build_files/extract_and_dex.gradle

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,11 @@ def defineExtractionTasks(String resourceName, String buildType) {
5858
outputs.file "$outPro"
5959

6060
// Convert the jar format using the dx tool.
61-
String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/dx"
62-
if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
63-
dex_path = "${dex_path}.bat"
64-
}
65-
66-
commandLine "${dex_path}",
67-
'--dex',
68-
"--output=$dexedJar",
69-
"$buildDir/classes.jar"
61+
String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/lib/d8.jar"
62+
commandLine "java", "-cp", "${dex_path}", "com.android.tools.r8.D8",
63+
"$buildDir/classes.jar",
64+
"--output",
65+
"$dexedJar"
7066
}
7167

7268
// Once the dexed jar has been made, generate a proguard file for it.

‎app/app_resources/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ buildscript {
1818
mavenCentral()
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:4.2.1'
22-
classpath 'com.google.gms:google-services:4.2.0'
21+
classpath 'com.android.tools.build:gradle:7.4.2'
22+
classpath 'com.google.gms:google-services:4.4.1'
2323
}
2424
}
2525
allprojects {
@@ -33,10 +33,11 @@ apply plugin: 'com.android.library'
3333

3434
android {
3535
compileOptions {
36-
sourceCompatibility 1.8
37-
targetCompatibility 1.8
36+
sourceCompatibility JavaVersion.VERSION_11
37+
targetCompatibility JavaVersion.VERSION_11
3838
}
3939
compileSdkVersion 34
40+
buildToolsVersion '32.0.0'
4041

4142
sourceSets {
4243
main {
@@ -50,7 +51,7 @@ android {
5051
}
5152

5253
dependencies {
53-
implementation platform('com.google.firebase:firebase-bom:33.1.2')
54+
implementation platform('com.google.firebase:firebase-bom:33.2.0')
5455
implementation 'com.google.firebase:firebase-analytics'
5556
}
5657

‎app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildscript {
1818
mavenCentral()
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:4.2.1'
21+
classpath 'com.android.tools.build:gradle:7.4.2'
2222
}
2323
}
2424
allprojects {
@@ -33,7 +33,7 @@ apply plugin: 'com.android.library'
3333
android {
3434
compileSdkVersion 34
3535
ndkPath System.getenv('ANDROID_NDK_HOME')
36-
buildToolsVersion '30.0.2'
36+
buildToolsVersion '32.0.0'
3737

3838
sourceSets {
3939
main {
@@ -48,7 +48,7 @@ android {
4848
}
4949

5050
defaultConfig {
51-
minSdkVersion 23
51+
minSdkVersion 24
5252
targetSdkVersion 34
5353
versionCode 1
5454
versionName "1.0"

‎app/google_api_resources/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ buildscript {
1818
mavenCentral()
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:4.2.1'
22-
classpath 'com.google.gms:google-services:4.2.0'
21+
classpath 'com.android.tools.build:gradle:7.4.2'
22+
classpath 'com.google.gms:google-services:4.4.1'
2323
}
2424
}
2525
allprojects {
@@ -33,10 +33,11 @@ apply plugin: 'com.android.library'
3333

3434
android {
3535
compileOptions {
36-
sourceCompatibility 1.8
37-
targetCompatibility 1.8
36+
sourceCompatibility JavaVersion.VERSION_11
37+
targetCompatibility JavaVersion.VERSION_11
3838
}
3939
compileSdkVersion 34
40+
buildToolsVersion '32.0.0'
4041

4142
sourceSets {
4243
main {
@@ -53,7 +54,7 @@ android {
5354
}
5455

5556
dependencies {
56-
implementation platform('com.google.firebase:firebase-bom:33.1.2')
57+
implementation platform('com.google.firebase:firebase-bom:33.2.0')
5758
implementation 'com.google.firebase:firebase-analytics'
5859
implementation 'com.google.android.gms:play-services-base:18.5.0'
5960
implementation project(':app:app_resources')

‎app/integration_test/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ buildscript {
2020
mavenCentral()
2121
}
2222
dependencies {
23-
classpath 'com.android.tools.build:gradle:4.2.1'
24-
classpath 'com.google.gms:google-services:4.0.1'
23+
classpath 'com.android.tools.build:gradle:7.4.2'
24+
classpath 'com.google.gms:google-services:4.4.1'
2525
}
2626
}
2727

@@ -37,12 +37,12 @@ apply plugin: 'com.android.application'
3737

3838
android {
3939
compileOptions {
40-
sourceCompatibility 1.8
41-
targetCompatibility 1.8
40+
sourceCompatibility JavaVersion.VERSION_11
41+
targetCompatibility JavaVersion.VERSION_11
4242
}
4343
compileSdkVersion 34
4444
ndkPath System.getenv('ANDROID_NDK_HOME')
45-
buildToolsVersion '30.0.2'
45+
buildToolsVersion '32.0.0'
4646

4747
sourceSets {
4848
main {
@@ -55,7 +55,7 @@ android {
5555

5656
defaultConfig {
5757
applicationId 'com.google.android.analytics.testapp'
58-
minSdkVersion 23
58+
minSdkVersion 24
5959
targetSdkVersion 34
6060
versionCode 1
6161
versionName '1.0'

‎app/integration_test/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip

‎app/invites_resources/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ buildscript {
1818
mavenCentral()
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:4.2.1'
22-
classpath 'com.google.gms:google-services:4.2.0'
21+
classpath 'com.android.tools.build:gradle:7.4.2'
22+
classpath 'com.google.gms:google-services:4.4.1'
2323
}
2424
}
2525
allprojects {
@@ -33,10 +33,11 @@ apply plugin: 'com.android.library'
3333

3434
android {
3535
compileOptions {
36-
sourceCompatibility 1.8
37-
targetCompatibility 1.8
36+
sourceCompatibility JavaVersion.VERSION_11
37+
targetCompatibility JavaVersion.VERSION_11
3838
}
3939
compileSdkVersion 34
40+
buildToolsVersion '32.0.0'
4041

4142
sourceSets {
4243
main {
@@ -49,7 +50,7 @@ android {
4950
}
5051

5152
dependencies {
52-
implementation platform('com.google.firebase:firebase-bom:33.1.2')
53+
implementation platform('com.google.firebase:firebase-bom:33.2.0')
5354
implementation 'com.google.firebase:firebase-analytics'
5455
implementation 'com.google.firebase:firebase-dynamic-links'
5556
implementation project(':app:app_resources')

‎app/test_resources/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ buildscript {
1818
mavenCentral()
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:4.2.1'
22-
classpath 'com.google.gms:google-services:4.2.0'
21+
classpath 'com.android.tools.build:gradle:7.4.2'
22+
classpath 'com.google.gms:google-services:4.4.1'
2323
}
2424
}
2525
allprojects {
@@ -33,6 +33,7 @@ apply plugin: 'com.android.library'
3333

3434
android {
3535
compileSdkVersion 34
36+
buildToolsVersion '32.0.0'
3637

3738
sourceSets {
3839
main {

‎app_check/app_check_resources/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ buildscript {
1818
mavenCentral()
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:4.2.1'
22-
classpath 'com.google.gms:google-services:4.2.0'
21+
classpath 'com.android.tools.build:gradle:7.4.2'
22+
classpath 'com.google.gms:google-services:4.4.1'
2323
}
2424
}
2525
allprojects {
@@ -33,10 +33,11 @@ apply plugin: 'com.android.library'
3333

3434
android {
3535
compileOptions {
36-
sourceCompatibility 1.8
37-
targetCompatibility 1.8
36+
sourceCompatibility JavaVersion.VERSION_11
37+
targetCompatibility JavaVersion.VERSION_11
3838
}
3939
compileSdkVersion 34
40+
buildToolsVersion '32.0.0'
4041

4142
sourceSets {
4243
main {
@@ -49,7 +50,7 @@ android {
4950
}
5051

5152
dependencies {
52-
implementation platform('com.google.firebase:firebase-bom:33.1.2')
53+
implementation platform('com.google.firebase:firebase-bom:33.2.0')
5354
implementation 'com.google.firebase:firebase-appcheck'
5455
}
5556

‎app_check/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildscript {
1818
mavenCentral()
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:4.2.1'
21+
classpath 'com.android.tools.build:gradle:7.4.2'
2222
}
2323
}
2424
allprojects {
@@ -33,7 +33,7 @@ apply plugin: 'com.android.library'
3333
android {
3434
compileSdkVersion 34
3535
ndkPath System.getenv('ANDROID_NDK_HOME')
36-
buildToolsVersion '30.0.2'
36+
buildToolsVersion '32.0.0'
3737

3838
sourceSets {
3939
main {
@@ -48,7 +48,7 @@ android {
4848
}
4949

5050
defaultConfig {
51-
minSdkVersion 23
51+
minSdkVersion 24
5252
targetSdkVersion 34
5353
versionCode 1
5454
versionName "1.0"

0 commit comments

Comments
 (0)