From 89d9e30025349fa22873517d57f90b3f55d321b0 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Mon, 9 Mar 2020 21:54:27 -0600
Subject: build: apply version to both modules

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 build.gradle        | 2 ++
 tunnel/build.gradle | 4 ++--
 ui/build.gradle     | 4 ++--
 version.gradle      | 6 ++++++
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 version.gradle

diff --git a/build.gradle b/build.gradle
index 01ab9af5..b7e0b7cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,3 +48,5 @@ tasks {
         distributionType = Wrapper.DistributionType.ALL
     }
 }
+
+apply from: "version.gradle"
\ No newline at end of file
diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index deff4b15..63585bf7 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        versionCode wireguardVersionCode
+        versionName wireguardVersionName
     }
     externalNativeBuild {
         cmake {
diff --git a/ui/build.gradle b/ui/build.gradle
index 2827afc7..4ad3f4f2 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -22,8 +22,8 @@ android {
         applicationId 'com.wireguard.android'
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 465
-        versionName '0.0.20200309'
+        versionCode wireguardVersionCode
+        versionName wireguardVersionName
         buildConfigField 'int', 'MIN_SDK_VERSION', "$minSdkVersion.apiLevel"
     }
     // If the keystore file exists
diff --git a/version.gradle b/version.gradle
new file mode 100644
index 00000000..3ee263d1
--- /dev/null
+++ b/version.gradle
@@ -0,0 +1,6 @@
+buildscript {
+    ext {
+        wireguardVersionCode = 465
+        wireguardVersionName = '0.0.20200309'
+    }
+}
-- 
cgit v1.2.3-59-g8ed1b