Skip to content

Commit 999c1fd

Browse files
committed
update dependencies
1 parent 870347c commit 999c1fd

File tree

4 files changed

+14
-19
lines changed

4 files changed

+14
-19
lines changed

app/build.gradle

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ android {
115115
lint {
116116
abortOnError false
117117
}
118+
buildFeatures {
119+
buildConfig = true
120+
}
118121
packagingOptions {
119122
jniLibs {
120123
// No need to pickFirst libc++_shared.so if all files are identical.
@@ -126,28 +129,27 @@ android {
126129
}
127130
namespace 'at.tomtasche.reader'
128131
compileSdk 35
129-
buildToolsVersion '34.0.0'
130132

131133
// TODO can and should this be architecture dependent?
132134
sourceSets.main.assets.srcDirs += "build/conan/armv8/assets"
133135
}
134136

135137
dependencies {
136-
implementation platform('com.google.firebase:firebase-bom:33.3.0')
138+
implementation platform('com.google.firebase:firebase-bom:34.1.0')
137139
implementation 'com.google.firebase:firebase-storage'
138140
implementation 'com.google.firebase:firebase-auth'
139141
implementation 'com.google.firebase:firebase-crashlytics-ndk'
140142
implementation 'com.google.firebase:firebase-analytics'
141143
implementation 'com.google.firebase:firebase-config'
142144

143-
implementation 'com.google.android.gms:play-services-ads:23.3.0'
144-
implementation 'com.google.android.play:review:2.0.1'
145-
implementation 'com.google.android.ump:user-messaging-platform:3.0.0'
145+
implementation 'com.google.android.gms:play-services-ads:24.3.0'
146+
implementation 'com.google.android.play:review:2.0.2'
147+
implementation 'com.google.android.ump:user-messaging-platform:3.1.0'
146148

147149
implementation 'androidx.appcompat:appcompat:1.7.0'
148-
implementation 'androidx.core:core:1.13.1'
150+
implementation 'androidx.core:core:1.15.0'
149151
implementation 'com.google.android.material:material:1.12.0'
150-
implementation 'androidx.webkit:webkit:1.11.0'
152+
implementation 'androidx.webkit:webkit:1.12.1'
151153

152154
implementation 'com.viliussutkus89:assetextractor-android:1.3.3'
153155

@@ -158,7 +160,7 @@ dependencies {
158160
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.6.1'
159161
// espresso-idling-resource is used in main sourceSet as well. cannot be just androidTestImplementation
160162
implementation 'androidx.test.espresso:espresso-idling-resource:3.6.1'
161-
implementation 'androidx.annotation:annotation:1.8.2'
163+
implementation 'androidx.annotation:annotation:1.9.1'
162164
}
163165

164166
// Without removing .cxx dir on cleanup, double gradle clean is erroring out.

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
android:installLocation="auto"
5-
android:versionCode="196"
6-
android:versionName="4.0"
5+
android:versionCode="197"
6+
android:versionName="4.1"
77
tools:ignore="GoogleAppIndexingWarning">
88

99
<uses-permission android:name="android.permission.INTERNET" />
@@ -52,12 +52,6 @@
5252
android:networkSecurityConfig="@xml/network_security_config"
5353
tools:replace="android:label">
5454

55-
<!-- https://stackoverflow.com/a/78086604/198996 -->
56-
<property
57-
android:name="android.adservices.AD_SERVICES_CONFIG"
58-
android:resource="@xml/gma_ad_services_config"
59-
tools:replace="android:resource" />
60-
6155
<service
6256
android:name="at.tomtasche.reader.background.LoaderService"
6357
android:enabled="true"

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'com.android.application' version '8.13.1' apply false
3-
id 'com.google.gms.google-services'version '4.4.2' apply false
4-
id 'com.google.firebase.crashlytics' version '3.0.2' apply false
3+
id 'com.google.gms.google-services' version '4.4.2' apply false
4+
id 'com.google.firebase.crashlytics' version '3.0.6' apply false
55
id 'app.opendocument.conanandroidgradleplugin' version '0.9.6' apply false
66
}

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M"
1515
android.enableJetifier=false
1616
android.useAndroidX=true
17-
android.defaults.buildfeatures.buildconfig=true
1817
android.nonTransitiveRClass=true
1918
android.nonFinalResIds=true
2019

0 commit comments

Comments
 (0)