diff options
4 files changed, 14 insertions, 7 deletions
diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt index 813155b4..a65b9794 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt @@ -17,13 +17,17 @@ class RenameArtifactsPlugin : Plugin<Project> { project.pluginManager.withPlugin("com.android.application") { project.extensions.configure<ApplicationAndroidComponentsExtension> { 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) apkFolder.set(variant.artifacts.get(SingleArtifact.APK)) builtArtifactsLoader.set(variant.artifacts.getBuiltArtifactsLoader()) 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 = variant.outputs.single { it.outputType == VariantOutputConfiguration.OutputType.SINGLE diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt index a5de3d49..381cb40e 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt @@ -91,13 +91,13 @@ abstract class PSLUpdateTask : DefaultTask() { sink.writeInt(data.totalRuleBytes) for (domain in data.sortedRules) { - sink.write(domain).writeByte('\n'.toInt()) + sink.write(domain).writeByte('\n'.code) } sink.writeInt(data.totalExceptionRuleBytes) for (domain in data.sortedExceptionRules) { - sink.write(domain).writeByte('\n'.toInt()) + sink.write(domain).writeByte('\n'.code) } } } diff --git a/gradle.properties b/gradle.properties index c592e29b..0589b47e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -46,6 +46,9 @@ android.useMinimalKeepRules=true # Enable resource optimizations for release build android.enableResourceOptimizations=true +# Compatibility with Gradle 8.0 +android.experimental.legacyTransform.forceNonIncremental=true + # Opt into new publishing APIs android.disableAutomaticComponentCreation=true @@ -57,7 +60,7 @@ android.defaults.buildfeatures.resvalues=false android.defaults.buildfeatures.shaders=false # 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 GROUP=com.github.android-password-store diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index adb6acbd..15248c81 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionSha256Sum=d5bb29e784426547e4f455fbc0e6512d7a6a67d7d890cf24d601309287128b79 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists |