diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1afa3f97e..6ccf67504 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -26,11 +26,11 @@ android { compileSdk = project.libs.versions.app.build.compileSDKVersion.get().toInt() defaultConfig { - applicationId = libs.versions.app.version.appId.get() + applicationId = project.property("APP_ID").toString() minSdk = project.libs.versions.app.build.minimumSDK.get().toInt() targetSdk = project.libs.versions.app.build.targetSDK.get().toInt() - versionName = project.libs.versions.app.version.versionName.get() - versionCode = project.libs.versions.app.version.versionCode.get().toInt() + versionName = project.property("VERSION_NAME").toString() + versionCode = project.property("VERSION_CODE").toString().toInt() setProperty("archivesBaseName", "phone-$versionCode") } @@ -102,7 +102,7 @@ android { kotlinOptions.jvmTarget = project.libs.versions.app.build.kotlinJVMTarget.get() } - namespace = libs.versions.app.version.appId.get() + namespace = project.property("APP_ID").toString() lint { checkReleaseBuilds = false diff --git a/gradle.properties b/gradle.properties index 0dd295722..8c35eefb2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,3 +20,8 @@ android.enableJetifier=true android.nonTransitiveRClass=false # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official + +# Versioning +VERSION_NAME=1.4.0 +VERSION_CODE=7 +APP_ID=org.fossify.phone diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 792691637..abb67cb44 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,10 +21,6 @@ app-build-targetSDK = "34" app-build-minimumSDK = "26" app-build-javaVersion = "VERSION_17" app-build-kotlinJVMTarget = "17" -#versioning -app-version-appId = "org.fossify.phone" -app-version-versionCode = "7" -app-version-versionName = "1.4.0" [libraries] #Fossify fossify-commons = { module = "org.fossify:commons", version.ref = "commons" }