Skip to content

Commit ba57e4a

Browse files
committed
fix: R8 incompatibility issues and update outdated deps
1 parent b2050d8 commit ba57e4a

File tree

6 files changed

+25
-9
lines changed

6 files changed

+25
-9
lines changed

.github/workflows/android.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,25 @@ jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
12-
- name: set up JDK 17
13-
uses: actions/setup-java@v1
11+
- uses: actions/checkout@v4
12+
13+
- name: Cache Gradle packages
14+
uses: actions/cache@v3
15+
with:
16+
path: |
17+
~/.gradle/caches
18+
~/.gradle/wrapper
19+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
20+
21+
- name: Set up JDK 17
22+
uses: actions/setup-java@v4
1423
with:
15-
java-version: 17
24+
java-version: '17'
25+
distribution: 'temurin'
26+
1627
- name: Build with Gradle
1728
run: ./scripts/build.sh
29+
1830
- name: Print Logs
1931
if: failure()
2032
run: ./scripts/print_build_logs.sh

buildSrc/src/main/kotlin/Config.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ object Config {
1111
}
1212

1313
object Plugins {
14-
const val android = "com.android.tools.build:gradle:8.8.0"
14+
const val android = "com.android.tools.build:gradle:8.10.0"
1515
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
1616
const val google = "com.google.gms:google-services:4.3.8"
1717

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

proguard-tests/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ android {
5353
"InvalidPackage", // Firestore uses GRPC which makes lint mad
5454
"NewerVersionAvailable", "GradleDependency", // For reproducible builds
5555
"SelectableText", "SyntheticAccessor", // We almost never care about this
56-
"MediaCapabilities"
56+
"MediaCapabilities",
57+
"MissingApplicationIcon"
5758
)
5859

5960
checkAllWarnings = true
@@ -79,6 +80,7 @@ dependencies {
7980
implementation(project(":database"))
8081
implementation(project(":storage"))
8182

83+
implementation(platform(Config.Libs.Firebase.bom))
8284
implementation(Config.Libs.Androidx.lifecycleExtensions)
8385
}
8486

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest />
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
4+
</manifest>

scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ cp library/google-services.json proguard-tests/google-services.json
99
./gradlew $GRADLE_ARGS clean
1010
./gradlew $GRADLE_ARGS assembleDebug
1111
# TODO(thatfiredev): re-enable before release
12-
#./gradlew $GRADLE_ARGS proguard-tests:build
12+
# ./gradlew $GRADLE_ARGS proguard-tests:build
1313
./gradlew $GRADLE_ARGS checkstyle
1414
./gradlew $GRADLE_ARGS testDebugUnitTest

0 commit comments

Comments
 (0)