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

Port build to Gradle 7.4-rc-2 (#1707)

Browse source
This commit is contained in:
Harsh Shandilya 2022-02-04 19:29:36 +05:30 • committed by GitHub
parent ce75d0e49b
commit 2b293e5805
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-application.gradle.kts
View file

@ -14,15 +14,14 @@ plugins {
fun Project.isSnapshot(): Boolean {
with(project.providers) {
val workflow = environmentVariable("GITHUB_WORKFLOW").forUseAtConfigurationTime()
val snapshot = environmentVariable("SNAPSHOT").forUseAtConfigurationTime()
val workflow = environmentVariable("GITHUB_WORKFLOW")
val snapshot = environmentVariable("SNAPSHOT")
return workflow.isPresent || snapshot.isPresent
}
}
android {
val minifySwitch =
project.providers.environmentVariable("DISABLE_MINIFY").forUseAtConfigurationTime()
val minifySwitch = project.providers.environmentVariable("DISABLE_MINIFY")
adbOptions.installOptions("--user 0")

2
build-logic/android-plugins/src/main/kotlin/flavors/SlimTests.kt
View file

@ -20,7 +20,7 @@ import org.gradle.language.nativeplatform.internal.BuildType
* variants in Android App and Library projects, and all tests in JVM projects.
*/
internal fun Project.configureSlimTests() {
if (providers.gradleProperty(SLIM_TESTS_PROPERTY).forUseAtConfigurationTime().isPresent) {
if (providers.gradleProperty(SLIM_TESTS_PROPERTY).isPresent) {
// disable unit test tasks on the release build type for Android Library projects
extensions.findByType<LibraryAndroidComponentsExtension>()?.run {
beforeVariants(selector().withBuildType(BuildType.RELEASE.name)) {

2
build-logic/android-plugins/src/main/kotlin/signing/AppSigning.kt
View file

@ -19,7 +19,7 @@ internal fun Project.configureBuildSigning() {
val keystoreConfigFile = rootProject.layout.projectDirectory.file(KEYSTORE_CONFIG_PATH)
if (keystoreConfigFile.asFile.exists()) {
extensions.configure<BaseAppModuleExtension> {
val contents = providers.fileContents(keystoreConfigFile).asText.forUseAtConfigurationTime()
val contents = providers.fileContents(keystoreConfigFile).asText
val keystoreProperties = Properties()
keystoreProperties.load(contents.get().byteInputStream())
signingConfigs {

2
build-logic/android-plugins/src/main/kotlin/versioning/VersioningPlugin.kt
View file

@ -53,7 +53,7 @@ class VersioningPlugin : Plugin<Project> {
require(propFile.asFile.exists()) {
"A 'version.properties' file must exist in the project subdirectory to use this plugin"
}
val contents = providers.fileContents(propFile).asText.forUseAtConfigurationTime()
val contents = providers.fileContents(propFile).asText
val versionProps = Properties().also { it.load(contents.get().byteInputStream()) }
val versionName =
requireNotNull(versionProps.getProperty(VERSIONING_PROP_VERSION_NAME)) {