Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
5 changes: 2 additions & 3 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,9 @@ jobs:
- name: setup Xcode version (macos)
if: runner.os == 'macOS'
run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
- name: Force Java 8 (macOS)
if: startsWith(matrix.os, 'macos')
- name: Force Java 11
shell: bash
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
- name: Store git credentials for all git commands
# Forces all git commands to use authenticated https, to prevent throttling.
shell: bash
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -426,10 +426,9 @@ jobs:
with:
ref: ${{needs.check_and_prepare.outputs.github_ref}}
submodules: true
- name: Force Java 8 (macOS)
if: startsWith(matrix.os, 'macos')
- name: Force Java 11
shell: bash
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
- name: Add msbuild to PATH (Windows)
if: startsWith(matrix.os, 'windows')
uses: microsoft/[email protected]
Expand Down Expand Up @@ -1058,11 +1057,11 @@ jobs:
run: |
echo "device_type=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.android_device }} -get_device_type)" >> $GITHUB_OUTPUT
echo "device=$( python scripts/gha/print_matrix_configuration.py -k ${{ matrix.android_device }} -get_ftl_device_list)" >> $GITHUB_OUTPUT
- name: Setup java 8 for test_simulator.py
- name: Setup java 11 for test_simulator.py
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '8'
java-version: '11'
- name: Run Android integration tests on Emulator locally
timeout-minutes: 180
if: steps.device-info.outputs.device_type == 'virtual'
Expand Down
6 changes: 3 additions & 3 deletions analytics/build.gradle
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:4.2.1'
classpath 'com.android.tools.build:gradle:7.4.2'
}
}
allprojects {
Expand All @@ -33,7 +33,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 34
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -48,7 +48,7 @@ android {
}

defaultConfig {
minSdkVersion 23
minSdkVersion 24
targetSdkVersion 34
versionCode 1
versionName "1.0"
Expand Down
12 changes: 6 additions & 6 deletions analytics/integration_test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.0.1'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}

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

android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
compileSdkVersion 34
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -55,7 +55,7 @@ android {

defaultConfig {
applicationId 'com.google.android.analytics.testapp'
minSdkVersion 23
minSdkVersion 24
targetSdkVersion 34
versionCode 1
versionName '1.0'
Expand Down
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-6.7.1-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip
14 changes: 5 additions & 9 deletions android_build_files/extract_and_dex.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,11 @@ def defineExtractionTasks(String resourceName, String buildType) {
outputs.file "$outPro"

// Convert the jar format using the dx tool.
String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/dx"
if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
dex_path = "${dex_path}.bat"
}

commandLine "${dex_path}",
'--dex',
"--output=$dexedJar",
"$buildDir/classes.jar"
String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/lib/d8.jar"
commandLine "java", "-cp", "${dex_path}", "com.android.tools.r8.D8",
"$buildDir/classes.jar",
"--output",
"$dexedJar"
}

// Once the dexed jar has been made, generate a proguard file for it.
Expand Down
9 changes: 5 additions & 4 deletions app/app_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}
allprojects {
Expand All @@ -33,10 +33,11 @@ apply plugin: 'com.android.library'

android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
compileSdkVersion 34
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle
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:4.2.1'
classpath 'com.android.tools.build:gradle:7.4.2'
}
}
allprojects {
Expand All @@ -33,7 +33,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 34
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -48,7 +48,7 @@ android {
}

defaultConfig {
minSdkVersion 23
minSdkVersion 24
targetSdkVersion 34
versionCode 1
versionName "1.0"
Expand Down
9 changes: 5 additions & 4 deletions app/google_api_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}
allprojects {
Expand All @@ -33,10 +33,11 @@ apply plugin: 'com.android.library'

android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
compileSdkVersion 34
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand Down
12 changes: 6 additions & 6 deletions app/integration_test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.0.1'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}

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

android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
compileSdkVersion 34
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -55,7 +55,7 @@ android {

defaultConfig {
applicationId 'com.google.android.analytics.testapp'
minSdkVersion 23
minSdkVersion 24
targetSdkVersion 34
versionCode 1
versionName '1.0'
Expand Down
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-6.7.1-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip
9 changes: 5 additions & 4 deletions app/invites_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}
allprojects {
Expand All @@ -33,10 +33,11 @@ apply plugin: 'com.android.library'

android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
compileSdkVersion 34
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand Down
5 changes: 3 additions & 2 deletions app/test_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}
allprojects {
Expand All @@ -33,6 +33,7 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion 34
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand Down
9 changes: 5 additions & 4 deletions app_check/app_check_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}
allprojects {
Expand All @@ -33,10 +33,11 @@ apply plugin: 'com.android.library'

android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
compileSdkVersion 34
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand Down
6 changes: 3 additions & 3 deletions app_check/build.gradle
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:4.2.1'
classpath 'com.android.tools.build:gradle:7.4.2'
}
}
allprojects {
Expand All @@ -33,7 +33,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 34
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -48,7 +48,7 @@ android {
}

defaultConfig {
minSdkVersion 23
minSdkVersion 24
targetSdkVersion 34
versionCode 1
versionName "1.0"
Expand Down
12 changes: 6 additions & 6 deletions app_check/integration_test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.0.1'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.google.gms:google-services:4.4.1'
}
}

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

android {
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
compileSdkVersion 34
ndkPath System.getenv('ANDROID_NDK_HOME')
buildToolsVersion '30.0.2'
buildToolsVersion '32.0.0'

sourceSets {
main {
Expand All @@ -55,7 +55,7 @@ android {

defaultConfig {
applicationId 'com.google.firebase.cpp.appcheck.testapp'
minSdkVersion 23
minSdkVersion 24
targetSdkVersion 34
versionCode 1
versionName '1.0'
Expand Down
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-6.7.1-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-7.5.1-all.zip
Loading
Loading