From 28c01aea8eda983497f2f1476b428b28c9ccf891 Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Thu, 9 May 2019 17:44:34 +0200
Subject: [PATCH] build.gradle: update to f-droid version with targetSdk 25

We go back to targetSdk 25 so users can disable
 the foreground service (and annoying notification) if they choose
---
 .gitlab-ci.yml     | 1 -
 build.gradle       | 9 ++-------
 proguard-rules.pro | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 014cd2e34..e2aa28d01 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,6 @@ publish:
   - find -type d -name "siacs" -print0 | xargs --null -I{} bash -c 'x="{}"; mv "$x" "${x/siacs/sum7}" '
   - find -type f -name "*.java" -exec sed -i "/eu.siacs.conversations.axolotl/! s/eu.siacs./eu.sum7./" "{}" \;
   - find -type f -name "*.xml"  -exec sed -i "/eu.siacs.conversations.axolotl/! s/eu.siacs./eu.sum7./" "{}" \;
-  - sed -i "s/eu.siacs./eu.sum7./" "proguard-rules.pro"
   # workaround for bug in fdroid nightly
   - sed -i "s/-debug.apk/-unsigned.apk/" /usr/lib/python3/dist-packages/fdroidserver/nightly.py
   - sed -i "s/servergitmirror = 'git@' +/servergitmirror = 'gitlab@' +/" /usr/lib/python3/dist-packages/fdroidserver/nightly.py
diff --git a/build.gradle b/build.gradle
index 0b85dd3fb..76f507026 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,7 +80,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 25
         versionCode 327
         versionName "2.5.1"
         archivesBaseName += "-$versionName"
@@ -123,19 +123,15 @@ android {
 
         playstore {
             dimension "distribution"
-            versionNameSuffix "+p"
         }
         free {
             dimension "distribution"
-            versionNameSuffix "+f"
         }
         system {
             dimension "emoji"
-            versionNameSuffix "s"
         }
         compat {
             dimension "emoji"
-            versionNameSuffix "c"
         }
     }
 
@@ -185,13 +181,11 @@ android {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            versionNameSuffix "r"
         }
         debug {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            versionNameSuffix "d"
         }
     }
 
@@ -214,6 +208,7 @@ android {
 
     lintOptions {
         disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
+        abortOnError false
     }
 
     subprojects {
diff --git a/proguard-rules.pro b/proguard-rules.pro
index 3c3593577..dd566d10c 100644
--- a/proguard-rules.pro
+++ b/proguard-rules.pro
@@ -1,6 +1,6 @@
 -dontobfuscate
 
--keep class eu.siacs.conversations.**
+-keep class eu.sum7.conversations.**
 
 -keep class org.whispersystems.**