From 353f532bc21eb2fe1cf328aa9ade1234decd0756 Mon Sep 17 00:00:00 2001 From: sictiru Date: Sun, 4 Jun 2023 13:50:21 -0700 Subject: [PATCH] Upgrade dependencies --- clients/android/NewsBlur/app/build.gradle | 16 ++++++++-------- .../NewsBlur/app/src/main/AndroidManifest.xml | 3 +-- clients/android/NewsBlur/build.gradle | 6 +++--- clients/android/NewsBlur/gradle.properties | 5 ++++- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/clients/android/NewsBlur/app/build.gradle b/clients/android/NewsBlur/app/build.gradle index 5c6269995..460ec2eaf 100644 --- a/clients/android/NewsBlur/app/build.gradle +++ b/clients/android/NewsBlur/app/build.gradle @@ -40,32 +40,32 @@ android { resources.excludes.add("META-INF/*") } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } buildFeatures.viewBinding = true } dependencies { - implementation 'androidx.fragment:fragment-ktx:1.5.6' + implementation 'androidx.fragment:fragment-ktx:1.5.7' 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.android.billingclient:billing:6.0.0' implementation 'com.google.android.play:core:1.10.3' - implementation "com.google.android.material:material:1.8.0" + implementation "com.google.android.material:material:1.9.0" implementation "androidx.preference:preference-ktx:1.2.0" 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 'androidx.core:core-splashscreen:1.0.1' implementation "com.google.dagger:hilt-android:2.44.2" kapt "com.google.dagger:hilt-compiler:2.44.2" - implementation "androidx.profileinstaller:profileinstaller:1.3.0" + implementation "androidx.profileinstaller:profileinstaller:1.3.1" testImplementation "junit:junit:4.13.2" testImplementation "io.mockk:mockk:1.13.4" diff --git a/clients/android/NewsBlur/app/src/main/AndroidManifest.xml b/clients/android/NewsBlur/app/src/main/AndroidManifest.xml index 91a01af45..db68547ee 100644 --- a/clients/android/NewsBlur/app/src/main/AndroidManifest.xml +++ b/clients/android/NewsBlur/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/clients/android/NewsBlur/build.gradle b/clients/android/NewsBlur/build.gradle index f49c4df27..ead41f166 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.2' apply false - id 'com.android.library' version '7.4.2' apply false + id 'com.android.application' version '8.0.1' apply false + id 'com.android.library' version '8.0.1' 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.2' apply false + id 'com.android.test' version '8.0.1' apply false } allprojects { diff --git a/clients/android/NewsBlur/gradle.properties b/clients/android/NewsBlur/gradle.properties index 70254911a..f8d150977 100644 --- a/clients/android/NewsBlur/gradle.properties +++ b/clients/android/NewsBlur/gradle.properties @@ -1,3 +1,6 @@ org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M" kotlin.code.style=obsolete -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/clients/android/NewsBlur/gradle/wrapper/gradle-wrapper.properties b/clients/android/NewsBlur/gradle/wrapper/gradle-wrapper.properties index ee44b0332..0c75a9afb 100644 --- a/clients/android/NewsBlur/gradle/wrapper/gradle-wrapper.properties +++ b/clients/android/NewsBlur/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Oct 27 16:20:00 PDT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME