Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b0d5a4e

Browse files
annq12annq12
authored
Merge branch 'firebase:master' into master
2 parents feac08c + b3263b3 commit b0d5a4e

File tree

134 files changed

+242
-2603
lines changed

Some content is hidden

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

134 files changed

+242
-2603
lines changed

‎admob/app/build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion 30
5+
compileSdkVersion 32
66

77
defaultConfig {
88
applicationId "com.google.firebase.example.admob"
9-
minSdkVersion 16
10-
targetSdkVersion 30
9+
minSdkVersion 19
10+
targetSdkVersion 32
1111
versionCode 1
1212
versionName "1.0"
1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -24,18 +24,18 @@ android {
2424
dependencies {
2525
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
2626
implementation 'androidx.browser:browser:1.0.0'
27-
implementation 'androidx.appcompat:appcompat:1.3.1'
28-
implementation "com.google.firebase:firebase-ads:20.2.0"
29-
implementation "androidx.constraintlayout:constraintlayout:2.1.0"
27+
implementation 'androidx.appcompat:appcompat:1.4.1'
28+
implementation "com.google.firebase:firebase-ads:21.0.0"
29+
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
3030
implementation "androidx.multidex:multidex:2.0.1"
3131

3232
// [START gradle_play_config]
33-
implementation 'com.google.android.gms:play-services-ads:20.2.0'
33+
implementation 'com.google.android.gms:play-services-ads:21.0.0'
3434
// [END gradle_play_config]
3535

3636
// For an optimal experience using AdMob, add the Firebase SDK
3737
// for Google Analytics. This is recommended, but not required.
38-
implementation 'com.google.firebase:firebase-analytics:19.0.0'
38+
implementation 'com.google.firebase:firebase-analytics:21.0.0'
3939
}
4040

4141
apply plugin: 'com.google.gms.google-services'

‎admob/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
android:label="@string/app_name"
99
android:supportsRtl="true"
1010
android:theme="@style/AppTheme">
11-
<activity android:name="com.google.firebase.example.admob.MainActivity">
11+
<activity android:name="com.google.firebase.example.admob.MainActivity"
12+
android:exported="true">
1213
<intent-filter>
1314
<action android:name="android.intent.action.MAIN" />
1415

‎admob/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.0.0'
10-
classpath 'com.google.gms:google-services:4.3.8'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
9+
classpath 'com.android.tools.build:gradle:7.2.1'
10+
classpath 'com.google.gms:google-services:4.3.10'
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
1212
}
1313
}
1414

‎analytics/app/build.gradle‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion 30
5+
compileSdkVersion 32
66

77
defaultConfig {
88
applicationId "com.google.firebase.example.analytics"
9-
minSdkVersion 16
10-
targetSdkVersion 30
9+
minSdkVersion 19
10+
targetSdkVersion 32
1111
versionCode 1
1212
versionName "1.0"
1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
14+
multiDexEnabled true
1415
}
1516
buildTypes {
1617
release {
@@ -28,12 +29,12 @@ repositories {
2829

2930
dependencies {
3031
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
31-
implementation 'androidx.appcompat:appcompat:1.3.1'
32-
implementation "com.google.firebase:firebase-analytics:19.0.0"
33-
implementation "com.google.firebase:firebase-analytics-ktx:19.0.0"
32+
implementation 'androidx.appcompat:appcompat:1.4.1'
33+
implementation "com.google.firebase:firebase-analytics:21.0.0"
34+
implementation "com.google.firebase:firebase-analytics-ktx:21.0.0"
3435
// Ironsource and AppLovin libraries used for ad_impression snippets
3536
implementation 'com.applovin:applovin-sdk:+'
36-
implementation 'com.ironsource.sdk:mediationsdk:7.2.1.1'
37+
implementation 'com.ironsource.sdk:mediationsdk:7.2.2'
3738

3839
}
3940

‎analytics/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
android:label="@string/app_name"
99
android:supportsRtl="true"
1010
android:theme="@style/AppTheme">
11-
<activity android:name=".MainActivity">
11+
<activity android:name=".MainActivity"
12+
android:exported="true">
1213
<intent-filter>
1314
<action android:name="android.intent.action.MAIN"/>
1415

‎analytics/app/src/main/java/com/google/firebase/example/analytics/MainActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public void onImpressionSuccess(ImpressionData impressionData) {
259259
bundle.putString(FirebaseAnalytics.Param.AD_PLATFORM, "ironSource");
260260
bundle.putString(FirebaseAnalytics.Param.AD_SOURCE, impressionData.getAdNetwork());
261261
bundle.putString(FirebaseAnalytics.Param.AD_FORMAT, impressionData.getAdUnit());
262-
bundle.putString(FirebaseAnalytics.Param.AD_UNIT_NAME, impressionData.getAdUnit());
262+
bundle.putString(FirebaseAnalytics.Param.AD_UNIT_NAME, impressionData.getInstanceName());
263263
bundle.putString(FirebaseAnalytics.Param.CURRENCY, "USD");
264264
bundle.putDouble(FirebaseAnalytics.Param.VALUE, impressionData.getRevenue());
265265
analytics.logEvent(FirebaseAnalytics.Event.AD_IMPRESSION, bundle);

‎analytics/app/src/main/java/com/google/firebase/example/analytics/kotlin/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ class MainActivity : AppCompatActivity(),
227227
param(FirebaseAnalytics.Param.AD_PLATFORM, "ironSource")
228228
param(FirebaseAnalytics.Param.AD_SOURCE, impressionData.adNetwork)
229229
param(FirebaseAnalytics.Param.AD_FORMAT, impressionData.adUnit)
230-
param(FirebaseAnalytics.Param.AD_UNIT_NAME, impressionData.adUnit)
230+
param(FirebaseAnalytics.Param.AD_UNIT_NAME, impressionData.instanceName)
231231
param(FirebaseAnalytics.Param.CURRENCY, "USD")
232232
param(FirebaseAnalytics.Param.VALUE, impressionData.revenue)
233233
}

‎analytics/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.0.0'
10-
classpath 'com.google.gms:google-services:4.3.8'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
9+
classpath 'com.android.tools.build:gradle:7.2.1'
10+
classpath 'com.google.gms:google-services:4.3.10'
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
1212
}
1313
}
1414

‎appcheck/app/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'com.google.gms.google-services' // Google Services plugin
44

55
android {
6-
compileSdkVersion 30
6+
compileSdkVersion 32
77

88
defaultConfig {
99
applicationId "com.google.firebase.example.appcheck"
10-
minSdkVersion 16
11-
targetSdkVersion 30
10+
minSdkVersion 19
11+
targetSdkVersion 32
1212
versionCode 1
1313
versionName "1.0"
1414

@@ -28,16 +28,16 @@ android {
2828
}
2929

3030
dependencies {
31-
implementation 'androidx.appcompat:appcompat:1.3.1'
32-
implementation 'com.google.android.material:material:1.4.0'
33-
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
31+
implementation 'androidx.appcompat:appcompat:1.4.1'
32+
implementation 'com.google.android.material:material:1.6.0'
33+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
3434

35-
implementation 'com.google.firebase:firebase-appcheck:16.0.0-beta02'
36-
implementation 'com.google.firebase:firebase-appcheck-debug:16.0.0-beta02'
37-
implementation 'com.google.firebase:firebase-appcheck-safetynet:16.0.0-beta02'
35+
implementation 'com.google.firebase:firebase-appcheck:16.0.0'
36+
implementation 'com.google.firebase:firebase-appcheck-debug:16.0.0'
37+
implementation 'com.google.firebase:firebase-appcheck-safetynet:16.0.0'
3838

3939
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
4040

41-
implementation "androidx.core:core-ktx:1.6.0"
41+
implementation "androidx.core:core-ktx:1.7.0"
4242
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
4343
}

‎appcheck/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
1111
android:theme="@style/Theme.AppCheckSnippets">
12-
<activity android:name=".MainActivity">
12+
<activity android:name=".MainActivity"
13+
android:exported="true">
1314
<intent-filter>
1415
<action android:name="android.intent.action.MAIN" />
1516

0 commit comments

Comments
 (0)