diff --git a/app/build.gradle b/app/build.gradle index 3bdc08948..0cc0dfa60 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId 'org.koitharu.kotatsu' minSdk = 21 targetSdk = 35 - versionCode = 666 - versionName = '7.5' + versionCode = 667 + versionName = '7.5.1' generatedDensities = [] testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner' ksp { @@ -87,19 +87,19 @@ dependencies { exclude group: 'org.json', module: 'json' } - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.1' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2' implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.10' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0-RC.2' implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.core:core-ktx:1.13.1' - implementation 'androidx.activity:activity-ktx:1.9.1' - implementation 'androidx.fragment:fragment-ktx:1.8.2' + implementation 'androidx.activity:activity-ktx:1.9.2' + implementation 'androidx.fragment:fragment-ktx:1.8.3' implementation 'androidx.transition:transition-ktx:1.5.1' implementation 'androidx.collection:collection-ktx:1.4.3' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4' - implementation 'androidx.lifecycle:lifecycle-service:2.8.4' - implementation 'androidx.lifecycle:lifecycle-process:2.8.4' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5' + implementation 'androidx.lifecycle:lifecycle-service:2.8.5' + implementation 'androidx.lifecycle:lifecycle-process:2.8.5' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.recyclerview:recyclerview:1.3.2' @@ -107,7 +107,7 @@ dependencies { implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05' implementation 'com.google.android.material:material:1.12.0' - implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.4' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.5' implementation 'androidx.webkit:webkit:1.11.0' implementation 'androidx.work:work-runtime:2.9.1' diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt index 391e846e4..451dd4a97 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt @@ -3,7 +3,6 @@ package org.koitharu.kotatsu.core.ui import android.content.Intent import android.content.res.Configuration import android.graphics.Color -import android.os.Build import android.os.Bundle import android.view.KeyEvent import android.view.View @@ -100,11 +99,6 @@ abstract class BaseActivity : } override fun onSupportNavigateUp(): Boolean { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { - // TODO fix behavior on Android 14 - dispatchNavigateUp() - return true - } val fm = supportFragmentManager if (fm.isStateSaved) { return false