From 4f14cd88f6229c1a2f3354be35eed8f7970e877d Mon Sep 17 00:00:00 2001 From: sictiru Date: Sun, 26 Mar 2023 18:58:12 -0700 Subject: [PATCH] Cleanup and updated dependencies --- .../android/NewsBlur/app/benchmark/build.gradle | 6 +++--- clients/android/NewsBlur/app/build.gradle | 14 +++++++------- .../java/com/newsblur/network/APIResponse.java | 2 -- .../java/com/newsblur/util/NotificationUtils.java | 2 -- .../app/src/main/res/drawable/ic_bookmark.xml | 9 --------- .../NewsBlur/app/src/main/res/drawable/ic_lock.xml | 9 --------- .../app/src/main/res/drawable/ic_rss_feed.xml | 12 ------------ .../NewsBlur/app/src/main/res/drawable/ic_sync.xml | 9 --------- .../NewsBlur/app/src/main/res/drawable/ic_text.xml | 9 --------- clients/android/NewsBlur/build.gradle | 10 +++++----- 10 files changed, 15 insertions(+), 67 deletions(-) delete mode 100644 clients/android/NewsBlur/app/src/main/res/drawable/ic_bookmark.xml delete mode 100644 clients/android/NewsBlur/app/src/main/res/drawable/ic_lock.xml delete mode 100644 clients/android/NewsBlur/app/src/main/res/drawable/ic_rss_feed.xml delete mode 100644 clients/android/NewsBlur/app/src/main/res/drawable/ic_sync.xml delete mode 100644 clients/android/NewsBlur/app/src/main/res/drawable/ic_text.xml diff --git a/clients/android/NewsBlur/app/benchmark/build.gradle b/clients/android/NewsBlur/app/benchmark/build.gradle index c8c6a3ccb..51b16e7e8 100644 --- a/clients/android/NewsBlur/app/benchmark/build.gradle +++ b/clients/android/NewsBlur/app/benchmark/build.gradle @@ -39,10 +39,10 @@ android { } dependencies { - implementation 'androidx.test.ext:junit:1.1.3' - implementation 'androidx.test.espresso:espresso-core:3.4.0' + implementation 'androidx.test.ext:junit:1.1.5' + implementation 'androidx.test.espresso:espresso-core:3.5.1' implementation 'androidx.test.uiautomator:uiautomator:2.2.0' - implementation 'androidx.benchmark:benchmark-macro-junit4:1.1.0' + implementation 'androidx.benchmark:benchmark-macro-junit4:1.1.1' } androidComponents { diff --git a/clients/android/NewsBlur/app/build.gradle b/clients/android/NewsBlur/app/build.gradle index e8d182711..5c6269995 100644 --- a/clients/android/NewsBlur/app/build.gradle +++ b/clients/android/NewsBlur/app/build.gradle @@ -50,22 +50,22 @@ android { } dependencies { - implementation 'androidx.fragment:fragment-ktx:1.5.5' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.fragment:fragment-ktx:1.5.6' + implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'com.squareup.okhttp3:okhttp:4.10.0' implementation 'com.google.code.gson:gson:2.10' implementation 'com.android.billingclient:billing:5.1.0' implementation 'com.google.android.play:core:1.10.3' - implementation "com.google.android.material:material:1.7.0" + implementation "com.google.android.material:material:1.8.0" implementation "androidx.preference:preference-ktx:1.2.0" - implementation "androidx.browser:browser:1.4.0" - implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1" - implementation 'androidx.lifecycle:lifecycle-process:2.5.1' + implementation "androidx.browser:browser:1.5.0" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1" + implementation 'androidx.lifecycle:lifecycle-process:2.6.1' implementation 'androidx.core:core-splashscreen:1.0.0' implementation "com.google.dagger:hilt-android:2.44.2" kapt "com.google.dagger:hilt-compiler:2.44.2" - implementation "androidx.profileinstaller:profileinstaller:1.2.2" + implementation "androidx.profileinstaller:profileinstaller:1.3.0" testImplementation "junit:junit:4.13.2" testImplementation "io.mockk:mockk:1.13.4" diff --git a/clients/android/NewsBlur/app/src/main/java/com/newsblur/network/APIResponse.java b/clients/android/NewsBlur/app/src/main/java/com/newsblur/network/APIResponse.java index 0192f2bee..2a955b2f3 100644 --- a/clients/android/NewsBlur/app/src/main/java/com/newsblur/network/APIResponse.java +++ b/clients/android/NewsBlur/app/src/main/java/com/newsblur/network/APIResponse.java @@ -3,7 +3,6 @@ package com.newsblur.network; import java.io.IOException; import java.net.HttpURLConnection; -import android.content.Context; import android.text.TextUtils; import android.util.Log; @@ -109,7 +108,6 @@ public class APIResponse { * may be used for calls that return data, or the parent class may be used if no * return data are expected. */ - @SuppressWarnings("unchecked") public T getResponse(Gson gson, Class classOfT) { if (this.isError) { // if we encountered an error, make a generic response type and populate diff --git a/clients/android/NewsBlur/app/src/main/java/com/newsblur/util/NotificationUtils.java b/clients/android/NewsBlur/app/src/main/java/com/newsblur/util/NotificationUtils.java index 380aa1ba0..3de853349 100644 --- a/clients/android/NewsBlur/app/src/main/java/com/newsblur/util/NotificationUtils.java +++ b/clients/android/NewsBlur/app/src/main/java/com/newsblur/util/NotificationUtils.java @@ -103,8 +103,6 @@ public class NotificationUtils { } } - // addAction deprecated in 23 but replacement not avail until 21 - @SuppressWarnings("deprecation") private static Notification buildStoryNotification(Story story, Cursor cursor, Context context, FileCache iconCache) { Log.d(NotificationUtils.class.getName(), "Building notification"); Intent i = new Intent(context, FeedReading.class); diff --git a/clients/android/NewsBlur/app/src/main/res/drawable/ic_bookmark.xml b/clients/android/NewsBlur/app/src/main/res/drawable/ic_bookmark.xml deleted file mode 100644 index a9d4765ff..000000000 --- a/clients/android/NewsBlur/app/src/main/res/drawable/ic_bookmark.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/clients/android/NewsBlur/app/src/main/res/drawable/ic_lock.xml b/clients/android/NewsBlur/app/src/main/res/drawable/ic_lock.xml deleted file mode 100644 index 658e34b2d..000000000 --- a/clients/android/NewsBlur/app/src/main/res/drawable/ic_lock.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/clients/android/NewsBlur/app/src/main/res/drawable/ic_rss_feed.xml b/clients/android/NewsBlur/app/src/main/res/drawable/ic_rss_feed.xml deleted file mode 100644 index c5813bda8..000000000 --- a/clients/android/NewsBlur/app/src/main/res/drawable/ic_rss_feed.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/clients/android/NewsBlur/app/src/main/res/drawable/ic_sync.xml b/clients/android/NewsBlur/app/src/main/res/drawable/ic_sync.xml deleted file mode 100644 index a1e783529..000000000 --- a/clients/android/NewsBlur/app/src/main/res/drawable/ic_sync.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/clients/android/NewsBlur/app/src/main/res/drawable/ic_text.xml b/clients/android/NewsBlur/app/src/main/res/drawable/ic_text.xml deleted file mode 100644 index fcaac987a..000000000 --- a/clients/android/NewsBlur/app/src/main/res/drawable/ic_text.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/clients/android/NewsBlur/build.gradle b/clients/android/NewsBlur/build.gradle index 6f1288de0..f49c4df27 100644 --- a/clients/android/NewsBlur/build.gradle +++ b/clients/android/NewsBlur/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'com.android.application' version '7.4.0' apply false - id 'com.android.library' version '7.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.20' apply false - id 'org.jetbrains.kotlin.kapt' version '1.7.20' apply false + id 'com.android.application' version '7.4.2' apply false + id 'com.android.library' version '7.4.2' apply false + id 'org.jetbrains.kotlin.android' version '1.8.10' apply false + id 'org.jetbrains.kotlin.kapt' version '1.8.10' apply false id 'com.google.dagger.hilt.android' version '2.44.2' apply false - id 'com.android.test' version '7.4.0' apply false + id 'com.android.test' version '7.4.2' apply false } allprojects {