Skip to content

Commit e70f74f

Browse files
thatfiredevthatfiredev
authored
Merge branch 'master' into kc-email-link
2 parents f4b6f51 + a36b9e5 commit e70f74f

File tree

74 files changed

+257
-215
lines changed

Some content is hidden

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

74 files changed

+257
-215
lines changed

‎.github/workflows/android.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v4
12+
- name: Check Snippets
13+
run: python scripts/checksnippets.py
1214
- name: set up JDK 17
13-
uses: actions/setup-java@v1
15+
uses: actions/setup-java@v4
1416
with:
1517
java-version: 17
16-
- name: Check Snippets
17-
run: python scripts/checksnippets.py
18-
- name: Install NDK
19-
run: echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT}
18+
distribution: temurin
2019
- name: Build with Gradle (Pull Request)
2120
run: ./build_pull_request.sh
2221
if: github.event_name == 'pull_request'

‎admob/app/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ dependencies {
3636
implementation("androidx.legacy:legacy-support-v4:1.0.0")
3737
implementation("androidx.browser:browser:1.5.0")
3838
implementation("androidx.appcompat:appcompat:1.7.0")
39-
implementation("com.google.firebase:firebase-ads:23.4.0")
40-
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
39+
implementation("com.google.firebase:firebase-ads:23.6.0")
40+
implementation("androidx.constraintlayout:constraintlayout:2.2.0")
4141
implementation("androidx.multidex:multidex:2.0.1")
4242

4343
// [START gradle_play_config]
44-
implementation("com.google.android.gms:play-services-ads:23.4.0")
44+
implementation("com.google.android.gms:play-services-ads:23.6.0")
4545
// [END gradle_play_config]
4646

4747
// Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
48-
implementation(platform("com.google.firebase:firebase-bom:33.5.0"))
48+
implementation(platform("com.google.firebase:firebase-bom:33.8.0"))
4949

5050
// For an optimal experience using AdMob, add the Firebase SDK
5151
// for Google Analytics. This is recommended, but not required.

‎admob/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
plugins {
4-
id("com.android.application") version "8.7.1" apply false
5-
id("com.android.library") version "8.7.1" apply false
6-
id("org.jetbrains.kotlin.android") version "2.0.21" apply false
4+
id("com.android.application") version "8.8.0" apply false
5+
id("com.android.library") version "8.8.0" apply false
6+
id("org.jetbrains.kotlin.android") version "2.1.10" apply false
77
id("com.google.gms.google-services") version "4.4.2" apply false
88
}
99

‎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-8.10.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎analytics/app/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ android {
3535
dependencies {
3636
implementation("androidx.legacy:legacy-support-v4:1.0.0")
3737
implementation("androidx.appcompat:appcompat:1.7.0")
38-
implementation("com.google.firebase:firebase-analytics:22.1.2")
38+
implementation("com.google.firebase:firebase-analytics:22.2.0")
3939
// Ironsource and AppLovin libraries used for ad_impression snippets
4040
implementation("com.applovin:applovin-sdk:11.5.1")
4141
implementation("com.ironsource.sdk:mediationsdk:7.2.4.1")

‎analytics/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
plugins {
4-
id("com.android.application") version "8.7.1" apply false
5-
id("com.android.library") version "8.7.1" apply false
6-
id("org.jetbrains.kotlin.android") version "2.0.21" apply false
4+
id("com.android.application") version "8.8.0" apply false
5+
id("com.android.library") version "8.8.0" apply false
6+
id("org.jetbrains.kotlin.android") version "2.1.10" apply false
77
id("com.google.gms.google-services") version "4.4.2" apply false
88
}
99

‎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-8.10.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎appcheck/app/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ android {
3636
dependencies {
3737
implementation("androidx.appcompat:appcompat:1.7.0")
3838
implementation("com.google.android.material:material:1.12.0")
39-
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
39+
implementation("androidx.constraintlayout:constraintlayout:2.2.0")
4040

4141
// Import the BoM for the Firebase platform
42-
implementation(platform("com.google.firebase:firebase-bom:33.5.0"))
42+
implementation(platform("com.google.firebase:firebase-bom:33.8.0"))
4343
implementation("com.google.firebase:firebase-appcheck")
4444
implementation("com.google.firebase:firebase-appcheck-playintegrity")
4545
implementation("com.google.firebase:firebase-appcheck-debug")
4646

4747
implementation("com.squareup.retrofit2:retrofit:2.11.0")
48-
implementation("androidx.core:core-ktx:1.13.1")
48+
implementation("androidx.core:core-ktx:1.15.0")
4949
}

‎appcheck/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
plugins {
4-
id("com.android.application") version "8.7.1" apply false
5-
id("com.android.library") version "8.7.1" apply false
6-
id("org.jetbrains.kotlin.android") version "2.0.21" apply false
4+
id("com.android.application") version "8.8.0" apply false
5+
id("com.android.library") version "8.8.0" apply false
6+
id("org.jetbrains.kotlin.android") version "2.1.10" apply false
77
id("com.google.gms.google-services") version "4.4.2" apply false
88
}
99

‎appcheck/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon Jul 26 13:22:22 PDT 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)