Northern_Lights/NekoBoxForAndroid
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/NekoBoxForAndroid.git synced 2025-12-23 01:36:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #387 from MatsuriDayo/dev

Browse Source 
build: replace Deprecated Gradle API
This commit is contained in:
purofle 2023-10-29 17:34:44 +08:00 committed by GitHub
commit afbab6531c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@ -1,3 +1,5 @@
@file:Suppress("UnstableApiUsage")
plugins {
id("com.android.application")
id("kotlin-android")

32
buildSrc/src/main/kotlin/Helpers.kt
View File

@ -1,4 +1,8 @@
import com.android.build.api.dsl.ApplicationExtension
import com.android.build.api.dsl.LibraryExtension
import com.android.build.api.dsl.Lint
import com.android.build.gradle.AbstractAppExtension
import com.android.build.gradle.AppExtension
import com.android.build.gradle.BaseExtension
import com.android.build.gradle.internal.api.BaseVariantOutputImpl
import org.gradle.api.JavaVersion
@ -16,7 +20,7 @@ fun sha256Hex(bytes: ByteArray): String {
return digest.fold("") { str, it -> str + "%02x".format(it) }
}
private val Project.android get() = extensions.getByName<BaseExtension>("android")
private val Project.android get() = extensions.getByName<ApplicationExtension>("android")
private lateinit var metadata: Properties
private lateinit var localProperties: Properties
@ -90,8 +94,8 @@ fun Project.requireTargetAbi(): String {
fun Project.setupCommon() {
android.apply {
buildToolsVersion("30.0.3")
compileSdkVersion(33)
buildToolsVersion = "30.0.3"
compileSdk = 33
defaultConfig {
minSdk = 21
targetSdk = 33
@ -108,16 +112,16 @@ fun Project.setupCommon() {
(android as ExtensionAware).extensions.getByName<KotlinJvmOptions>("kotlinOptions").apply {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
lintOptions {
isShowAll = true
isCheckAllWarnings = true
isCheckReleaseBuilds = false
isWarningsAsErrors = true
lint {
showAll = true
checkAllWarnings = true
checkReleaseBuilds = true
warningsAsErrors = true
textOutput = project.file("build/lint.txt")
htmlOutput = project.file("build/lint.html")
}
packagingOptions {
excludes.addAll(
resources.excludes.addAll(
listOf(
"**/*.kotlin_*",
"/META-INF/*.version",
@ -175,10 +179,10 @@ fun Project.setupAppCommon() {
if (keystorePwd != null) {
signingConfigs {
create("release") {
storeFile(rootProject.file("release.keystore"))
storePassword(keystorePwd)
keyAlias(alias)
keyPassword(pwd)
storeFile = rootProject.file("release.keystore")
storePassword = keystorePwd
keyAlias = alias
keyPassword = pwd
}
}
} else if (requireFlavor().contains("(Oss|Expert|Play)Release".toRegex())) {
@ -232,7 +236,7 @@ fun Project.setupApp() {
}
}
flavorDimensions("vendor")
flavorDimensions += "vendor"
productFlavors {
create("oss")
create("fdroid")