diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index 32f89b5..af7410d 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -63,7 +63,7 @@ androidComponents { onVariants(selector().all()) { it.outputs.forEach { output -> val currentType = it.buildType - val currentSuffix = property.github.ci.commit.id?.let { suffix -> if (suffix.isNotBlank()) "-$suffix" else "" } ?: "" + val currentSuffix = property.github.ci.commit.id.let { suffix -> if (suffix.isNotBlank()) "-$suffix" else "" } val currentVersion = "${output.versionName.get()}$currentSuffix(${output.versionCode.get()})" if (output is com.android.build.api.variant.impl.VariantOutputImpl) output.outputFileName.set("${property.project.name}-demo-v$currentVersion-$currentType.apk") diff --git a/gradle.properties b/gradle.properties index a6f1e1c..08ac97b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,9 +19,9 @@ project.module-app.signing.keyPassword="123456" project.module-app.signing.storePassword="123456" project.module-app.signing.storeFilePath=.secret/universal.p12 project.demo-app.packageName=com.fankes.apperrorsdemo -project.demo-app.versionName=${project.module-app.versionName} +project.demo-app.versionName="${project.module-app.versionName}" project.demo-app.versionCode=${project.module-app.versionCode} -project.demo-app.signing.keyAlias=${project.module-app.signing.keyAlias} -project.demo-app.signing.keyPassword=${project.module-app.signing.keyPassword} -project.demo-app.signing.storePassword=${project.module-app.signing.storePassword} -project.demo-app.signing.storeFilePath=${project.module-app.signing.storeFilePath} \ No newline at end of file +project.demo-app.signing.keyAlias="${project.module-app.signing.keyAlias}" +project.demo-app.signing.keyPassword="${project.module-app.signing.keyPassword}" +project.demo-app.signing.storePassword="${project.module-app.signing.storePassword}" +project.demo-app.signing.storeFilePath="${project.module-app.signing.storeFilePath}" \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index e515a46..cb994e6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,8 +6,8 @@ pluginManagement { } } plugins { - id("com.highcapable.sweetdependency") version "1.0.2" - id("com.highcapable.sweetproperty") version "1.0.3" + id("com.highcapable.sweetdependency") version "1.0.3" + id("com.highcapable.sweetproperty") version "1.0.4" } sweetProperty { global {