WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade gradle (#2487)

This commit is contained in:
LoveSy 2023-04-13 00:46:09 +08:00 committed by GitHub
parent 81edbdc117
commit f887d0116c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle.kts
View File

@ -19,7 +19,6 @@
import java.time.Instant import java.time.Instant
@Suppress("DSL_SCOPE_VIOLATION")
plugins { plugins {
alias(libs.plugins.agp.app) alias(libs.plugins.agp.app)
alias(libs.plugins.nav.safeargs) alias(libs.plugins.nav.safeargs)

1
build.gradle.kts
View File

@ -21,7 +21,6 @@ import com.android.build.api.dsl.ApplicationDefaultConfig
import com.android.build.api.dsl.CommonExtension import com.android.build.api.dsl.CommonExtension
import com.android.build.gradle.api.AndroidBasePlugin import com.android.build.gradle.api.AndroidBasePlugin
@Suppress("DSL_SCOPE_VIOLATION")
plugins { plugins {
alias(libs.plugins.lsplugin.cmaker) alias(libs.plugins.lsplugin.cmaker)
alias(libs.plugins.lsplugin.jgit) alias(libs.plugins.lsplugin.jgit)

1
core/build.gradle.kts
View File

@ -20,7 +20,6 @@
val verName: String by rootProject.extra val verName: String by rootProject.extra
val verCode: Int by rootProject.extra val verCode: Int by rootProject.extra
@Suppress("DSL_SCOPE_VIOLATION")
plugins { plugins {
alias(libs.plugins.agp.lib) alias(libs.plugins.agp.lib)
} }

5
daemon/build.gradle.kts
View File

@ -22,7 +22,6 @@ import com.android.ide.common.signing.KeystoreHelper
import java.io.PrintStream import java.io.PrintStream
import java.util.* import java.util.*
@Suppress("DSL_SCOPE_VIOLATION")
plugins { plugins {
alias(libs.plugins.agp.app) alias(libs.plugins.agp.app)
alias(libs.plugins.lsplugin.resopt) alias(libs.plugins.lsplugin.resopt)
@ -86,8 +85,8 @@ android {
} }
android.applicationVariants.all { android.applicationVariants.all {
val variantCapped = name.capitalize(Locale.ROOT) val variantCapped = name.replaceFirstChar { it.uppercase() }
val variantLowered = name.toLowerCase(Locale.ROOT) val variantLowered = name.lowercase()
val outSrcDir = file("$buildDir/generated/source/signInfo/${variantLowered}") val outSrcDir = file("$buildDir/generated/source/signInfo/${variantLowered}")
val signInfoTask = tasks.register("generate${variantCapped}SignInfo") { val signInfoTask = tasks.register("generate${variantCapped}SignInfo") {

1
dex2oat/build.gradle.kts
View File

@ -17,7 +17,6 @@
* Copyright (C) 2022 LSPosed Contributors * Copyright (C) 2022 LSPosed Contributors
*/ */
@Suppress("DSL_SCOPE_VIOLATION")
plugins { plugins {
alias(libs.plugins.agp.lib) alias(libs.plugins.agp.lib)
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

17
magisk-loader/build.gradle.kts
View File

@ -33,7 +33,6 @@ import org.objectweb.asm.ClassVisitor
import org.objectweb.asm.MethodVisitor import org.objectweb.asm.MethodVisitor
import org.objectweb.asm.Opcodes import org.objectweb.asm.Opcodes
@Suppress("DSL_SCOPE_VIOLATION")
plugins { plugins {
alias(libs.plugins.agp.app) alias(libs.plugins.agp.app)
alias(libs.plugins.lsplugin.resopt) alias(libs.plugins.lsplugin.resopt)
@ -92,8 +91,8 @@ android {
all { all {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
arguments += "-DMODULE_NAME=${name.toLowerCase()}_$moduleBaseId" arguments += "-DMODULE_NAME=${name.lowercase()}_$moduleBaseId"
arguments += "-DAPI=${name.toLowerCase()}" arguments += "-DAPI=${name.lowercase()}"
} }
} }
} }
@ -137,12 +136,12 @@ val zipAll = task("zipAll") {
} }
fun afterEval() = android.applicationVariants.forEach { variant -> fun afterEval() = android.applicationVariants.forEach { variant ->
val variantCapped = variant.name.capitalize(Locale.ROOT) val variantCapped = variant.name.replaceFirstChar { it.uppercase() }
val variantLowered = variant.name.toLowerCase(Locale.ROOT) val variantLowered = variant.name.lowercase()
val buildTypeCapped = variant.buildType.name.capitalize(Locale.ROOT) val buildTypeCapped = variant.buildType.name.replaceFirstChar { it.uppercase() }
val buildTypeLowered = variant.buildType.name.toLowerCase(Locale.ROOT) val buildTypeLowered = variant.buildType.name.lowercase()
val flavorCapped = variant.flavorName!!.capitalize(Locale.ROOT) val flavorCapped = variant.flavorName!!.replaceFirstChar { it.uppercase() }
val flavorLowered = variant.flavorName!!.toLowerCase(Locale.ROOT) val flavorLowered = variant.flavorName!!.lowercase()
val magiskDir = "$buildDir/magisk/$variantLowered" val magiskDir = "$buildDir/magisk/$variantLowered"

1
services/daemon-service/build.gradle.kts
View File

@ -17,7 +17,6 @@
* Copyright (C) 2021 LSPosed Contributors * Copyright (C) 2021 LSPosed Contributors
*/ */
@Suppress("DSL_SCOPE_VIOLATION")
plugins { plugins {
alias(libs.plugins.agp.lib) alias(libs.plugins.agp.lib)
} }

1
services/manager-service/build.gradle.kts
View File

@ -17,7 +17,6 @@
* Copyright (C) 2021 LSPosed Contributors * Copyright (C) 2021 LSPosed Contributors
*/ */
@Suppress("DSL_SCOPE_VIOLATION")
plugins { plugins {
alias(libs.plugins.agp.lib) alias(libs.plugins.agp.lib)
} }