From a848f10bba4f840248ecf314f7c9d55511d05a0f Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Mon, 23 Nov 2020 12:35:24 -0800
Subject: [PATCH] Update Kotlin

---
 app/build.gradle.kts                                        | 6 +-----
 .../main/java/com/topjohnwu/magisk/core/download/Action.kt  | 2 +-
 .../main/java/com/topjohnwu/magisk/core/download/Subject.kt | 2 +-
 .../main/java/com/topjohnwu/magisk/core/model/UpdateInfo.kt | 2 +-
 .../com/topjohnwu/magisk/core/model/module/OnlineModule.kt  | 2 +-
 build.gradle.kts                                            | 2 +-
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f24e0cc60..c6b531548 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("com.android.application")
     kotlin("android")
-    kotlin("android.extensions")
+    kotlin("plugin.parcelize")
     kotlin("kapt")
     id("androidx.navigation.safeargs.kotlin")
 }
@@ -64,10 +64,6 @@ android {
     }
 }
 
-androidExtensions {
-    isExperimental = true
-}
-
 val copyUtils = tasks.register("copyUtils", Copy::class) {
     from(rootProject.file("scripts/util_functions.sh"))
     into("src/main/res/raw")
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/download/Action.kt b/app/src/main/java/com/topjohnwu/magisk/core/download/Action.kt
index 681ffd1d1..ae3b9cc0b 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/download/Action.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/download/Action.kt
@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.core.download
 
 import android.net.Uri
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 sealed class Action : Parcelable {
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/download/Subject.kt b/app/src/main/java/com/topjohnwu/magisk/core/download/Subject.kt
index 0c806f922..7ec15af94 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/download/Subject.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/download/Subject.kt
@@ -13,7 +13,7 @@ import com.topjohnwu.magisk.core.utils.MediaStoreUtils
 import com.topjohnwu.magisk.ktx.cachedFile
 import com.topjohnwu.magisk.ktx.get
 import kotlinx.android.parcel.IgnoredOnParcel
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 private fun cachedFile(name: String) = get<Context>().cachedFile(name).apply { delete() }.toUri()
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/model/UpdateInfo.kt b/app/src/main/java/com/topjohnwu/magisk/core/model/UpdateInfo.kt
index 51c88f842..b45d68816 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/model/UpdateInfo.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/model/UpdateInfo.kt
@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.core.model
 
 import android.os.Parcelable
 import com.squareup.moshi.JsonClass
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @JsonClass(generateAdapter = true)
 data class UpdateInfo(
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/model/module/OnlineModule.kt b/app/src/main/java/com/topjohnwu/magisk/core/model/module/OnlineModule.kt
index 9a1491a1b..9552801d1 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/model/module/OnlineModule.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/model/module/OnlineModule.kt
@@ -7,7 +7,7 @@ import com.topjohnwu.magisk.core.model.ModuleJson
 import com.topjohnwu.magisk.data.repository.NetworkService
 import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.ktx.legalFilename
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.text.DateFormat
 import java.util.*
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 99c49f196..5d8e668dc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,7 @@ buildscript {
 
     dependencies {
         classpath("com.android.tools.build:gradle:4.1.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.20")
         classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}")
 
         // NOTE: Do not place your application dependencies here; they belong