update okhttp version

Author: az4521

app/build.gradle

@@ -5,10 +5,11 @@ import java.text.SimpleDateFormat
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+//apply plugin: 'kotlin-android-extensions' //GOODBYE VIEWBINDING
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.github.zellius.shortcut-helper'
 apply plugin: 'kotlinx-serialization'
+apply plugin: 'kotlin-parcelize'
 // Realm (EH)
 apply plugin: 'realm-android'
 
@@ -132,8 +133,12 @@ android {
     }
 }
 
-androidExtensions {
-    experimental = true
+//androidExtensions {
+//    experimental = true
+//}
+
+kapt {
+    correctErrorTypes true
 }
 
 dependencies {
@@ -180,11 +185,11 @@ dependencies {
     implementation 'com.github.pwittchen:reactivenetwork:0.13.0'
 
     // Network client
-    final okhttp_version = '4.7.2'
+    final okhttp_version = '5.0.0-alpha.12'
     implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
     implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
     implementation "com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttp_version"
-    implementation 'com.squareup.okio:okio:2.6.0'
+    implementation 'com.squareup.okio:okio:3.7.0'
 
     // TLS 1.3 support for Android < 10
     implementation 'org.conscrypt:conscrypt-android:2.4.0'
@@ -197,7 +202,7 @@ dependencies {
     implementation "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
 
     // JSON
-    final kotlin_serialization_version = '1.3.3'
+    final kotlin_serialization_version = '1.6.2'
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialization_version"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlin_serialization_version"
     implementation 'com.google.code.gson:gson:2.8.6'
@@ -291,7 +296,7 @@ dependencies {
     implementation "io.github.reactivecircus.flowbinding:flowbinding-viewpager:$flowbinding_version"
 
     // Shizuku
-    final shizukuVersion = '12.0.0'
+    final shizukuVersion = '12.2.0'
     implementation "dev.rikka.shizuku:api:$shizukuVersion"
     implementation "dev.rikka.shizuku:provider:$shizukuVersion"
 
@@ -314,7 +319,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutines_version"
 
-    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
+    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.1'
 
     // Text distance (EH)
     implementation 'info.debatty:java-string-similarity:1.2.1'
@@ -374,7 +379,7 @@ dependencies {
 }
 
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '1.9.22'
     repositories {
         mavenCentral()
     }

app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt

@@ -52,6 +52,7 @@ internal class ExtensionInstallReceiver(private val listener: Listener) :
                     when (val result = getExtensionFromIntent(context, intent)) {
                         is LoadResult.Success -> listener.onExtensionInstalled(result.extension)
                         is LoadResult.Untrusted -> listener.onExtensionUntrusted(result.extension)
+                        else -> {}
                     }
                 }
             }
@@ -62,6 +63,7 @@ internal class ExtensionInstallReceiver(private val listener: Listener) :
                         // Not needed as a package can't be upgraded if the signature is different
                         is LoadResult.Untrusted -> {
                         }
+                        else -> {}
                     }
                 }
             }

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryNavigationView.kt

@@ -127,6 +127,7 @@ class LibraryNavigationView @JvmOverloads constructor(context: Context, attrs: A
                 completed -> preferences.filterCompleted().set(item.state)
                 tracked -> preferences.filterTracked().set(item.state)
                 lewd -> preferences.filterLewd().set(item.state)
+                else -> {}
             }
 
             adapter.notifyItemChanged(item)
@@ -234,6 +235,7 @@ class LibraryNavigationView @JvmOverloads constructor(context: Context, attrs: A
             when (item) {
                 downloadBadge -> preferences.downloadBadge().set((item.checked))
                 unreadBadge -> preferences.unreadBadge().set((item.checked))
+                else -> {}
             }
             adapter.notifyItemChanged(item)
         }
@@ -256,6 +258,7 @@ class LibraryNavigationView @JvmOverloads constructor(context: Context, attrs: A
             item.checked = !item.checked
             when (item) {
                 startReadingButton -> preferences.startReadingButton().set((item.checked))
+                else -> {}
             }
             adapter.notifyItemChanged(item)
         }

app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

@@ -394,8 +394,8 @@ class MainActivity : BaseActivity<MainActivityBinding>() {
     override fun onDestroy() {
         super.onDestroy()
         // Binding sometimes isn't actually instantiated yet somehow
-        binding?.navView.setNavigationItemSelectedListener(null)
-        binding?.toolbar.setNavigationOnClickListener(null)
+        binding?.navView?.setNavigationItemSelectedListener(null)
+        binding?.toolbar?.setNavigationOnClickListener(null)
     }
 
     override fun onBackPressed() {

app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceItem.kt

@@ -9,7 +9,7 @@ import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.HttpSource
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 class MigrationSourceItem(val source: HttpSource, var sourceEnabled: Boolean) : AbstractFlexibleItem<MigrationSourceHolder>() {
     override fun getLayoutRes() = R.layout.migration_source_item

app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcedureConfig.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.ui.migration.manga.process
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class MigrationProcedureConfig(

app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceController.kt

@@ -33,10 +33,10 @@ import eu.kanade.tachiyomi.ui.source.browse.BrowseSourceController
 import eu.kanade.tachiyomi.ui.source.globalsearch.GlobalSearchController
 import eu.kanade.tachiyomi.ui.source.latest.LatestUpdatesController
 import exh.ui.smartsearch.SmartSearchController
-import kotlinx.android.parcel.Parcelize
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.parcelize.Parcelize
 import reactivecircus.flowbinding.appcompat.QueryTextEvent
 import reactivecircus.flowbinding.appcompat.queryTextEvents
 import uy.kohesive.injekt.Injekt

app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt

@@ -54,13 +54,13 @@ import eu.kanade.tachiyomi.util.view.visible
 import eu.kanade.tachiyomi.widget.AutofitRecyclerView
 import eu.kanade.tachiyomi.widget.EmptyView
 import exh.savedsearches.EXHSavedSearch
-import kotlinx.android.parcel.Parcelize
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.parcelize.Parcelize
 import reactivecircus.flowbinding.appcompat.QueryTextEvent
 import reactivecircus.flowbinding.appcompat.queryTextEvents
 import uy.kohesive.injekt.injectLazy

app/src/main/java/exh/ui/intercept/InterceptActivity.kt

@@ -83,6 +83,7 @@ class InterceptActivity : BaseActivity<EhActivityInterceptBinding>() {
                             .onDismiss { onBackPressed() }
                             .show()
                     }
+                    else -> {}
                 }
             }
     }

build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("com.android.application") version BuildPluginsVersion.AGP apply false
     id("com.android.library") version BuildPluginsVersion.AGP apply false
     kotlin("android") version BuildPluginsVersion.KOTLIN apply false
+    //id("org.jetbrains.kotlin.plugin.parcelize") version BuildPluginsVersion.KOTLIN
     id("org.jlleitschuh.gradle.ktlint") version BuildPluginsVersion.KTLINT
     id("com.github.ben-manes.versions") version BuildPluginsVersion.VERSIONS_PLUGIN
 }
@@ -15,7 +16,6 @@ allprojects {
         maven { setUrl("https://oss.sonatype.org/content/repositories/snapshots/") }
         maven { setUrl("https://dl.bintray.com/ibm-cloud-sdks/ibm-cloud-sdk-repo") }
         maven { setUrl("https://plugins.gradle.org/m2/") }
-        jcenter()
     }
 }
 
@@ -44,7 +44,7 @@ buildscript {
         classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0")
         classpath("com.github.zellius:android-shortcut-gradle-plugin:0.1.2")
         classpath("com.google.gms:google-services:4.3.5")
-        classpath("com.google.android.gms:oss-licenses-plugin:0.10.2")
+        classpath("com.google.android.gms:oss-licenses-plugin:0.10.6")
         classpath(kotlin("serialization", version = "1.4.21"))
         // Realm (EH)
         classpath("io.realm:realm-gradle-plugin:7.0.1")
@@ -56,6 +56,7 @@ buildscript {
     }
     repositories {
         google()
+        mavenCentral()
         jcenter()
         //maven { setUrl("https://maven.fabric.io/public") }
     }

buildSrc/build.gradle.kts

@@ -2,5 +2,5 @@ plugins {
     `kotlin-dsl`
 }
 repositories {
-    jcenter()
+    mavenCentral()
 }

buildSrc/src/main/kotlin/Dependencies.kt

@@ -4,7 +4,7 @@ object Versions {
 
 object BuildPluginsVersion {
     const val AGP = "4.0.1"
-    const val KOTLIN = "1.5.10"
+    const val KOTLIN = "1.9.22"
     const val KTLINT = "9.2.1"
     const val VERSIONS_PLUGIN = "0.28.0"
 }

gradle.properties

@@ -18,7 +18,6 @@ org.gradle.jvmargs=-Xmx4096m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
 org.gradle.caching=true
-android.enableBuildCache=true
 kotlin.incremental=true
 kapt.incremental.apt=true
 kapt.use.worker.api=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jun 07 15:33:20 EDT 2020
+#Mon Jan 15 21:00:55 EST 2024
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+zipStoreBase=GRADLE_USER_HOME