kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat(gradle): bump to 8.0 RC1

Browse source
This commit is contained in:
Harsh Shandilya 2022-12-29 22:00:40 +05:30
parent fe1518dfe3
commit fbb8eedb9d
No known key found for this signature in database
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build-logic/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt
View file

@ -17,13 +17,17 @@ class RenameArtifactsPlugin : Plugin<Project> {
project.pluginManager.withPlugin("com.android.application") { project.pluginManager.withPlugin("com.android.application") {
project.extensions.configure<ApplicationAndroidComponentsExtension> { project.extensions.configure<ApplicationAndroidComponentsExtension> {
onVariants { variant -> onVariants { variant ->
project.tasks.register<CollectApksTask>("collect${variant.name.capitalize()}Apks") { project.tasks.register<CollectApksTask>(
"collect${variant.name.replaceFirstChar { it.uppercase() }}Apks"
) {
variantName.set(variant.name) variantName.set(variant.name)
apkFolder.set(variant.artifacts.get(SingleArtifact.APK)) apkFolder.set(variant.artifacts.get(SingleArtifact.APK))
builtArtifactsLoader.set(variant.artifacts.getBuiltArtifactsLoader()) builtArtifactsLoader.set(variant.artifacts.getBuiltArtifactsLoader())
outputDirectory.set(project.layout.projectDirectory.dir("outputs")) outputDirectory.set(project.layout.projectDirectory.dir("outputs"))
} }
project.tasks.register<CollectBundleTask>("collect${variant.name.capitalize()}Bundle") { project.tasks.register<CollectBundleTask>(
"collect${variant.name.replaceFirstChar { it.uppercase() }}Bundle"
) {
val mainOutput = val mainOutput =
variant.outputs.single { variant.outputs.single {
it.outputType == VariantOutputConfiguration.OutputType.SINGLE it.outputType == VariantOutputConfiguration.OutputType.SINGLE

4
build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt
View file

@ -91,13 +91,13 @@ abstract class PSLUpdateTask : DefaultTask() {
sink.writeInt(data.totalRuleBytes) sink.writeInt(data.totalRuleBytes)
for (domain in data.sortedRules) { for (domain in data.sortedRules) {
sink.write(domain).writeByte('\n'.toInt()) sink.write(domain).writeByte('\n'.code)
} }
sink.writeInt(data.totalExceptionRuleBytes) sink.writeInt(data.totalExceptionRuleBytes)
for (domain in data.sortedExceptionRules) { for (domain in data.sortedExceptionRules) {
sink.write(domain).writeByte('\n'.toInt()) sink.write(domain).writeByte('\n'.code)
} }
} }
} }

5
gradle.properties
View file

@ -46,6 +46,9 @@ android.useMinimalKeepRules=true
# Enable resource optimizations for release build # Enable resource optimizations for release build
android.enableResourceOptimizations=true android.enableResourceOptimizations=true
# Compatibility with Gradle 8.0
android.experimental.legacyTransform.forceNonIncremental=true
# Opt into new publishing APIs # Opt into new publishing APIs
android.disableAutomaticComponentCreation=true android.disableAutomaticComponentCreation=true
@ -57,7 +60,7 @@ android.defaults.buildfeatures.resvalues=false
android.defaults.buildfeatures.shaders=false android.defaults.buildfeatures.shaders=false
# Disable warnings about unsupported features, we know what we're doing # Disable warnings about unsupported features, we know what we're doing
android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.suppressUnsupportedOptionWarnings,android.sdk.channel android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.experimental.legacyTransform.forceNonIncremental,android.suppressUnsupportedOptionWarnings,android.sdk.channel
# Maven publishing # Maven publishing
GROUP=com.github.android-password-store GROUP=com.github.android-password-store

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b distributionSha256Sum=d5bb29e784426547e4f455fbc0e6512d7a6a67d7d890cf24d601309287128b79
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists