diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index af7410d..32f89b5 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 768d6ba..a6f1e1c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,8 +12,8 @@ project.android.targetSdk=34 project.android.ndk.version="24.0.8215888" project.android.cmake.version="3.22.1" project.module-app.packageName=com.fankes.apperrorstracking -project.module-app.versionName="1.25" -project.module-app.versionCode=5 +project.module-app.versionName="1.3" +project.module-app.versionCode=6 project.module-app.signing.keyAlias=public project.module-app.signing.keyPassword="123456" project.module-app.signing.storePassword="123456" diff --git a/module-app/build.gradle.kts b/module-app/build.gradle.kts index f09350f..5542c28 100644 --- a/module-app/build.gradle.kts +++ b/module-app/build.gradle.kts @@ -59,7 +59,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}-module-v$currentVersion-$currentType.apk")