sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Martin/Geno 2019-05-09 17:44:34 +02:00
parent 7ac752fac3
commit 28c01aea8e
No known key found for this signature in database
GPG Key ID: 9D7D3C6BFF600C6A
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -31,7 +31,6 @@ publish:
- find -type d -name "siacs" -print0 | xargs --null -I{} bash -c 'x="{}"; mv "$x" "${x/siacs/sum7}" ' - 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 "*.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./" "{}" \; - 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 # workaround for bug in fdroid nightly
- sed -i "s/-debug.apk/-unsigned.apk/" /usr/lib/python3/dist-packages/fdroidserver/nightly.py - 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 - sed -i "s/servergitmirror = 'git@' +/servergitmirror = 'gitlab@' +/" /usr/lib/python3/dist-packages/fdroidserver/nightly.py

9
build.gradle
View File

@ -80,7 +80,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 28 targetSdkVersion 25
versionCode 327 versionCode 327
versionName "2.5.1" versionName "2.5.1"
archivesBaseName += "-$versionName" archivesBaseName += "-$versionName"
@ -123,19 +123,15 @@ android {
playstore { playstore {
dimension "distribution" dimension "distribution"
versionNameSuffix "+p"
} }
free { free {
dimension "distribution" dimension "distribution"
versionNameSuffix "+f"
} }
system { system {
dimension "emoji" dimension "emoji"
versionNameSuffix "s"
} }
compat { compat {
dimension "emoji" dimension "emoji"
versionNameSuffix "c"
} }
} }
@ -185,13 +181,11 @@ android {
shrinkResources true shrinkResources true
minifyEnabled true minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
versionNameSuffix "r"
} }
debug { debug {
shrinkResources true shrinkResources true
minifyEnabled true minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
versionNameSuffix "d"
} }
} }
@ -214,6 +208,7 @@ android {
lintOptions { lintOptions {
disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource' disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
abortOnError false
} }
subprojects { subprojects {

2
proguard-rules.pro vendored
View File

@ -1,6 +1,6 @@
-dontobfuscate -dontobfuscate
-keep class eu.siacs.conversations.** -keep class eu.sum7.conversations.**
-keep class org.whispersystems.** -keep class org.whispersystems.**