Merge branch 'simplefilefix' into 'master'

SimpleFilemanager - fix build 84

See merge request fdroid/fdroiddata!6433
This commit is contained in:
Licaon_Kter 2020-03-04 15:56:51 +00:00
commit fba550076b
2 changed files with 42 additions and 1 deletions

View file

@ -176,9 +176,10 @@ Builds:
versionCode: 84
commit: 6.5.0
subdir: app
patch:
- build.patch
gradle:
- yes
prebuild: sed -i -e '/keystore/d' build.gradle
AutoUpdateMode: Version %v
UpdateCheckMode: Tags

View file

@ -0,0 +1,40 @@
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,12 +2,6 @@
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
-def keystorePropertiesFile = rootProject.file("keystore.properties")
-def keystoreProperties = new Properties()
-if (keystorePropertiesFile.exists()) {
- keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-}
-
android {
compileSdkVersion 29
buildToolsVersion "29.0.2"
@@ -24,14 +18,6 @@
}
signingConfigs {
- if (keystorePropertiesFile.exists()) {
- release {
- keyAlias keystoreProperties['keyAlias']
- keyPassword keystoreProperties['keyPassword']
- storeFile file(keystoreProperties['storeFile'])
- storePassword keystoreProperties['storePassword']
- }
- }
}
buildTypes {
@@ -41,9 +27,6 @@
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- if (keystorePropertiesFile.exists()) {
- signingConfig signingConfigs.release
- }
}
}