From d0c61bea52af7ce7919faaa43747d256328efcc6 Mon Sep 17 00:00:00 2001 From: William Brawner Date: Sun, 23 Oct 2022 23:45:28 -0600 Subject: [PATCH] Update dependencies and target sdk --- app/build.gradle | 42 +++++++++---------- app/src/main/AndroidManifest.xml | 3 +- .../view/fragment/SettingsFragment.kt | 6 ++- build.gradle | 8 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 31 insertions(+), 30 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0e0cdb6..16cdc34 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,7 +28,7 @@ android { exclude 'META-INF/LICENSE' exclude 'META-INF/DEPENDENCIES' } - compileSdkVersion 30 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -39,7 +39,7 @@ android { defaultConfig { applicationId "com.wbrawner.simplemarkdown" minSdkVersion 23 - targetSdkVersion 30 + targetSdkVersion 33 versionCode 34 versionName "0.8.12" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -90,39 +90,37 @@ android { dependencies { samsungImplementation project(":IAP5Helper") - def navigation_version = '2.3.5' + def navigation_version = '2.5.3' implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version" implementation "androidx.navigation:navigation-ui-ktx:$navigation_version" - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' testImplementation 'org.robolectric:robolectric:4.2.1' implementation fileTree(include: ['*.jar'], dir: 'libs') - def espresso_version = '3.3.0' + def espresso_version = '3.4.0' androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version" androidTestImplementation "androidx.test.espresso:espresso-web:$espresso_version" androidTestImplementation "androidx.test.espresso:espresso-intents:$espresso_version" - def android_test = '1.4.0-rc01' + def android_test = '1.4.0' androidTestImplementation "androidx.test:runner:$android_test" androidTestImplementation "androidx.test:rules:$android_test" - androidTestUtil "androidx.test:orchestrator:$android_test" - androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestUtil "androidx.test:orchestrator:1.4.1" + androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' - implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'androidx.preference:preference-ktx:1.1.1' - implementation "androidx.fragment:fragment-ktx:1.3.5" - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'com.google.android.material:material:1.3.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.preference:preference-ktx:1.2.0' + implementation "androidx.fragment:fragment-ktx:1.5.4" + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'com.google.android.material:material:1.7.0' implementation 'androidx.legacy:legacy-support-v13:1.0.0' implementation 'com.commonsware.cwac:anddown:0.3.0' - implementation 'com.jakewharton.timber:timber:4.7.1' - playImplementation 'com.android.billingclient:billing:4.0.0' + implementation 'com.jakewharton.timber:timber:5.0.1' + playImplementation 'com.android.billingclient:billing:5.0.0' playImplementation 'com.google.android.play:core-ktx:1.8.1' - playImplementation 'com.google.firebase:firebase-crashlytics:18.1.0' - playImplementation 'com.google.firebase:firebase-analytics:19.0.0' - implementation "androidx.core:core-ktx:1.5.0" - implementation 'androidx.browser:browser:1.3.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - def coroutines_version = "1.3.7" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" + playImplementation 'com.google.firebase:firebase-crashlytics:18.3.1' + playImplementation 'com.google.firebase:firebase-analytics:21.2.0' + implementation "androidx.core:core-ktx:1.9.0" + implementation 'androidx.browser:browser:1.4.0' + def coroutines_version = "1.6.4" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" def lifecycle_version = "2.2.0" implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 03f2e80..09b99cc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,6 +20,7 @@ @@ -41,7 +42,7 @@ - + (getString(R.string.pref_custom_css))?.let { + preferenceScreen.removePreference(it) + } } } } diff --git a/build.gradle b/build.gradle index 766147d..77f1a25 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,16 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.20' + ext.kotlin_version = '1.7.20' repositories { google() mavenCentral() maven {url 'https://plugins.gradle.org/m2/' } } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.3.8' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' + classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.google.gms:google-services:4.3.14' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.osacky.flank.gradle:fladle:0.14.1" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f2aaab..f080157 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip