From f3d068414b69274646f0225490ecfa72ef0a837f Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 11 Jan 2021 16:43:42 +0000
Subject: [PATCH] Move version constants back into modules so F-Droid can find
 them.

This reverts commit de9c6d44, except that the version numbers have
increased in the meantime.
---
 bramble-android/build.gradle | 12 ++++++------
 briar-android/build.gradle   | 12 ++++++------
 build.gradle                 |  9 ---------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle
index 88f77de80..34a539d8b 100644
--- a/bramble-android/build.gradle
+++ b/bramble-android/build.gradle
@@ -5,14 +5,14 @@ apply plugin: 'witness'
 apply from: 'witness.gradle'
 
 android {
-	compileSdkVersion rootProject.ext.compileSdkVersion
-	buildToolsVersion rootProject.ext.buildToolsVersion
+	compileSdkVersion 30
+	buildToolsVersion '30.0.2'
 
 	defaultConfig {
-		minSdkVersion rootProject.ext.minSdkVersion
-		targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode rootProject.ext.versionCode
-		versionName rootProject.ext.versionName
+		minSdkVersion 16
+		targetSdkVersion 29
+		versionCode 10213
+		versionName "1.2.13"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index 0f7507e73..ffc8892ad 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -16,14 +16,14 @@ def getStdout = { command, defaultValue ->
 }
 
 android {
-	compileSdkVersion rootProject.ext.compileSdkVersion
-	buildToolsVersion rootProject.ext.buildToolsVersion
+	compileSdkVersion 30
+	buildToolsVersion '30.0.2'
 
 	defaultConfig {
-		minSdkVersion rootProject.ext.minSdkVersion
-		targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode rootProject.ext.versionCode
-		versionName rootProject.ext.versionName
+		minSdkVersion 16
+		targetSdkVersion 29
+		versionCode 10213
+		versionName "1.2.13"
 		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 323e0bac1..75ffd3401 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,12 +33,3 @@ buildscript {
 		classpath files('libs/gradle-witness.jar')
 	}
 }
-
-project.ext {
-	buildToolsVersion = '30.0.2'
-	compileSdkVersion = 30
-	minSdkVersion = 16
-	targetSdkVersion = 29
-	versionCode = 10213
-	versionName = '1.2.13'
-}