From 634356dc976d7ea825d7b07df1486f282616fd41 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 27 Feb 2020 13:15:09 +0100
Subject: [PATCH] Signature version 1 only for GitHub/F-Droid build

---
 app/build.gradle         | 37 ++++++++++++++++++++++++++++++++++---
 openpgp-api/build.gradle |  9 +++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 26e9dddca7..9ae70743a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,21 +54,37 @@ android {
     }
 
     signingConfigs {
-        release {
+        play {
             storeFile file(keystoreProperties['storeFile'])
             storePassword keystoreProperties['storePassword']
             keyAlias keystoreProperties['keyAlias']
             keyPassword keystoreProperties['keyPassword']
         }
+        github {
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            v1SigningEnabled true
+            v2SigningEnabled false
+            v2SigningEnabled false
+        }
     }
 
     buildTypes {
-        release {
+        play {
             debuggable = false
             minifyEnabled = true
             useProguard = true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
+            signingConfig signingConfigs.play
+        }
+        github {
+            debuggable = false
+            minifyEnabled = true
+            useProguard = true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.github
         }
         debug {
             applicationIdSuffix '.debug'
@@ -125,6 +141,21 @@ android {
         }
     }
 
+    variantFilter { variant ->
+        def flavors = variant.flavors*.name
+        // Builds: play, github, debug
+        // Flavors: full, play_beta, play_release
+        if (variant.buildType.name == "play" && flavors.contains("full")) {
+            setIgnore(true)
+        }
+        if (variant.buildType.name == "github" && flavors.contains("play_beta")) {
+            setIgnore(true)
+        }
+        if (flavors.contains("play_release")) {
+            setIgnore(true)
+        }
+    }
+
     bugsnag {
         // https://docs.bugsnag.com/build-integrations/gradle/
         apiKey "9d2d57476a0614974449a3ec33f2604a"
diff --git a/openpgp-api/build.gradle b/openpgp-api/build.gradle
index 1d7d762e24..4dd38e7aa1 100644
--- a/openpgp-api/build.gradle
+++ b/openpgp-api/build.gradle
@@ -16,6 +16,15 @@ android {
     lintOptions {
         abortOnError false
     }
+
+    buildTypes {
+        play {
+        }
+        github {
+        }
+        debug {
+        }
+    }
 }
 
 //publish {