Fully migrate to AGP 9 (#6277)
* chore(deps): update agp to v9 * fix(deps): update dagger to v2.59 * Remove default flags * Disable android.newDsl * Update androidx-baselineprofile version to 1.5.0-alpha06 * Migrate applicationVariants blocks --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Goooler <wangzongler@gmail.com>
This commit is contained in:
1 parent
f487a7ec76
commit
b6fc8dc636
3 files changed
+10
-21
No files matched your search
+9
-17
@@ -161,13 +161,6 @@ android {
|
|||||||
buildConfigField "int", "QUICKSTEP_MAX_SDK", quickstepMaxSdk
|
buildConfigField "int", "QUICKSTEP_MAX_SDK", quickstepMaxSdk
|
||||||
}
|
}
|
||||||
|
|
||||||
applicationVariants.configureEach { variant ->
|
|
||||||
variant.outputs.configureEach {
|
|
||||||
def channel = variant.productFlavors.last().name
|
|
||||||
outputFileName = "Lawnchair.${variant.versionName}.$channel.${variant.buildType.name}.apk"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
androidResources {
|
androidResources {
|
||||||
generateLocaleConfig true
|
generateLocaleConfig true
|
||||||
}
|
}
|
||||||
@@ -220,16 +213,6 @@ android {
|
|||||||
buildTypes {
|
buildTypes {
|
||||||
all {
|
all {
|
||||||
signingConfig releaseSigning
|
signingConfig releaseSigning
|
||||||
|
|
||||||
applicationVariants.configureEach { variant ->
|
|
||||||
variant.outputs.configureEach {
|
|
||||||
def channel = variant.productFlavors.last().name
|
|
||||||
// Override signingConfig to debug if the "nightly" flavor is selected
|
|
||||||
if (channel.any { it == "nightly" }) {
|
|
||||||
signingConfig = signingConfigs.debug
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pseudoLocalesEnabled true
|
pseudoLocalesEnabled true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -352,6 +335,15 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
androidComponents {
|
||||||
|
onVariants(selector().all()) { variant ->
|
||||||
|
def channel = variant.productFlavors.last().second
|
||||||
|
variant.outputs.forEach { output ->
|
||||||
|
output.outputFileName.set("Lawnchair.${output.versionName.get()}.$channel.${variant.buildType}.apk")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
baselineProfile {
|
baselineProfile {
|
||||||
saveInSrc = true
|
saveInSrc = true
|
||||||
mergeIntoMain = true
|
mergeIntoMain = true
|
||||||
|
|||||||
@@ -6,6 +6,3 @@ org.gradle.parallel=true
|
|||||||
org.gradle.configuration-cache=true
|
org.gradle.configuration-cache=true
|
||||||
org.gradle.configuration-cache.parallel=true
|
org.gradle.configuration-cache.parallel=true
|
||||||
org.gradle.tooling.parallel=true
|
org.gradle.tooling.parallel=true
|
||||||
|
|
||||||
# TODO: https://github.com/LawnchairLauncher/lawnchair/pull/6277
|
|
||||||
android.newDsl=false
|
|
||||||
@@ -26,7 +26,7 @@ testRunner = "1.7.0"
|
|||||||
android-application = { id = "com.android.application", version.ref = "agp" }
|
android-application = { id = "com.android.application", version.ref = "agp" }
|
||||||
android-library = { id = "com.android.library", version.ref = "agp" }
|
android-library = { id = "com.android.library", version.ref = "agp" }
|
||||||
android-test = { id = "com.android.test", version.ref = "agp" }
|
android-test = { id = "com.android.test", version.ref = "agp" }
|
||||||
androidx-baselineprofile = "androidx.baselineprofile:1.4.1"
|
androidx-baselineprofile = "androidx.baselineprofile:1.5.0-alpha06"
|
||||||
|
|
||||||
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
|
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
|
||||||
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
|
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
|
||||||
|
|||||||
Reference in new issue
Block a user