From 1f219877b4b8b6d75be3f100e7460fa7007b9537 Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Mon, 30 Dec 2019 18:34:53 +0100
Subject: [PATCH] gradle: streamline build metadata values

---
 build.gradle         | 24 ++++++++----------------
 template/version.xml |  7 -------
 2 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 template/version.xml

diff --git a/build.gradle b/build.gradle
index 16dc2b7..15b47e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,30 +41,24 @@ ext {
 	build_version = "APRSdroid ${build_revision} ${build_date}"
 }
 
-task buildVersion (type: Copy) {
-	from("template") {
-		include "version.xml"
-		expand( build_date: build_date,
-			build_revision: build_revision,
-			build_version: build_version)
-	}
-	into("res/values")
-	outputs.upToDateWhen {
-		false
-	}
-}
-
 tasks.withType(ScalaCompile) {
 	// Suppress deprecation warnings
 	scalaCompileOptions.deprecation = false
 }
 
+def versionCodeDate() {
+	return new Date().format("yyyyMMdd00").toInteger()
+}
 android {
 	compileSdkVersion 28
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 28
 		versionName "$build_revision"
+		versionCode versionCodeDate()
+		resValue "string", "build_revision", "$build_revision"
+		resValue "string", "build_date", "$build_date"
+		resValue "string", "build_version", "$build_version"
 	}
 	useLibrary 'org.apache.http.legacy'
 	compileOptions {
@@ -113,8 +107,6 @@ android {
 dependencies {
 	implementation "org.scala-lang:scala-library:2.11.12"
 	//compile 'com.google.android.gms:play-services-maps:6.5.87'
-	api fileTree(include: ['*.jar'], dir: 'libs')
+	implementation fileTree(include: ['*.jar'], dir: 'libs')
 }
 
-preBuild.dependsOn buildVersion
-
diff --git a/template/version.xml b/template/version.xml
deleted file mode 100644
index 5574e2f..0000000
--- a/template/version.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- APRSdroid version.xml AUTOGENERATED from template/version.xml -->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-<string name="build_revision">$build_revision</string>
-<string name="build_date">$build_date</string>
-<string name="build_version">$build_version</string>
-</resources>