1.992 release

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "eu.faircode.email"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 991
-        versionName "1.991"
+        versionCode 992
+        versionName "1.992"
         archivesBaseName = "FairEmail-v$versionName"
 
         // https://en.wikipedia.org/wiki/List_of_dinosaur_genera
@@ -29,6 +29,7 @@ android {
         // https://developer.android.com/guide/topics/graphics/vector-drawable-resources
         vectorDrawables.useSupportLibrary = true
 
+        ndkVersion "21.0.6113669"
         ndk {
             // Bugsnag
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
@@ -53,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'
@@ -124,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"

openpgp-api/build.gradle

@@ -2,20 +2,29 @@ apply plugin: 'com.android.library'
 //apply plugin: 'bintray-release' // must be applied after your artifact generating plugin (eg. java / com.android.library)
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 29
     //buildToolsVersion '27.0.3'
 
     defaultConfig {
         versionCode 9
         versionName '12.0' // API-Version . minor
         minSdkVersion 9
-        targetSdkVersion 25
+        targetSdkVersion 29
     }
 
     // Do not abort build if lint finds errors
     lintOptions {
         abortOnError false
     }
+
+    buildTypes {
+        play {
+        }
+        github {
+        }
+        debug {
+        }
+    }
 }
 
 //publish {