From de9c6d4447fb7f8b3507091de6829954469b73f5 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 4 Sep 2020 13:54:29 +0100
Subject: [PATCH] Extract version constants into top-level build file.

---
 bramble-android/build.gradle | 12 ++++++------
 briar-android/build.gradle   | 12 ++++++------
 build.gradle                 |  9 +++++++++
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle
index a298a0ec6..d2cce2d99 100644
--- a/bramble-android/build.gradle
+++ b/bramble-android/build.gradle
@@ -5,14 +5,14 @@ apply plugin: 'witness'
 apply from: 'witness.gradle'
 
 android {
-	compileSdkVersion 30
-	buildToolsVersion '30.0.2'
+	compileSdkVersion rootProject.ext.compileSdkVersion
+	buildToolsVersion rootProject.ext.buildToolsVersion
 
 	defaultConfig {
-		minSdkVersion 16
-		targetSdkVersion 29
-		versionCode 10210
-		versionName "1.2.10"
+		minSdkVersion rootProject.ext.minSdkVersion
+		targetSdkVersion rootProject.ext.targetSdkVersion
+		versionCode rootProject.ext.versionCode
+		versionName rootProject.ext.versionName
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index ad7c335a6..8e07ab8bb 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -16,14 +16,14 @@ def getStdout = { command, defaultValue ->
 }
 
 android {
-	compileSdkVersion 30
-	buildToolsVersion '30.0.2'
+	compileSdkVersion rootProject.ext.compileSdkVersion
+	buildToolsVersion rootProject.ext.buildToolsVersion
 
 	defaultConfig {
-		minSdkVersion 16
-		targetSdkVersion 29
-		versionCode 10210
-		versionName "1.2.10"
+		minSdkVersion rootProject.ext.minSdkVersion
+		targetSdkVersion rootProject.ext.targetSdkVersion
+		versionCode rootProject.ext.versionCode
+		versionName rootProject.ext.versionName
 		applicationId "org.briarproject.briar.android"
 		buildConfigField "String", "GitHash",
 				"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""
diff --git a/build.gradle b/build.gradle
index 157f13f45..9f48c87fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,3 +33,12 @@ buildscript {
 		classpath files('libs/gradle-witness.jar')
 	}
 }
+
+project.ext {
+	buildToolsVersion = '30.0.2'
+	compileSdkVersion = 30
+	minSdkVersion = 16
+	targetSdkVersion = 29
+	versionCode = 10210
+	versionName = '1.2.10'
+}
\ No newline at end of file