diff --git a/app/build.gradle b/app/build.gradle index c206ffcb3..9e18f5bc5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -61,12 +61,12 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0' - implementation 'androidx.core:core-ktx:1.5.0-rc01' - implementation 'androidx.activity:activity-ktx:1.2.2' - implementation 'androidx.fragment:fragment-ktx:1.3.3' + implementation 'androidx.core:core-ktx:1.5.0' + implementation 'androidx.activity:activity-ktx:1.2.3' + implementation 'androidx.fragment:fragment-ktx:1.3.4' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1' @@ -93,15 +93,15 @@ dependencies { implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.0' implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.0' - implementation 'io.insert-koin:koin-android:3.0.1' - implementation 'io.insert-koin:koin-android-ext:3.0.1' - implementation 'io.coil-kt:coil-base:1.1.1' + implementation 'io.insert-koin:koin-android:3.0.2' + implementation 'io.insert-koin:koin-android-ext:3.0.2' + implementation 'io.coil-kt:coil-base:1.2.1' implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0' implementation 'com.github.solkin:disk-lru-cache:1.2' debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.json:json:20201115' - testImplementation 'io.insert-koin:koin-test-junit4:3.0.1' + testImplementation 'org.json:json:20210307' + testImplementation 'io.insert-koin:koin-test-junit4:3.0.2' } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt index 867c5e3fc..e5be6808c 100644 --- a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt @@ -41,7 +41,7 @@ class BrowserActivity : BaseActivity(), BrowserCallback } } - override fun onCreateOptionsMenu(menu: Menu?): Boolean { + override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.opt_browser, menu) return super.onCreateOptionsMenu(menu) } diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt index eacf132f9..8cc025234 100644 --- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt @@ -113,7 +113,7 @@ class DetailsActivity : BaseActivity(), } } - override fun onCreateOptionsMenu(menu: Menu?): Boolean { + override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.opt_details, menu) return super.onCreateOptionsMenu(menu) } diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt index 5b53b41ff..22d66a6c6 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt @@ -124,7 +124,7 @@ class ReaderActivity : BaseFullscreenActivity(), } } - override fun onCreateOptionsMenu(menu: Menu?): Boolean { + override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.opt_reader_top, menu) return super.onCreateOptionsMenu(menu) } diff --git a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt index fabf1fbba..1946fb0dd 100644 --- a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt @@ -58,7 +58,7 @@ class ShelfConfigActivity : BaseActivity(), OnListIte viewModel.onError.observe(this, this::onError) } - override fun onCreateOptionsMenu(menu: Menu?): Boolean { + override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.opt_config, menu) return super.onCreateOptionsMenu(menu) } diff --git a/build.gradle b/build.gradle index c92340660..144344709 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:4.1.3' - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files