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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle.kts
View file

@ -20,8 +20,8 @@ crowdin {
fun 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
}
}

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)) {

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

@ -7,6 +7,6 @@ import org.gradle.api.tasks.wrapper.Wrapper
import org.gradle.kotlin.dsl.withType
tasks.withType<Wrapper> {
gradleVersion = "7.3.3"
distributionSha256Sum = "b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302"
gradleVersion = "7.4-rc-2"
distributionSha256Sum = "21491c9f0656e1529ccb39cbd587d01c33ba00d25f994b10240748ed0d45894a"
}

7
build-logic/automation-plugins/src/main/kotlin/crowdin/CrowdinPlugin.kt
View file

@ -28,7 +28,7 @@ class CrowdinDownloadPlugin : Plugin<Project> {
override fun apply(project: Project) {
with(project) {
val buildDirectory = layout.buildDirectory.asFile.forUseAtConfigurationTime().get()
val buildDirectory = layout.buildDirectory.asFile
val extension = extensions.create<CrowdinExtension>("crowdin")
afterEvaluate {
val projectName = extension.projectName
@ -38,9 +38,8 @@ class CrowdinDownloadPlugin : Plugin<Project> {
val buildOnApi =
tasks.register("buildOnApi") {
doLast {
val login = providers.environmentVariable("CROWDIN_LOGIN").forUseAtConfigurationTime()
val key =
providers.environmentVariable("CROWDIN_PROJECT_KEY").forUseAtConfigurationTime()
val login = providers.environmentVariable("CROWDIN_LOGIN")
val key = providers.environmentVariable("CROWDIN_PROJECT_KEY")
if (!login.isPresent) {
throw GradleException("CROWDIN_LOGIN environment variable must be set")
}

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

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

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionSha256Sum=21491c9f0656e1529ccb39cbd587d01c33ba00d25f994b10240748ed0d45894a
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-rc-2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists