Skip to content

Commit 0035f09

Browse files
committed
upgrade dependencies, raise version
1 parent d3b46e6 commit 0035f09

5 files changed

Lines changed: 23 additions & 11 deletions

File tree

app/CMakeUserPresets.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 4,
3+
"vendor": {
4+
"conan": {}
5+
},
6+
"include": [
7+
"build/conan/armv7/CMakePresets.json",
8+
"build/conan/armv8/CMakePresets.json",
9+
"build/conan/x86/CMakePresets.json",
10+
"build/conan/x86_64/CMakePresets.json"
11+
]
12+
}

app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ task conanInstall {
2626
["armv7", "armv8", "x86", "x86_64"].each { String arch ->
2727
exec {
2828
commandLine(
29-
"conan", "install", ".",
29+
"/home/tom/Documents/ODR/OpenDocument.droid/bin/conan", "install", ".",
3030
"--output-folder=build/conan/" + arch,
3131
"--build=missing",
3232
"--profile:host=build/conanprofile.txt",
@@ -43,8 +43,8 @@ android {
4343
defaultConfig {
4444
applicationId "at.tomtasche.reader"
4545
minSdkVersion 23
46-
targetSdkVersion 33
4746
compileSdkVersion 34
47+
targetSdkVersion 34
4848

4949
testApplicationId "at.tomtasche.reader.test"
5050
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -139,18 +139,18 @@ android {
139139
}
140140

141141
dependencies {
142-
implementation platform('com.google.firebase:firebase-bom:33.0.0')
142+
implementation platform('com.google.firebase:firebase-bom:33.1.1')
143143
implementation 'com.google.firebase:firebase-storage'
144144
implementation 'com.google.firebase:firebase-auth'
145145
implementation 'com.google.firebase:firebase-crashlytics-ndk'
146146
implementation 'com.google.firebase:firebase-analytics'
147147
implementation 'com.google.firebase:firebase-config'
148148

149-
implementation 'com.google.android.gms:play-services-ads:23.1.0'
150-
implementation 'com.google.android.play:core:1.10.3'
149+
implementation 'com.google.android.gms:play-services-ads:23.2.0'
150+
implementation 'com.google.android.play:review:2.0.1'
151151
implementation 'com.google.android.ump:user-messaging-platform:2.2.0'
152152

153-
implementation 'androidx.appcompat:appcompat:1.6.1'
153+
implementation 'androidx.appcompat:appcompat:1.7.0'
154154
implementation 'androidx.core:core:1.13.1'
155155
implementation 'com.google.android.material:material:1.12.0'
156156
implementation 'androidx.webkit:webkit:1.11.0'

app/src/main/AndroidManifest.xml

Lines changed: 2 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="179"
6-
android:versionName="3.26"
5+
android:versionCode="181"
6+
android:versionName="3.28"
77
tools:ignore="GoogleAppIndexingWarning">
88

99
<uses-permission android:name="android.permission.INTERNET" />

app/src/main/java/at/tomtasche/reader/ui/activity/DocumentFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,13 +319,13 @@ private void requestInAppRating(Activity activity) {
319319
analyticsManager.report("in_app_review_eligible");
320320

321321
ReviewManager manager = ReviewManagerFactory.create(activity);
322-
com.google.android.play.core.tasks.Task<ReviewInfo> request = manager.requestReviewFlow();
322+
com.google.android.gms.tasks.Task<ReviewInfo> request = manager.requestReviewFlow();
323323
request.addOnCompleteListener(reviewInfoTask -> {
324324
if (reviewInfoTask.isSuccessful()) {
325325
analyticsManager.report("in_app_review_start");
326326

327327
ReviewInfo reviewInfo = reviewInfoTask.getResult();
328-
com.google.android.play.core.tasks.Task<Void> flow = manager.launchReviewFlow(activity, reviewInfo);
328+
com.google.android.gms.tasks.Task<Void> flow = manager.launchReviewFlow(activity, reviewInfo);
329329
flow.addOnCompleteListener(reviewTask -> {
330330
analyticsManager.report("in_app_review_done");
331331
});

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'com.android.application' version '8.4.0' apply false
2+
id 'com.android.application' version '8.4.1' apply false
33
id 'com.google.gms.google-services'version '4.4.1' apply false
44
id 'com.google.firebase.crashlytics' version '3.0.1' apply false
55
}

0 commit comments

Comments
 (0)