Skip to content

Commit 875f204

Browse files
author
Stewart Miles
committed
Integrate Latest @ 263653506
CL: 263653506
1 parent 6667024 commit 875f204

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

+570
-677
lines changed

‎admob/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="16" android:targetSdkVersion="24" />
9+
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
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

‎admob/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
# AdMob test application.
44
target 'testapp' do
5-
pod 'Firebase/Analytics', '6.1.0'
6-
pod 'Firebase/AdMob', '6.1.0'
5+
pod 'Firebase/AdMob', '6.6.0'
76
end

‎admob/testapp/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ allprojects {
2222
apply plugin: 'com.android.application'
2323

2424
android {
25-
compileSdkVersion 26
25+
compileSdkVersion 28
2626
buildToolsVersion '28.0.3'
2727

2828
sourceSets {
@@ -37,7 +37,7 @@ android {
3737
defaultConfig {
3838
applicationId 'com.google.android.admob.testapp'
3939
minSdkVersion 16
40-
targetSdkVersion 26
40+
targetSdkVersion 28
4141
versionCode 1
4242
versionName '1.0'
4343
externalNativeBuild.cmake {

‎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="16" android:targetSdkVersion="24" />
9+
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +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/Analytics', '6.1.0'
5+
pod 'Firebase/Analytics', '6.6.0'
66
end

‎analytics/testapp/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ allprojects {
2222
apply plugin: 'com.android.application'
2323

2424
android {
25-
compileSdkVersion 26
25+
compileSdkVersion 28
2626
buildToolsVersion '28.0.3'
2727

2828
sourceSets {
@@ -37,7 +37,7 @@ android {
3737
defaultConfig {
3838
applicationId 'com.google.android.analytics.testapp'
3939
minSdkVersion 16
40-
targetSdkVersion 26
40+
targetSdkVersion 28
4141
versionCode 1
4242
versionName '1.0'
4343
externalNativeBuild.cmake {

‎analytics/testapp/testapp/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<string>google</string>
2828
<key>CFBundleURLSchemes</key>
2929
<array>
30-
<string>com.googleusercontent.apps.255980362477-3a1nf8c4nl0c7hlnlnmc98hbtg2mnbue</string>
30+
<string>YOUR_REVERSED_CLIENT_ID</string>
3131
</array>
3232
</dict>
3333
</array>

‎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="16" android:targetSdkVersion="24" />
9+
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
1010
<application android:label="@string/app_name">
1111
<activity android:name="android.app.NativeActivity"
1212
android:screenOrientation="portrait"

‎auth/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
# Auth test application.
44
target 'testapp' do
5-
pod 'Firebase/Analytics', '6.1.0'
6-
pod 'Firebase/Auth', '6.1.0'
5+
pod 'Firebase/Auth', '6.6.0'
76
end

‎auth/testapp/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ allprojects {
2222
apply plugin: 'com.android.application'
2323

2424
android {
25-
compileSdkVersion 26
25+
compileSdkVersion 28
2626
buildToolsVersion '28.0.3'
2727

2828
sourceSets {
@@ -37,7 +37,7 @@ android {
3737
defaultConfig {
3838
applicationId 'com.google.android.auth.testapp'
3939
minSdkVersion 16
40-
targetSdkVersion 26
40+
targetSdkVersion 28
4141
versionCode 1
4242
versionName '1.0'
4343
externalNativeBuild.cmake {

0 commit comments

Comments
 (0)