Skip to content

Commit 4e48c4d

Browse files
jonsimantovjonsimantov
committed
Integrate Latest @ 246565926
Changes to all ... - Update Firebase Android and iOS dependencies. - Update Android minSdkVersion to 16. Changes to admob/testapp ... - Replace AdMob App ID with placeholder, add to Info.plist, and add instructions to readme. Changes to analytics/testapp ... - Remove SetMinimumSessionDuration call from testapp. Changes to auth/testapp ... - Add the Foundation framework for Desktop Mac builds. - Check for listener event triggering right after it is registered. Changes to database/testapp ... - Add the Foundation framework for Desktop Mac builds. - Made the timestamp check more strict. Changes to functions/testapp ... - Add the Foundation framework for Desktop Mac builds. Changes to invites/testapp ... - Remove Firebase Invites testapp. Changes to messaging/testapp ... - Remove deprecated Instance ID listener service. Changes to storage/testapp ... - Add the Foundation framework for Desktop Mac builds. CL: 246565926
1 parent 2ad8000 commit 4e48c4d

Some content is hidden

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

52 files changed

+58
-2252
lines changed

‎admob/testapp/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<uses-permission android:name="android.permission.INTERNET" />
77
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
88
<uses-permission android:name="android.permission.WAKE_LOCK" />
9-
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
9+
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
1010
<application android:label="@string/app_name">
1111
<!-- You may replace the sample Admob App ID below with your own App ID. -->
1212
<meta-data
1313
android:name="com.google.android.gms.ads.APPLICATION_ID"
14-
android:value="ca-app-pub-3940256099942544~3347511713"/>
14+
android:value="YOUR_ANDROID_ADMOB_APP_ID"/>
1515
<activity android:name="android.app.NativeActivity"
1616
android:screenOrientation="portrait"
1717
android:configChanges="orientation|screenSize">

‎admob/testapp/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git'
22
platform :ios, '8.0'
33
# AdMob test application.
44
target 'testapp' do
5-
pod 'Firebase/Core', '5.18.0'
6-
pod 'Firebase/AdMob', '5.18.0'
5+
pod 'Firebase/Analytics', '6.0.0'
6+
pod 'Firebase/AdMob', '6.0.0'
77
end

‎admob/testapp/readme.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@ Getting Started
5454
Select the "Build Settings" tab, and click "All" to see all
5555
the build settings. Scroll down to "Search Paths", and add
5656
your path to "Framework Search Paths".
57+
- Update the AdMob App ID:
58+
- In the `src/common_main.cc`, update `kAdMobAppID` with the app ID for
59+
your iOS app, replacing 'YOUR_IOS_ADMOB_APP_ID'.
60+
- In the `testapp/Info.plist`, update `GADApplicationIdentifier` with the
61+
same app ID, replacing 'YOUR_IOS_ADMOB_APP_ID'.
62+
- For more information, see
63+
[Update your Info.plist](https://developers.google.com/admob/ios/quick-start#manual_download)
5764
- In Xcode, build & run the sample on an iOS device or simulator.
5865
- The testapp displays a banner ad and an interstitial ad. You can dismiss
5966
the interstitial ad to see the banner ad.
@@ -105,6 +112,14 @@ Getting Started
105112
- From the Android Studio launch menu, "Open an existing Android Studio
106113
project", and select `build.gradle`.
107114
- Install the SDK Platforms that Android Studio reports missing.
115+
- Update the AdMob App ID:
116+
- In the `src/common_main.cc`, update `kAdMobAppID` with the app ID for
117+
your Android app, replacing 'YOUR_ANDROID_ADMOB_APP_ID'.
118+
- In the `AndroidManifest.xml`, update
119+
`com.google.android.gms.ads.APPLICATION_ID` with the same app ID,
120+
replacing 'YOUR_ANDROID_ADMOB_APP_ID'.
121+
- For more information, see
122+
[Update your AndroidManifest.xml](https://developers.google.com/admob/android/quick-start#update_your_androidmanifestxml)
108123
- Build the testapp and run it on an Android device or emulator.
109124
- The testapp will initialize AdMob, then load and display a test banner and
110125
a test interstitial.

‎admob/testapp/src/common_main.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,11 @@ class LoggingRewardedVideoListener
7272
#if defined(__ANDROID__)
7373
// If you change the AdMob app ID for your Android app, make sure to change it
7474
// in AndroidManifest.xml as well.
75-
const char* kAdMobAppID = "ca-app-pub-3940256099942544~3347511713";
75+
const char* kAdMobAppID = "YOUR_ANDROID_ADMOB_APP_ID";
7676
#else
77-
const char* kAdMobAppID = "ca-app-pub-3940256099942544~1458002511";
77+
// If you change the AdMob app ID for your iOS app, make sure to change the
78+
// value for "GADApplicationIdentifier" in your Info.plist as well.
79+
const char* kAdMobAppID = "YOUR_IOS_ADMOB_APP_ID";
7880
#endif
7981

8082
// These ad units IDs have been created specifically for testing, and will

‎admob/testapp/testapp/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>GADApplicationIdentifier</key>
6+
<string>YOUR_IOS_ADMOB_APP_ID</string>
57
<key>CFBundleDevelopmentRegion</key>
68
<string>en</string>
79
<key>CFBundleExecutable</key>

‎analytics/testapp/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<uses-permission android:name="android.permission.INTERNET" />
77
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
88
<uses-permission android:name="android.permission.WAKE_LOCK" />
9-
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
9+
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
1010
<application android:label="@string/app_name">
1111
<activity android:name="android.app.NativeActivity"
1212
android:screenOrientation="portrait"

‎analytics/testapp/Podfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ source 'https://github.com/CocoaPods/Specs.git'
22
platform :ios, '8.0'
33
# Analytics test application.
44
target 'testapp' do
5-
pod 'Firebase/Core', '5.18.0'
6-
pod 'Firebase/Analytics', '5.18.0'
5+
pod 'Firebase/Analytics', '6.0.0'
76
end

‎analytics/testapp/src/common_main.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ extern "C" int common_main(int argc, const char* argv[]) {
4040

4141
LogMessage("Enabling data collection.");
4242
analytics::SetAnalyticsCollectionEnabled(true);
43-
// App needs to be open at least 10s before logging a valid session.
44-
analytics::SetMinimumSessionDuration(1000 * 10);
4543
// App session times out after 30 minutes.
4644
// If the app is placed in the background and returns to the foreground after
4745
// the timeout is expired analytics will log a new session.

‎auth/testapp/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<uses-permission android:name="android.permission.INTERNET" />
77
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
88
<uses-permission android:name="android.permission.WAKE_LOCK" />
9-
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
9+
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
1010
<application android:label="@string/app_name">
1111
<activity android:name="android.app.NativeActivity"
1212
android:screenOrientation="portrait"

‎auth/testapp/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ else()
8989
set(ADDITIONAL_LIBS
9090
pthread
9191
"-framework CoreFoundation"
92+
"-framework Foundation"
9293
"-framework Security"
9394
)
9495
elseif(MSVC)

0 commit comments

Comments
 (0)