From abea51c80558efc6fd446d5c385d511423588fee Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Mon, 29 Mar 2021 23:50:46 -0400 Subject: [PATCH] Removing kotlin extensions + adding jetbrains kotlin also bumping up to kotlin 1.4.20 and using jsetbrains kotlin for parcelize (needed for mass migration) With this we can close #684 because we are TRULY finished --- .../kanade/tachiyomi/ui/base/controller/BaseController.kt | 7 +------ .../tachiyomi/ui/base/holder/BaseFlexibleViewHolder.kt | 7 +------ .../eu/kanade/tachiyomi/ui/base/holder/BaseViewHolder.kt | 7 +------ .../ui/migration/manga/design/MigrationSourceItem.kt | 2 +- build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Dependencies.kt | 6 +++--- ktlintCodeStyle.xml | 5 ----- 7 files changed, 8 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt index 2c795318c7..b28fdc11a9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt @@ -11,12 +11,10 @@ import com.bluelinelabs.conductor.Controller import com.bluelinelabs.conductor.ControllerChangeHandler import com.bluelinelabs.conductor.ControllerChangeType import com.bluelinelabs.conductor.RestoreViewOnCreateController -import kotlinx.android.extensions.LayoutContainer import timber.log.Timber abstract class BaseController(bundle: Bundle? = null) : - RestoreViewOnCreateController(bundle), - LayoutContainer { + RestoreViewOnCreateController(bundle) { lateinit var binding: VB @@ -46,9 +44,6 @@ abstract class BaseController(bundle: Bundle? = null) : ) } - override val containerView: View? - get() = view - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup, savedViewState: Bundle?): View { binding = createBinding(inflater) return binding.root diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseFlexibleViewHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseFlexibleViewHolder.kt index 79f3455fe6..54285b1fff 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseFlexibleViewHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseFlexibleViewHolder.kt @@ -3,15 +3,10 @@ package eu.kanade.tachiyomi.ui.base.holder import android.view.View import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.viewholders.FlexibleViewHolder -import kotlinx.android.extensions.LayoutContainer abstract class BaseFlexibleViewHolder( view: View, adapter: FlexibleAdapter<*>, stickyHeader: Boolean = false ) : - FlexibleViewHolder(view, adapter, stickyHeader), LayoutContainer { - - override val containerView: View? - get() = itemView -} + FlexibleViewHolder(view, adapter, stickyHeader) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseViewHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseViewHolder.kt index 9b03064c47..61d6f6db74 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseViewHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseViewHolder.kt @@ -1,10 +1,5 @@ package eu.kanade.tachiyomi.ui.base.holder import android.view.View -import kotlinx.android.extensions.LayoutContainer -abstract class BaseViewHolder(view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view), LayoutContainer { - - override val containerView: View? - get() = itemView -} +abstract class BaseViewHolder(view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceItem.kt index a9c95ac55e..5b74c9ed2f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceItem.kt +++ b/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() { override fun getLayoutRes() = R.layout.migration_source_item diff --git a/build.gradle.kts b/build.gradle.kts index 6e09699e7d..eb3c3c9d42 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id(Plugins.kotlinter.name) version Plugins.kotlinter.version id(Plugins.gradleVersions.name) version Plugins.gradleVersions.version + id(Plugins.jetbrainsKotlin) version Versions.kotlin apply false } allprojects { repositories { @@ -25,7 +26,6 @@ buildscript { classpath(LegacyPluginClassPath.fireBaseCrashlytics) classpath(LegacyPluginClassPath.androidGradlePlugin) classpath(LegacyPluginClassPath.googleServices) - classpath(LegacyPluginClassPath.kotlinExtensions) classpath(LegacyPluginClassPath.kotlinPlugin) classpath(LegacyPluginClassPath.aboutLibraries) classpath(LegacyPluginClassPath.kotlinSerializations) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index efb65f7db9..8cfb42e559 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -53,7 +53,7 @@ object Versions { const val injekt = "65b0440" const val jsoup = "1.13.1" const val junit = "4.13" - const val kotlin = "1.4.10" + const val kotlin = "1.4.20" const val kotlinCoroutines = "1.3.9" const val kotlinSerialization = "1.0.1" const val kotson = "2.5.0" @@ -98,7 +98,6 @@ object LegacyPluginClassPath { const val aboutLibraries = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${Versions.aboutLibraries}" const val androidGradlePlugin = "com.android.tools.build:gradle:${Versions.androidGradlePlugin}" const val googleServices = "com.google.gms:google-services:${Versions.googleServices}" - const val kotlinExtensions = "org.jetbrains.kotlin:kotlin-android-extensions:${Versions.kotlin}" const val kotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" const val kotlinSerializations = "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}" const val fireBaseCrashlytics = "com.google.firebase:firebase-crashlytics-gradle:2.3.0" @@ -120,8 +119,10 @@ object Plugins { const val firebaseCrashlytics = "com.google.firebase.crashlytics" const val googleServices = "com.google.gms.google-services" const val kapt = "kapt" + const val kotlinParcelize = "kotlin-parcelize" const val kotlinAndroid = "android" const val kotlinExtensions = "android.extensions" + const val jetbrainsKotlin = "org.jetbrains.kotlin.android" const val kotlinSerialization = "org.jetbrains.kotlin.plugin.serialization" val gradleVersions = PluginClass("com.github.ben-manes.versions", Versions.gradleVersions) val ktLint = PluginClass("org.jlleitschuh.gradle.ktlint", Versions.ktlint) @@ -144,7 +145,6 @@ object Configs { object BuildPluginsVersion { const val AGP = "com.android.tools.build:gradle:4.1.3" const val KOTLIN = "1.4.10" - const val ANDROID_EXTENSIONS = "org.jetbrains.kotlin:kotlin-android-extensions:$KOTLIN" const val KOTLIN_GRADLE = "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN" const val KOTLINTER = "3.3.0" const val GOOGLE_SERVICES = "com.google.gms:google-services:4.3.3" diff --git a/ktlintCodeStyle.xml b/ktlintCodeStyle.xml index e1422c7c8f..6cea4ec850 100644 --- a/ktlintCodeStyle.xml +++ b/ktlintCodeStyle.xml @@ -1,10 +1,5 @@ -