From 0035f0985ec03ab56fce7abedc74bb6283f7526c Mon Sep 17 00:00:00 2001 From: Thomas Taschauer Date: Tue, 9 Jul 2024 12:40:32 +0200 Subject: [PATCH 1/3] upgrade dependencies, raise version --- app/CMakeUserPresets.json | 12 ++++++++++++ app/build.gradle | 12 ++++++------ app/src/main/AndroidManifest.xml | 4 ++-- .../reader/ui/activity/DocumentFragment.java | 4 ++-- build.gradle | 2 +- 5 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 app/CMakeUserPresets.json diff --git a/app/CMakeUserPresets.json b/app/CMakeUserPresets.json new file mode 100644 index 000000000000..3353ef85bc2e --- /dev/null +++ b/app/CMakeUserPresets.json @@ -0,0 +1,12 @@ +{ + "version": 4, + "vendor": { + "conan": {} + }, + "include": [ + "build/conan/armv7/CMakePresets.json", + "build/conan/armv8/CMakePresets.json", + "build/conan/x86/CMakePresets.json", + "build/conan/x86_64/CMakePresets.json" + ] +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 76d4c03c2796..3778138b2c79 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,7 +26,7 @@ task conanInstall { ["armv7", "armv8", "x86", "x86_64"].each { String arch -> exec { commandLine( - "conan", "install", ".", + "/home/tom/Documents/ODR/OpenDocument.droid/bin/conan", "install", ".", "--output-folder=build/conan/" + arch, "--build=missing", "--profile:host=build/conanprofile.txt", @@ -43,8 +43,8 @@ android { defaultConfig { applicationId "at.tomtasche.reader" minSdkVersion 23 - targetSdkVersion 33 compileSdkVersion 34 + targetSdkVersion 34 testApplicationId "at.tomtasche.reader.test" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -139,18 +139,18 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:33.0.0') + implementation platform('com.google.firebase:firebase-bom:33.1.1') implementation 'com.google.firebase:firebase-storage' implementation 'com.google.firebase:firebase-auth' implementation 'com.google.firebase:firebase-crashlytics-ndk' implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-config' - implementation 'com.google.android.gms:play-services-ads:23.1.0' - implementation 'com.google.android.play:core:1.10.3' + implementation 'com.google.android.gms:play-services-ads:23.2.0' + implementation 'com.google.android.play:review:2.0.1' implementation 'com.google.android.ump:user-messaging-platform:2.2.0' - implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.core:core:1.13.1' implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.webkit:webkit:1.11.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 24ef252ee40b..bfc00a90747f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ diff --git a/app/src/main/java/at/tomtasche/reader/ui/activity/DocumentFragment.java b/app/src/main/java/at/tomtasche/reader/ui/activity/DocumentFragment.java index b1dc17bb6a07..a09acd3b16fa 100644 --- a/app/src/main/java/at/tomtasche/reader/ui/activity/DocumentFragment.java +++ b/app/src/main/java/at/tomtasche/reader/ui/activity/DocumentFragment.java @@ -319,13 +319,13 @@ private void requestInAppRating(Activity activity) { analyticsManager.report("in_app_review_eligible"); ReviewManager manager = ReviewManagerFactory.create(activity); - com.google.android.play.core.tasks.Task request = manager.requestReviewFlow(); + com.google.android.gms.tasks.Task request = manager.requestReviewFlow(); request.addOnCompleteListener(reviewInfoTask -> { if (reviewInfoTask.isSuccessful()) { analyticsManager.report("in_app_review_start"); ReviewInfo reviewInfo = reviewInfoTask.getResult(); - com.google.android.play.core.tasks.Task flow = manager.launchReviewFlow(activity, reviewInfo); + com.google.android.gms.tasks.Task flow = manager.launchReviewFlow(activity, reviewInfo); flow.addOnCompleteListener(reviewTask -> { analyticsManager.report("in_app_review_done"); }); diff --git a/build.gradle b/build.gradle index dade6491e5b3..5e3057182002 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.android.application' version '8.4.0' apply false + id 'com.android.application' version '8.4.1' apply false id 'com.google.gms.google-services'version '4.4.1' apply false id 'com.google.firebase.crashlytics' version '3.0.1' apply false } From e7d0d48bfc20da7cb12f6ff28eb33b27b065e052 Mon Sep 17 00:00:00 2001 From: Thomas Taschauer Date: Tue, 9 Jul 2024 13:31:03 +0200 Subject: [PATCH 2/3] implement review feedback --- .gitignore | 2 ++ app/CMakeUserPresets.json | 12 ------------ app/build.gradle | 5 +++-- 3 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 app/CMakeUserPresets.json diff --git a/.gitignore b/.gitignore index a203dd9829c6..f278eab3e2e5 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,5 @@ app/lite/release/ fastlane/report.xml .idea/ + +app/CMakeUserPresets.json diff --git a/app/CMakeUserPresets.json b/app/CMakeUserPresets.json deleted file mode 100644 index 3353ef85bc2e..000000000000 --- a/app/CMakeUserPresets.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 4, - "vendor": { - "conan": {} - }, - "include": [ - "build/conan/armv7/CMakePresets.json", - "build/conan/armv8/CMakePresets.json", - "build/conan/x86/CMakePresets.json", - "build/conan/x86_64/CMakePresets.json" - ] -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 3778138b2c79..14c7c2358d48 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,8 +25,9 @@ task conanProfile { task conanInstall { ["armv7", "armv8", "x86", "x86_64"].each { String arch -> exec { + // replace with local path to conan-binary commandLine( - "/home/tom/Documents/ODR/OpenDocument.droid/bin/conan", "install", ".", + "conan", "install", ".", "--output-folder=build/conan/" + arch, "--build=missing", "--profile:host=build/conanprofile.txt", @@ -167,4 +168,4 @@ dependencies { // espresso-idling-resource is used in main sourceSet as well. cannot be just androidTestImplementation implementation 'androidx.test.espresso:espresso-idling-resource:3.5.1' implementation 'androidx.annotation:annotation:1.8.0' -} \ No newline at end of file +} From f5ce66d477d9d6eb04e62e9240b58ade6c2293d9 Mon Sep 17 00:00:00 2001 From: Thomas Taschauer Date: Tue, 9 Jul 2024 13:56:30 +0200 Subject: [PATCH 3/3] review feedback --- README.md | 1 + app/build.gradle | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index df312d8ff835..fbb37e4fdbc2 100644 --- a/README.md +++ b/README.md @@ -15,3 +15,4 @@ More information at https://opendocument.app/ and in the app itself. ## Setup - `conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan` +- make sure `conan` is in your $PATH or replace conan-call in `app/build.gradle` diff --git a/app/build.gradle b/app/build.gradle index 14c7c2358d48..6bf00f1902e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,6 @@ task conanProfile { task conanInstall { ["armv7", "armv8", "x86", "x86_64"].each { String arch -> exec { - // replace with local path to conan-binary commandLine( "conan", "install", ".", "--output-folder=build/conan/" + arch,