Skip to content

Commit f440275

Browse files
thatfiredevthatfiredev
authored
Merge branch 'master' into mc/count
2 parents b4608ae + ae3c9f3 commit f440275

File tree

86 files changed

+297
-264
lines changed

Some content is hidden

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

86 files changed

+297
-264
lines changed

‎admob/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
namespace 'devrel.firebase.google.com.firebaseoptions'
2223
}
2324

2425
dependencies {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="devrel.firebase.google.com.firebaseoptions">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="true"

‎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.2.2'
10-
classpath 'com.google.gms:google-services:4.3.13'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
9+
classpath 'com.android.tools.build:gradle:7.3.0'
10+
classpath 'com.google.gms:google-services:4.3.14'
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
1212
}
1313
}
1414

‎admob/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎analytics/app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
namespace 'com.google.firebase.example.analytics'
2223
}
2324
repositories {
2425
maven {
@@ -33,7 +34,7 @@ dependencies {
3334
implementation "com.google.firebase:firebase-analytics:21.1.1"
3435
implementation "com.google.firebase:firebase-analytics-ktx:21.1.1"
3536
// Ironsource and AppLovin libraries used for ad_impression snippets
36-
implementation 'com.applovin:applovin-sdk:11.4.6'
37+
implementation 'com.applovin:applovin-sdk:11.5.1'
3738
implementation 'com.ironsource.sdk:mediationsdk:7.2.4.1'
3839

3940
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.google.firebase.example.analytics">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="true"

‎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.2.2'
10-
classpath 'com.google.gms:google-services:4.3.13'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
9+
classpath 'com.android.tools.build:gradle:7.3.0'
10+
classpath 'com.google.gms:google-services:4.3.14'
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
1212
}
1313
}
1414

‎analytics/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎appcheck/app/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,17 @@ android {
2525
sourceCompatibility JavaVersion.VERSION_1_8
2626
targetCompatibility JavaVersion.VERSION_1_8
2727
}
28+
namespace 'com.google.firebase.example.appcheck'
2829
}
2930

3031
dependencies {
3132
implementation 'androidx.appcompat:appcompat:1.5.1'
3233
implementation 'com.google.android.material:material:1.6.1'
3334
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
3435

35-
implementation 'com.google.firebase:firebase-appcheck:16.0.1'
36-
implementation 'com.google.firebase:firebase-appcheck-debug:16.0.1'
37-
implementation 'com.google.firebase:firebase-appcheck-safetynet:16.0.1'
36+
implementation 'com.google.firebase:firebase-appcheck:16.0.2'
37+
implementation 'com.google.firebase:firebase-appcheck-debug:16.0.2'
38+
implementation 'com.google.firebase:firebase-appcheck-safetynet:16.0.2'
3839

3940
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
4041

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.google.firebase.example.appcheck">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="true"

0 commit comments

Comments
 (0)