Skip to content

Commit 343592a

Browse files
jonsimantova-maurice
jonsimantov
and
a-maurice
authored
Update iOS and Android dependencies to Firebase 8.0.0, except for AdMob. (#433)
* Update gradle files with Java 8 desugaring and versions * Remove InstanceId from Messaging Android logic * Fix how the new getToken is called * Fix errors in RegistrationIntentService * Update Cocoapods versions to include special AdMob release and 8.0.0 of others. * Add Analytics as a requirement for AdMob. * Change windows-latest to windows-2016 in matrix config script. Co-authored-by: Anthony Maurice <amaurice@google.com>
1 parent f4c5c3e commit 343592a

File tree

43 files changed

+250
-181
lines changed

Some content is hidden

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

43 files changed

+250
-181
lines changed

‎.github/workflows/cpp-packaging.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,9 +346,9 @@ jobs:
346346
if [[ -n "${{ github.event.inputs.verboseBuild }}" && "${{ github.event.inputs.verboseBuild }}" -ne 0 ]]; then
347347
verbose_flag=--verbose
348348
fi
349-
python scripts/gha/build_desktop.py --arch "${{ matrix.architecture }}" --config "${{ matrix.build_type }}" --msvc_runtime_library "${{ matrix.msvc_runtime }}" --linux_abi "${{ matrix.linux_abi }}" --build_dir out-${{ env.SDK_NAME }} ${verbose_flag} ${{ matrix.additional_build_flags }}
349+
python scripts/gha/build_desktop.py --arch "${{ matrix.architecture }}" --config "${{ matrix.build_type }}" --msvc_runtime_library "${{ matrix.msvc_runtime }}" --linux_abi "${{ matrix.linux_abi }}" --build_dir out-sdk ${verbose_flag} ${{ matrix.additional_build_flags }}
350350
# Make a list of all the source files, for debugging purposes.
351-
cd out-${{ env.SDK_NAME }}
351+
cd out-sdk
352352
find .. -type f -print > src_file_list.txt
353353
tar -czhf ../firebase-cpp-sdk-${{ env.SDK_NAME }}-build.tgz .
354354
@@ -365,7 +365,7 @@ jobs:
365365
- name: Inspect firebase libraries for cpu arch and msvc runtime.
366366
shell: bash
367367
run: |
368-
python scripts/gha/inspect_built_libraries.py out-${{ env.SDK_NAME }}/
368+
python scripts/gha/inspect_built_libraries.py out-sdk/
369369
continue-on-error: true
370370

371371
- name: upload artifacts

‎Android/firebase_dependencies.gradle‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,30 @@ import org.gradle.util.ConfigureUtil;
1616

1717
// A map of library to the dependencies that need to be added for it.
1818
def firebaseDependenciesMap = [
19-
'app' : ['com.google.firebase:firebase-analytics:18.0.3'],
19+
'app' : ['com.google.firebase:firebase-analytics:19.0.0'],
2020
'admob' : ['com.google.firebase:firebase-ads:19.8.0',
21-
'com.google.android.gms:play-services-measurement-sdk-api:18.0.3',
21+
'com.google.firebase:firebase-analytics:19.0.0',
2222
'com.google.android.gms:play-services-base:17.6.0'],
23-
'analytics' : ['com.google.firebase:firebase-analytics:18.0.3',
23+
'analytics' : ['com.google.firebase:firebase-analytics:19.0.0',
2424
'com.google.android.gms:play-services-base:17.6.0'],
25-
'auth' : ['com.google.firebase:firebase-auth:20.0.4'],
26-
'database' : ['com.google.firebase:firebase-database:19.7.0'],
27-
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.1'],
28-
'firestore' : ['com.google.firebase:firebase-firestore:22.1.2'],
29-
'functions' : ['com.google.firebase:firebase-functions:19.2.0'],
30-
'installations' : ['com.google.firebase:firebase-installations:16.3.5',
25+
'auth' : ['com.google.firebase:firebase-auth:21.0.1'],
26+
'database' : ['com.google.firebase:firebase-database:20.0.0'],
27+
'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:20.0.0'],
28+
'firestore' : ['com.google.firebase:firebase-firestore:23.0.0'],
29+
'functions' : ['com.google.firebase:firebase-functions:20.0.0'],
30+
'installations' : ['com.google.firebase:firebase-installations:17.0.0',
3131
'com.google.android.gms:play-services-base:17.6.0'],
3232
'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
3333
// Messaging has an additional local dependency to include.
34-
'messaging' : ['com.google.firebase:firebase-messaging:21.1.0',
34+
'messaging' : ['com.google.firebase:firebase-messaging:22.0.0',
3535
'firebase_cpp_sdk.messaging:messaging_java',
36-
'androidx.core:core:1.0.1',
36+
'androidx.core:core:1.6.0-alpha03',
3737
'com.google.flatbuffers:flatbuffers-java:1.9.0',
3838
'com.google.android.gms:play-services-base:17.6.0'],
39-
'performance' : ['com.google.firebase:firebase-perf:19.1.1'],
40-
'remote_config' : ['com.google.firebase:firebase-config:20.0.4',
39+
'performance' : ['com.google.firebase:firebase-perf:20.0.0'],
40+
'remote_config' : ['com.google.firebase:firebase-config:21.0.0',
4141
'com.google.android.gms:play-services-base:17.6.0'],
42-
'storage' : ['com.google.firebase:firebase-storage:19.2.2'],
42+
'storage' : ['com.google.firebase:firebase-storage:20.0.0'],
4343
'testlab' : []
4444
]
4545

‎admob/admob_resources/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation 'com.google.firebase:firebase-analytics:18.0.2'
49-
implementation 'com.google.firebase:firebase-ads:19.7.0'
48+
implementation 'com.google.firebase:firebase-analytics:19.0.0'
49+
implementation 'com.google.firebase:firebase-ads:19.8.0'
5050
}
5151

5252
afterEvaluate {

‎admob/integration_test/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
21
source 'https://github.com/CocoaPods/Specs.git'
32
platform :ios, '10.0'
43
# Firebase AdMob test application.
54

65
target 'integration_test' do
7-
pod 'Firebase/AdMob', '7.11.0'
6+
pod 'Firebase/Analytics', '8.0.0'
7+
pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk'
88
end
99

1010
post_install do |installer|

‎admob/integration_test/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ allprojects {
3636
apply plugin: 'com.android.application'
3737

3838
android {
39+
compileOptions {
40+
sourceCompatibility 1.8
41+
targetCompatibility 1.8
42+
}
3943
compileSdkVersion 28
4044
buildToolsVersion '28.0.3'
4145

‎admob/integration_test/integration_test.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,15 @@
2020
D6C179EA22CB322900C2651A /* ios_firebase_test_framework.mm in Sources */ = {isa = PBXBuildFile; fileRef = D6C179E822CB322900C2651A /* ios_firebase_test_framework.mm */; };
2121
D6C179EE22CB323300C2651A /* firebase_test_framework.cc in Sources */ = {isa = PBXBuildFile; fileRef = D6C179EC22CB323300C2651A /* firebase_test_framework.cc */; };
2222
D6C179F022CB32A000C2651A /* app_framework.cc in Sources */ = {isa = PBXBuildFile; fileRef = D6C179EF22CB32A000C2651A /* app_framework.cc */; };
23-
FF88C17A940D28F103913070 /* libPods-integration_test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E4B91AFE2AFA744509A9C25 /* libPods-integration_test.a */; };
2423
/* End PBXBuildFile section */
2524

2625
/* Begin PBXFileReference section */
27-
1878FBCB416E0920F536416B /* Pods-integration_test.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-integration_test.release.xcconfig"; path = "Target Support Files/Pods-integration_test/Pods-integration_test.release.xcconfig"; sourceTree = "<group>"; };
2826
520BC0381C869159008CFBC3 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
2927
529226D21C85F68000C89379 /* integration_test.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = integration_test.app; sourceTree = BUILT_PRODUCTS_DIR; };
3028
529226D51C85F68000C89379 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
3129
529226D71C85F68000C89379 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
3230
529226D91C85F68000C89379 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
3331
529226EE1C85F68000C89379 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
34-
8E4B91AFE2AFA744509A9C25 /* libPods-integration_test.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-integration_test.a"; sourceTree = BUILT_PRODUCTS_DIR; };
35-
BFA4C698DDB19F60D12FED3A /* Pods-integration_test.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-integration_test.debug.xcconfig"; path = "Target Support Files/Pods-integration_test/Pods-integration_test.debug.xcconfig"; sourceTree = "<group>"; };
3632
D61C5F8C22BABA9B00A79141 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
3733
D61C5F8D22BABA9C00A79141 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3834
D61C5F9222BABAD100A79141 /* integration_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = integration_test.cc; path = src/integration_test.cc; sourceTree = "<group>"; };
@@ -57,7 +53,6 @@
5753
529226D81C85F68000C89379 /* CoreGraphics.framework in Frameworks */,
5854
529226DA1C85F68000C89379 /* UIKit.framework in Frameworks */,
5955
529226D61C85F68000C89379 /* Foundation.framework in Frameworks */,
60-
FF88C17A940D28F103913070 /* libPods-integration_test.a in Frameworks */,
6156
);
6257
runOnlyForDeploymentPostprocessing = 0;
6358
};
@@ -74,7 +69,6 @@
7469
5292271D1C85FB5500C89379 /* src */,
7570
529226D41C85F68000C89379 /* Frameworks */,
7671
529226D31C85F68000C89379 /* Products */,
77-
78E4FA177005E3E6FE395AE2 /* Pods */,
7872
);
7973
sourceTree = "<group>";
8074
};
@@ -93,7 +87,6 @@
9387
529226D71C85F68000C89379 /* CoreGraphics.framework */,
9488
529226D91C85F68000C89379 /* UIKit.framework */,
9589
529226EE1C85F68000C89379 /* XCTest.framework */,
96-
8E4B91AFE2AFA744509A9C25 /* libPods-integration_test.a */,
9790
);
9891
name = Frameworks;
9992
sourceTree = "<group>";
@@ -124,24 +117,13 @@
124117
name = ios;
125118
sourceTree = "<group>";
126119
};
127-
78E4FA177005E3E6FE395AE2 /* Pods */ = {
128-
isa = PBXGroup;
129-
children = (
130-
BFA4C698DDB19F60D12FED3A /* Pods-integration_test.debug.xcconfig */,
131-
1878FBCB416E0920F536416B /* Pods-integration_test.release.xcconfig */,
132-
);
133-
name = Pods;
134-
path = Pods;
135-
sourceTree = "<group>";
136-
};
137120
/* End PBXGroup section */
138121

139122
/* Begin PBXNativeTarget section */
140123
529226D11C85F68000C89379 /* integration_test */ = {
141124
isa = PBXNativeTarget;
142125
buildConfigurationList = 529226F91C85F68000C89379 /* Build configuration list for PBXNativeTarget "integration_test" */;
143126
buildPhases = (
144-
7DBB351D9F7518B4E087635C /* [CP] Check Pods Manifest.lock */,
145127
529226CE1C85F68000C89379 /* Sources */,
146128
529226CF1C85F68000C89379 /* Frameworks */,
147129
529226D01C85F68000C89379 /* Resources */,
@@ -201,31 +183,6 @@
201183
};
202184
/* End PBXResourcesBuildPhase section */
203185

204-
/* Begin PBXShellScriptBuildPhase section */
205-
7DBB351D9F7518B4E087635C /* [CP] Check Pods Manifest.lock */ = {
206-
isa = PBXShellScriptBuildPhase;
207-
buildActionMask = 2147483647;
208-
files = (
209-
);
210-
inputFileListPaths = (
211-
);
212-
inputPaths = (
213-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
214-
"${PODS_ROOT}/Manifest.lock",
215-
);
216-
name = "[CP] Check Pods Manifest.lock";
217-
outputFileListPaths = (
218-
);
219-
outputPaths = (
220-
"$(DERIVED_FILE_DIR)/Pods-integration_test-checkManifestLockResult.txt",
221-
);
222-
runOnlyForDeploymentPostprocessing = 0;
223-
shellPath = /bin/sh;
224-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
225-
showEnvVarsInLog = 0;
226-
};
227-
/* End PBXShellScriptBuildPhase section */
228-
229186
/* Begin PBXSourcesBuildPhase section */
230187
529226CE1C85F68000C89379 /* Sources */ = {
231188
isa = PBXSourcesBuildPhase;
@@ -326,7 +283,6 @@
326283
};
327284
529226FA1C85F68000C89379 /* Debug */ = {
328285
isa = XCBuildConfiguration;
329-
baseConfigurationReference = BFA4C698DDB19F60D12FED3A /* Pods-integration_test.debug.xcconfig */;
330286
buildSettings = {
331287
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
332288
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -355,7 +311,6 @@
355311
};
356312
529226FB1C85F68000C89379 /* Release */ = {
357313
isa = XCBuildConfiguration;
358-
baseConfigurationReference = 1878FBCB416E0920F536416B /* Pods-integration_test.release.xcconfig */;
359314
buildSettings = {
360315
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
361316
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;

‎analytics/integration_test/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '10.0'
44
# Firebase Analytics test application.
55

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '7.11.0'
7+
pod 'Firebase/Analytics', '8.0.0'
88
end
99

1010
post_install do |installer|

‎analytics/integration_test/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ allprojects {
3636
apply plugin: 'com.android.application'
3737

3838
android {
39+
compileOptions {
40+
sourceCompatibility 1.8
41+
targetCompatibility 1.8
42+
}
3943
compileSdkVersion 28
4044
buildToolsVersion '28.0.3'
4145

@@ -87,4 +91,4 @@ task copyIntegrationTestFiles(type:Exec) {
8791
}
8892
}
8993

90-
build.dependsOn(copyIntegrationTestFiles)
94+
build.dependsOn(copyIntegrationTestFiles)

‎app/app_resources/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ allprojects {
3232
apply plugin: 'com.android.library'
3333

3434
android {
35+
compileOptions {
36+
sourceCompatibility 1.8
37+
targetCompatibility 1.8
38+
}
3539
compileSdkVersion 28
3640

3741
sourceSets {
@@ -46,7 +50,7 @@ android {
4650
}
4751

4852
dependencies {
49-
implementation 'com.google.firebase:firebase-analytics:18.0.2'
53+
implementation 'com.google.firebase:firebase-analytics:19.0.0'
5054
}
5155

5256
afterEvaluate {

‎app/google_api_resources/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ allprojects {
3232
apply plugin: 'com.android.library'
3333

3434
android {
35+
compileOptions {
36+
sourceCompatibility 1.8
37+
targetCompatibility 1.8
38+
}
3539
compileSdkVersion 28
3640

3741
sourceSets {
@@ -49,7 +53,7 @@ android {
4953
}
5054

5155
dependencies {
52-
implementation 'com.google.firebase:firebase-analytics:18.0.2'
56+
implementation 'com.google.firebase:firebase-analytics:19.0.0'
5357
implementation 'com.google.android.gms:play-services-base:17.6.0'
5458
implementation project(':app:app_resources')
5559
}

0 commit comments

Comments
 (0)