From 7c9c9d587521d7e989c54b8c0217072db7d05e14 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 10 Mar 2020 08:58:29 -0600
Subject: build: abstract out groupName

---
 build.gradle          | 2 ++
 tunnel/build.gradle   | 3 +++
 tunnel/publish.gradle | 5 +----
 ui/build.gradle       | 3 +++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index a66fe6ef..54d5d90f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,6 +29,8 @@ buildscript {
         eddsaVersion = '0.3.0'
         bintrayPluginVersion = '1.8.4'
         mavenPluginVersion = '2.1'
+
+        groupName = 'com.wireguard.android'
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$agpVersion"
diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index 728b6fb2..4d045334 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -1,5 +1,8 @@
 apply plugin: 'com.android.library'
 
+version wireguardVersionName
+group groupName
+
 android {
     buildToolsVersion '29.0.3'
     compileSdkVersion 29
diff --git a/tunnel/publish.gradle b/tunnel/publish.gradle
index 7cb4048c..064a901b 100644
--- a/tunnel/publish.gradle
+++ b/tunnel/publish.gradle
@@ -1,9 +1,6 @@
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version wireguardVersionName
-group 'com.wireguard.android'
-
 install {
     repositories.mavenInstaller {
         pom.project {
@@ -12,7 +9,7 @@ install {
             url 'https://www.wireguard.com/'
 
             packaging 'aar'
-            groupId 'com.wireguard.android'
+            groupId groupName
             artifactId 'tunnel'
             version wireguardVersionName
 
diff --git a/ui/build.gradle b/ui/build.gradle
index 4ad3f4f2..f9df8cdc 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -1,6 +1,9 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
+version wireguardVersionName
+group groupName
+
 // Create a variable called keystorePropertiesFile, and initialize it to your
 // keystore.properties file, in the rootProject folder.
 final def keystorePropertiesFile = rootProject.file("keystore.properties")
-- 
cgit v1.2.3