Skip to content

Commit

Permalink
Merge pull request #359 from opendocument-app/release-240709
Browse files Browse the repository at this point in the history
upgrade dependencies, raise version
  • Loading branch information
TomTasche authored Jul 9, 2024
2 parents d3b46e6 + f5ce66d commit 5796674
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,5 @@ app/lite/release/
fastlane/report.xml

.idea/

app/CMakeUserPresets.json
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
12 changes: 6 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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'
Expand All @@ -167,4 +167,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'
}
}
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:installLocation="auto"
android:versionCode="179"
android:versionName="3.26"
android:versionCode="181"
android:versionName="3.28"
tools:ignore="GoogleAppIndexingWarning">

<uses-permission android:name="android.permission.INTERNET" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ReviewInfo> request = manager.requestReviewFlow();
com.google.android.gms.tasks.Task<ReviewInfo> 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<Void> flow = manager.launchReviewFlow(activity, reviewInfo);
com.google.android.gms.tasks.Task<Void> flow = manager.launchReviewFlow(activity, reviewInfo);
flow.addOnCompleteListener(reviewTask -> {
analyticsManager.report("in_app_review_done");
});
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -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
}

0 comments on commit 5796674

Please sign in to comment.