Skip to content

Commit 9e39e1d

Browse files
committed
update all dependencies
1 parent 5e5b4f3 commit 9e39e1d

5 files changed

Lines changed: 45 additions & 40 deletions

File tree

app/build.gradle

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
apply plugin: 'com.android.application'
2-
apply plugin: 'com.google.gms.google-services'
3-
apply plugin: 'com.google.firebase.crashlytics'
1+
plugins {
2+
id 'com.android.application'
3+
id 'com.google.gms.google-services'
4+
id 'com.google.firebase.crashlytics'
5+
}
46

57
android {
6-
compileSdkVersion 33
8+
compileSdkVersion 34
79
ndkVersion "26.1.10909125"
810

911
defaultConfig {
1012
applicationId "at.tomtasche.reader"
11-
minSdkVersion 21
13+
minSdkVersion 23
1214
targetSdkVersion 33
1315

1416
testApplicationId "at.tomtasche.reader.test"
@@ -97,23 +99,21 @@ android {
9799
}
98100

99101
dependencies {
100-
implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.10')
101-
102-
implementation platform('com.google.firebase:firebase-bom:32.2.0')
102+
implementation platform('com.google.firebase:firebase-bom:33.0.0')
103103
implementation 'com.google.firebase:firebase-storage'
104104
implementation 'com.google.firebase:firebase-auth'
105105
implementation 'com.google.firebase:firebase-crashlytics-ndk'
106106
implementation 'com.google.firebase:firebase-analytics'
107107
implementation 'com.google.firebase:firebase-config'
108108

109-
implementation 'com.google.android.gms:play-services-ads:22.6.0'
109+
implementation 'com.google.android.gms:play-services-ads:23.1.0'
110110
implementation 'com.google.android.play:core:1.10.3'
111-
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
111+
implementation 'com.google.android.ump:user-messaging-platform:2.2.0'
112112

113113
implementation 'androidx.appcompat:appcompat:1.6.1'
114-
implementation 'androidx.core:core:1.10.1'
115-
implementation 'com.google.android.material:material:1.9.0'
116-
implementation 'androidx.webkit:webkit:1.7.0'
114+
implementation 'androidx.core:core:1.13.1'
115+
implementation 'com.google.android.material:material:1.12.0'
116+
implementation 'androidx.webkit:webkit:1.11.0'
117117

118118
implementation 'com.viliussutkus89:pdf2htmlex-android:0.18.23'
119119
implementation 'com.viliussutkus89:wvware-android:1.2.9'
@@ -126,5 +126,5 @@ dependencies {
126126
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
127127
// espresso-idling-resource is used in main sourceSet as well. cannot be just androidTestImplementation
128128
implementation 'androidx.test.espresso:espresso-idling-resource:3.5.1'
129-
implementation 'androidx.annotation:annotation:1.7.1'
129+
implementation 'androidx.annotation:annotation:1.8.0'
130130
}

app/src/main/AndroidManifest.xml

Lines changed: 8 additions & 2 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="178"
6-
android:versionName="3.25"
5+
android:versionCode="179"
6+
android:versionName="3.26"
77
tools:ignore="GoogleAppIndexingWarning">
88

99
<uses-permission android:name="android.permission.INTERNET" />
@@ -51,6 +51,12 @@
5151
android:theme="@style/MainTheme"
5252
tools:replace="android:label">
5353

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

build.gradle

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
buildscript {
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.2.0'
10-
// forced downgrade because of https://stackoverflow.com/q/72744796/198996
11-
classpath 'com.google.gms:google-services:4.4.0'
12-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
13-
}
14-
}
15-
16-
allprojects {
17-
repositories {
18-
google()
19-
mavenCentral()
20-
maven { url 'https://jitpack.io' }
21-
}
22-
}
1+
plugins {
2+
id 'com.android.application' version '8.4.0' apply false
3+
id 'com.google.gms.google-services'version '4.4.1' apply false
4+
id 'com.google.firebase.crashlytics' version '3.0.1' apply false
5+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Fri Jun 24 20:32:41 CEST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
1-
include ':app'
1+
pluginManagement {
2+
repositories {
3+
gradlePluginPortal()
4+
google()
5+
mavenCentral()
6+
}
7+
}
8+
9+
dependencyResolutionManagement {
10+
repositories {
11+
google()
12+
mavenCentral()
13+
maven { url 'https://jitpack.io' }
14+
}
15+
}
16+
17+
include ':app'

0 commit comments

Comments
 (0)