MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Kotlin

Browse Source
This commit is contained in:
topjohnwu 2020-11-23 12:35:24 -08:00
parent 552ec1eb35
commit a848f10bba
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle.kts
View File

@ -1,7 +1,7 @@
plugins { plugins {
id("com.android.application") id("com.android.application")
kotlin("android") kotlin("android")
kotlin("android.extensions") kotlin("plugin.parcelize")
kotlin("kapt") kotlin("kapt")
id("androidx.navigation.safeargs.kotlin") id("androidx.navigation.safeargs.kotlin")
} }
@ -64,10 +64,6 @@ android {
} }
} }
androidExtensions {
isExperimental = true
}
val copyUtils = tasks.register("copyUtils", Copy::class) { val copyUtils = tasks.register("copyUtils", Copy::class) {
from(rootProject.file("scripts/util_functions.sh")) from(rootProject.file("scripts/util_functions.sh"))
into("src/main/res/raw") into("src/main/res/raw")

2
app/src/main/java/com/topjohnwu/magisk/core/download/Action.kt
View File

@ -2,7 +2,7 @@ package com.topjohnwu.magisk.core.download
import android.net.Uri import android.net.Uri
import android.os.Parcelable import android.os.Parcelable
import kotlinx.android.parcel.Parcelize import kotlinx.parcelize.Parcelize
sealed class Action : Parcelable { sealed class Action : Parcelable {

2
app/src/main/java/com/topjohnwu/magisk/core/download/Subject.kt
View File

@ -13,7 +13,7 @@ import com.topjohnwu.magisk.core.utils.MediaStoreUtils
import com.topjohnwu.magisk.ktx.cachedFile import com.topjohnwu.magisk.ktx.cachedFile
import com.topjohnwu.magisk.ktx.get import com.topjohnwu.magisk.ktx.get
import kotlinx.android.parcel.IgnoredOnParcel 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() private fun cachedFile(name: String) = get<Context>().cachedFile(name).apply { delete() }.toUri()

2
app/src/main/java/com/topjohnwu/magisk/core/model/UpdateInfo.kt
View File

@ -2,7 +2,7 @@ package com.topjohnwu.magisk.core.model
import android.os.Parcelable import android.os.Parcelable
import com.squareup.moshi.JsonClass import com.squareup.moshi.JsonClass
import kotlinx.android.parcel.Parcelize import kotlinx.parcelize.Parcelize
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
data class UpdateInfo( data class UpdateInfo(

2
app/src/main/java/com/topjohnwu/magisk/core/model/module/OnlineModule.kt
View File

@ -7,7 +7,7 @@ import com.topjohnwu.magisk.core.model.ModuleJson
import com.topjohnwu.magisk.data.repository.NetworkService import com.topjohnwu.magisk.data.repository.NetworkService
import com.topjohnwu.magisk.ktx.get import com.topjohnwu.magisk.ktx.get
import com.topjohnwu.magisk.ktx.legalFilename import com.topjohnwu.magisk.ktx.legalFilename
import kotlinx.android.parcel.Parcelize import kotlinx.parcelize.Parcelize
import java.text.DateFormat import java.text.DateFormat
import java.util.* import java.util.*

2
build.gradle.kts
View File

@ -19,7 +19,7 @@ buildscript {
dependencies { dependencies {
classpath("com.android.tools.build:gradle:4.1.1") 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}") classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}")
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong