Merge branch 'miscfixes10' into 'master'

Even more fixes

See merge request fdroid/fdroiddata!6466

metadata/at.jclehner.rxdroid.yml

@@ -47,21 +47,6 @@ Builds:
     commit: v0.9.33.1
     gradle:
       - yes
-    srclibs:
-      - ShowCase-jclehner@fd3318b6a27f13159b57efa0c56d1c1e9d793c60
-    rm:
-      - .m2repo/
-    prebuild:
-      - sed -i -e 's#file://$pwd/.m2repo#https://jitpack.io#' -e "s/warning 'MissingTranslation'/checkReleaseBuilds
-        false/" -e "s/'at.jclehner.rxdroid.localmaven:ShowcaseView:9999'/(name:'ShowcaseView',
-        ext:'aar')/" -e '/theTask.dependsOn/d' build.gradle
-      - mkdir libs/
-      - echo "repositories { flatDir { dirs 'libs' } }" >> build.gradle
-    build:
-      - pushd $$ShowCase-jclehner$$
-      - gradle assembleRelease
-      - popd
-      - mv $$ShowCase-jclehner$$/library/build/libs/library.aar libs/ShowcaseView.aar
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/com.drip.yml

@@ -21,7 +21,7 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y g++ make ninja-build g++-multilib
-      - curl -Lo node.tar.xz https://nodejs.org/dist/latest-v10.x/node-v10.18.1-linux-x64.tar.xz
+      - curl -Lo node.tar.xz https://nodejs.org/dist/v10.18.1/node-v10.18.1-linux-x64.tar.xz
       - echo "8cc40f45c2c62529b15e83a6bbe0ac1febf57af3c5720df68067c96c0fddbbdf node.tar.xz"
         | sha256sum -c -
       - tar xJf node.tar.xz

metadata/com.simplemobiletools.filemanager.pro.yml

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

metadata/com.vsmartcard.acardemulator.yml

@@ -59,17 +59,19 @@ Builds:
     subdir: ACardEmulator/app
     submodules: true
     gradle:
-      - yes
+      - fdroid
     prebuild:
       - git clean -xfd
       - git submodule foreach --recursive git clean -xfd
       - git reset --hard
       - git submodule foreach --recursive git reset --hard
       - git submodule update --init --recursive
+      - sed -i -e '/applicationIdSuffix/d' build.gradle
     scandelete:
       - virtualsmartcard/npa-example-data
       - ccid/src/OpenSC/src/tests/regression/bintest
       - ACardEmulator/app/src/main/external/ykneo-oath/build.gradle
+      - ACardEmulator/app/src/main/external/PivApplet/ext/ant/sdks/
 
 AutoUpdateMode: Version ACardEmulator-%v
 UpdateCheckMode: Tags

metadata/org.asteroidos.sync.yml

@@ -118,8 +118,6 @@ Builds:
     subdir: app
     gradle:
       - yes
-    rm:
-      - app/src/main/lib/material-intro-screen/material-intro-screen/build.gradle
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/se.manyver.yml

@@ -1208,6 +1208,8 @@ Builds:
     init:
       - npm install --no-optional
       - truncate -s 0 ../../node_modules/react-native/node_modules/@react-native-community/cli/build/commands/server/external/xsel
+    patch:
+      - build.patch
     gradle:
       - indie
     srclibs:

metadata/se.manyver/build.patch

@@ -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
+-            }
+         }
+     }
+