Replace deprecated kotlin-android-extensions with kotlin-parcelize

AniTrend · Apr 8, 2021 · 181820b · 181820b
1 parent 8e0090b
commit 181820b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/...c/src/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/components/AndroidOptions.kt b/...c/src/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/components/AndroidOptions.kt
@@ -6,7 +6,6 @@ import org.gradle.kotlin.dsl.get
 import org.jetbrains.dokka.gradle.DokkaTask
 import co.anitrend.retrofit.graphql.buildSrc.plugin.extensions.baseExtension
 import co.anitrend.retrofit.graphql.buildSrc.plugin.extensions.baseAppExtension
-import co.anitrend.retrofit.graphql.buildSrc.plugin.extensions.androidExtensionsExtension
 import co.anitrend.retrofit.graphql.buildSrc.plugin.extensions.publishingExtension
 import co.anitrend.retrofit.graphql.buildSrc.plugin.extensions.libraryExtension
 import co.anitrend.retrofit.graphql.buildSrc.common.Versions
@@ -200,7 +199,4 @@ internal fun Project.configureOptions() {
                 applyConfiguration(this@configureOptions)
             }
         }
-
-    println("Enabling experimental extension options for feature module -> ${project.path}")
-    androidExtensionsExtension().isExperimental = true
 }
diff --git a/...c/src/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/components/AndroidPlugins.kt b/...c/src/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/components/AndroidPlugins.kt
@@ -17,7 +17,8 @@ private fun Project.applyModulePlugin() {
 internal fun Project.configurePlugins() {
     applyModulePlugin()
     plugins.apply("kotlin-android")
-    plugins.apply("kotlin-android-extensions")
-    if (isSampleModule())
+    plugins.apply("kotlin-parcelize")
+    if (isSampleModule()) {
         plugins.apply("kotlin-kapt")
+    }
 }
diff --git a/...rc/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/extensions/ProjectExtensions.kt b/...rc/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/extensions/ProjectExtensions.kt
@@ -13,7 +13,6 @@ import org.gradle.api.reporting.ReportingExtension
 import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.kotlin.dsl.getByType
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
-import org.jetbrains.kotlin.gradle.internal.AndroidExtensionsExtension
 import org.jetbrains.kotlin.gradle.testing.internal.KotlinTestsRegistry
 
 internal fun Project.baseExtension() =
@@ -52,9 +51,6 @@ internal fun Project.kotlinAndroidProjectExtension() =
 internal fun Project.kotlinTestsRegistry() =
     extensions.getByType<KotlinTestsRegistry>()
 
-internal fun Project.androidExtensionsExtension() =
-    extensions.getByType<AndroidExtensionsExtension>()
-
 internal fun Project.publishingExtension() =
     extensions.getByType<PublishingExtension>()
 

diff --git a/library/src/main/kotlin/io/github/wax911/library/model/request/QueryContainer.kt b/library/src/main/kotlin/io/github/wax911/library/model/request/QueryContainer.kt
@@ -1,8 +1,8 @@
 package io.github.wax911.library.model.request
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
-import kotlinx.android.parcel.RawValue
+import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.RawValue
 import java.util.*
 
 /**

diff --git a/library/src/main/kotlin/io/github/wax911/library/model/request/QueryContainerBuilder.kt b/library/src/main/kotlin/io/github/wax911/library/model/request/QueryContainerBuilder.kt
@@ -1,7 +1,7 @@
 package io.github.wax911.library.model.request
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 /**
  * Query & Variable builder for graph requests