Revert "mail: add incrementing versionCode and versionName" (200c57ed) · Commits · e / os / Mail

.gitignore

+0 −2

Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@ app-thunderbird/foss/
		*.jks
		*.keystore

		*/version.properties

		# Exclude platform.jks from being ignored
		!keystore/platform.jks

app-thunderbird/build.gradle.kts

+2 −67

Original line number	Diff line number	Diff line
		import java.io.FileInputStream
		import java.util.Properties

		plugins {
		@@ -13,11 +12,6 @@ if (testCoverageEnabled) {
		apply(plugin = "jacoco")
		}

		val appMajor = "9"
		val appMinor = "0"
		val appPatch = "0"
		val appVersionCode = 9

		fun getProperty(property: String): String {
		return System.getenv(property) ?: run {
		val properties = Properties()
		@@ -32,71 +26,12 @@ fun getProperty(property: String): String {
		android {
		namespace = "net.thunderbird.android"

		val versionPropsFile = file("version.properties")
		val versionProps = Properties()

		if (!versionPropsFile.exists()) {
		versionProps["VERSION_CHANGE"] = "0"
		versionProps["VERSION_MAJOR"] = appMajor
		versionProps["VERSION_MINOR"] = appMinor
		versionProps["VERSION_PATCH"] = appPatch
		versionProps["VERSION_CODE"] = appVersionCode.toString()
		versionProps.store(versionPropsFile.writer(), null)
		}

		fun getVersionCode(): Int {
		if (versionPropsFile.canRead()) {
		versionProps.load(FileInputStream(versionPropsFile))
		var versionChange = Integer.valueOf(versionProps["VERSION_CHANGE"].toString()) + 1
		var versionMinor = Integer.valueOf(versionProps["VERSION_MINOR"].toString())
		var versionMajor = Integer.valueOf(versionProps["VERSION_MAJOR"].toString())
		var versionPatch = Integer.valueOf(versionProps["VERSION_PATCH"].toString())
		// Up version on each 100 cycles of builds
		if (versionChange >= 100) {
		versionPatch += 1
		versionChange = 0
		}
		if (versionPatch == 9) {
		versionMinor = versionPatch + 1
		versionPatch = 0
		}
		if (versionMinor == 9) {
		versionMajor += 1
		versionMinor = 0
		}
		val versionCode = Integer.valueOf(versionProps["VERSION_CODE"].toString())

		versionProps["VERSION_CHANGE"] = versionChange.toString()
		versionProps["VERSION_PATCH"] = versionPatch.toString()
		versionProps["VERSION_MINOR"] = versionMinor.toString()
		versionProps["VERSION_MAJOR"] = versionMajor.toString()
		versionProps["VERSION_CODE"] = (Integer.valueOf(versionCode) + 1).toString()
		versionProps.store(versionPropsFile.writer(), null)

		return versionCode
		}
		return appVersionCode
		}

		fun getVersionName(): String {
		if (versionPropsFile.canRead()) {
		versionProps.load(FileInputStream(versionPropsFile))

		val versionMajor = versionProps["VERSION_MAJOR"]
		val versionMinor = versionProps["VERSION_MINOR"]
		val versionPatch = versionProps["VERSION_PATCH"]

		return "${versionMajor}.${versionMinor}.${versionPatch}"
		}
		return "$appMajor.$appMinor.$appPatch"
		}

		defaultConfig {
		applicationId = "foundation.e.mail"
		testApplicationId = "foundation.e.mail.tests"

		versionCode = getVersionCode()
		versionName = getVersionName()
		versionCode = 10
		versionName = "10.0"

		// Keep in sync with the resource string array "supported_languages"
		resourceConfigurations.addAll(