diff options
author | Daniel Schaal <daniel@schaal.email> | 2022-01-19 08:55:15 +0300 |
---|---|---|
committer | Daniel Schaal <daniel@schaal.email> | 2022-01-19 08:58:57 +0300 |
commit | e0d1fb58b1b857d8a364c6ad8839768a19264ad4 (patch) | |
tree | b870eab7e0d05259b6b7bebc83f7395a37dc9ed5 | |
parent | 71d5fc759c3c1509f8e8dcc4aa22310437b5c06c (diff) |
Update dependencies
-rw-r--r-- | app/build.gradle.kts | 32 | ||||
-rw-r--r-- | app/src/main/AndroidManifest.xml | 6 | ||||
-rw-r--r-- | app/src/main/java/email/schaal/ocreader/ListActivity.kt | 2 | ||||
-rw-r--r-- | build.gradle.kts | 6 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
5 files changed, 25 insertions, 23 deletions
diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 44218b9c..ca68ebdb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -28,15 +28,15 @@ plugins { } android { - compileSdkVersion(30) - buildToolsVersion = "30.0.3" + compileSdk = 31 + buildToolsVersion = "31.0.0" buildFeatures.dataBinding = true defaultConfig { applicationId = "email.schaal.ocreader" - minSdkVersion(23) - targetSdkVersion(30) + minSdk = 23 + targetSdk = 31 versionCode = 58 versionName = "0.58" @@ -67,7 +67,7 @@ android { } } - lintOptions { + lint { isAbortOnError = true disable.add("MissingTranslation") } @@ -84,7 +84,7 @@ object Versions { const val retrofit = "2.9.0" const val glide = "4.12.0" const val lifecycle = "2.3.1" - const val moshi = "1.12.0" + const val moshi = "1.13.0" const val core = "1.6.0" const val annotation = "1.2.0" const val junit_ext = "1.1.3" @@ -92,38 +92,38 @@ object Versions { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0") implementation("androidx.core:core-ktx:${Versions.core}") implementation("androidx.core:core-ktx:${Versions.core}") - implementation("androidx.appcompat:appcompat:1.3.1") + implementation("androidx.appcompat:appcompat:1.4.1") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.lifecycle}") implementation("androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycle}") implementation("androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycle}") implementation("androidx.lifecycle:lifecycle-common-java8:${Versions.lifecycle}") - implementation("androidx.work:work-runtime-ktx:2.5.0") - implementation("androidx.fragment:fragment-ktx:1.3.6") - implementation("androidx.activity:activity-ktx:1.2.4") + implementation("androidx.work:work-runtime-ktx:2.7.1") + implementation("androidx.fragment:fragment-ktx:1.4.0") + implementation("androidx.activity:activity-ktx:1.4.0") implementation("androidx.recyclerview:recyclerview:1.2.1") implementation("androidx.palette:palette-ktx:1.0.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.preference:preference-ktx:1.1.1") - implementation("androidx.viewpager2:viewpager2:1.1.0-alpha01") - implementation("androidx.constraintlayout:constraintlayout:2.0.4") + implementation("androidx.viewpager2:viewpager2:1.1.0-beta01") + implementation("androidx.constraintlayout:constraintlayout:2.1.3") implementation("androidx.annotation:annotation:${Versions.annotation}") kapt("androidx.annotation:annotation:${Versions.annotation}") - implementation("com.google.android.material:material:1.4.0") + implementation("com.google.android.material:material:1.5.0") implementation("com.mikepenz:aboutlibraries:8.9.1") - implementation("org.jsoup:jsoup:1.14.1") + implementation("org.jsoup:jsoup:1.14.3") implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 45547ed4..b6b63877 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,7 +21,8 @@ <activity android:name=".ListActivity" android:label="@string/app_name" - android:launchMode="singleTop"> + android:launchMode="singleTop" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -39,7 +40,8 @@ <activity android:name=".ManageFeedsActivity" android:label="@string/title_activity_managefeeds" - android:parentActivityName=".ListActivity"> + android:parentActivityName=".ListActivity" + android:exported="true"> <intent-filter android:label="@string/add_new_feed"> <action android:name="android.intent.action.SEND" /> diff --git a/app/src/main/java/email/schaal/ocreader/ListActivity.kt b/app/src/main/java/email/schaal/ocreader/ListActivity.kt index eb27d787..c964912e 100644 --- a/app/src/main/java/email/schaal/ocreader/ListActivity.kt +++ b/app/src/main/java/email/schaal/ocreader/ListActivity.kt @@ -86,7 +86,7 @@ class ListActivity : AppCompatActivity(), ItemViewHolder.OnClickListener, OnRefr } private val getSettingsResult = registerForActivityResult(object : ActivityResultContract<Unit, Boolean>() { - override fun createIntent(context: Context, input: Unit?): Intent { + override fun createIntent(context: Context, input: Unit): Intent { return Intent(this@ListActivity, SettingsActivity::class.java) } diff --git a/build.gradle.kts b/build.gradle.kts index 5d32ccf1..94f6875f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,10 +24,10 @@ buildscript { google() } dependencies { - classpath("com.android.tools.build:gradle:4.2.2") + classpath("com.android.tools.build:gradle:7.0.4") // keep kotlin version in sync with app/build.gradle.kts - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21") - classpath("io.realm:realm-gradle-plugin:10.6.1") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") + classpath("io.realm:realm-gradle-plugin:10.10.0") } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index af7be50b..669386b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists |