Merge branch 'miscfixups2' into 'master'

Misc fixups for failed builds See merge request fdroid/fdroiddata!5866
2019-11-04 11:44:55 +00:00 · 2019-11-04 11:44:55 +00:00 · ed0ca1120b
parent f8a209f110 4a019d767c
commit ed0ca1120b
19 changed files with 19 additions and 29 deletions
--- a/metadata/com.adguard.android.contentblocker.yml
+++ b/metadata/com.adguard.android.contentblocker.yml
@ -56,6 +56,7 @@ Builds:

  - versionName: 2.5.5
    versionCode: 22000006
+    disable: fails to build
    commit: v2.5.5
    subdir: adguard_cb
    gradle:
--- a/metadata/com.aefyr.sai.fdroid.yml
+++ b/metadata/com.aefyr.sai.fdroid.yml
@ -109,6 +109,7 @@ Builds:

  - versionName: '2.10'
    versionCode: 40
+    disable: fails to build
    commit: '2.10'
    subdir: app
    gradle:
--- a/metadata/com.amaze.filemanager.yml
+++ b/metadata/com.amaze.filemanager.yml
@ -319,6 +319,7 @@ Builds:

  - versionName: 3.3.4
    versionCode: 79
+    disable: fails to build
    commit: v3.3.4
    subdir: app
    gradle:
--- a/metadata/com.dosse.speedtest.yml
+++ b/metadata/com.dosse.speedtest.yml
@ -55,6 +55,7 @@ Builds:
    subdir: Speedtest-Android/app
    gradle:
      - yes
+    prebuild: sed -i -e 's/your.name.here.speedtest/com.dosse.speedtest/' build.gradle

 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
--- a/metadata/com.etesync.syncadapter.yml
+++ b/metadata/com.etesync.syncadapter.yml
@ -638,6 +638,7 @@ Builds:

  - versionName: 1.9.1
    versionCode: 91
+    disable: fails to build
    commit: v1.9.1
    subdir: app
    submodules: true
--- a/metadata/com.github.andremiras.etheroll.yml
+++ b/metadata/com.github.andremiras.etheroll.yml
@ -82,6 +82,7 @@ Builds:

  - versionName: '2019.1101'
    versionCode: 721203001
+    disable: fails to build
    commit: v2019.1101
    sudo:
      - apt-get update || apt-get update
--- a/metadata/com.github.axet.filemanager.yml
+++ b/metadata/com.github.axet.filemanager.yml
@ -190,6 +190,7 @@ Builds:

  - versionName: 0.4.6
    versionCode: 146
+    disable: fails to build
    commit: filemanager-0.4.6
    subdir: app
    gradle:
--- a/metadata/com.mattermost.rnbeta.yml
+++ b/metadata/com.mattermost.rnbeta.yml
@ -307,6 +307,7 @@ Builds:

  - versionName: 1.24.0
    versionCode: 239
+    disable: fails to build
    commit: v1.24.0
    subdir: android/app
    sudo:
--- a/metadata/com.unciv.app.yml
+++ b/metadata/com.unciv.app.yml
@ -75,16 +75,6 @@ Builds:
    scandelete:
      - android/libs

-  - versionName: 3.1.4
-    versionCode: 306
-    commit: 3.1.4
-    subdir: android
-    gradle:
-      - yes
-    prebuild: sed -i -e '/maven.aliyun.com/d' ../build.gradle
-    scandelete:
-      - android/libs
-
  - versionName: 3.1.5
    versionCode: 308
    commit: 3.1.5
--- a/metadata/com.vsmartcard.acardemulator.yml
+++ b/metadata/com.vsmartcard.acardemulator.yml
@ -41,6 +41,7 @@ Builds:
    submodules: true
    gradle:
      - yes
+    prebuild: git reset --hard
    scandelete:
      - virtualsmartcard/npa-example-data
      - ccid/src/OpenSC/src/tests/regression/bintest
--- a/metadata/com.wangdaye.mysplash.yml
+++ b/metadata/com.wangdaye.mysplash.yml
@ -371,24 +371,9 @@ Builds:
      - echo android.useAndroidX=true >> ../gradle.properties
      - echo android.enableJetifier=true >> ../gradle.properties

-  - versionName: 3.7.7
-    versionCode: 377
-    commit: 3.7.7
-    subdir: app
-    patch:
-      - 3.6.9-ru_locale.patch
-    gradle:
-      - yes
-    rm:
-      - app/src/main/res/resource/values-ru/arrays.xml
-      - app/src/main/res/resource/values-ru/strings.xml
-    prebuild:
-      - git checkout a307d32e325b8f33022f28975fac9253d1de705d -- ../gradle.properties
-      - echo android.useAndroidX=true >> ../gradle.properties
-      - echo android.enableJetifier=true >> ../gradle.properties
-
  - versionName: 3.7.8
    versionCode: 378
+    disable: fails to build
    commit: 3.7.8
    subdir: app
    patch:
--- a/metadata/de.simplestatswidget.yml
+++ b/metadata/de.simplestatswidget.yml
@ -44,6 +44,7 @@ Builds:

  - versionName: 1.2.0
    versionCode: 120
+    disable: fails to build
    commit: v1.2.0
    subdir: app
    gradle:
--- a/metadata/deep.ryd.rydplayer.yml
+++ b/metadata/deep.ryd.rydplayer.yml
@ -231,6 +231,7 @@ Builds:

  - versionName: 2.1.2
    versionCode: 59
+    disable: fails to build
    commit: 82ab25d45e1be5d6b685278ba3274e444cc96eec
    subdir: android
    gradle:
--- a/metadata/io.github.trytonvanmeer.libretrivia.yml
+++ b/metadata/io.github.trytonvanmeer.libretrivia.yml
@ -28,7 +28,7 @@ Builds:

  - versionName: '0.3'
    versionCode: 3
-    commit: v0.3
+    commit: v0.3.0
    subdir: app
    gradle:
      - yes
--- a/metadata/io.gresse.hugo.anecdote.yml
+++ b/metadata/io.gresse.hugo.anecdote.yml
@ -112,6 +112,7 @@ Builds:

  - versionName: 1.3.0
    versionCode: 27
+    disable: fails to build
    commit: v1.3.0
    subdir: app
    gradle:
--- a/metadata/io.va.exposed.yml
+++ b/metadata/io.va.exposed.yml
@ -54,6 +54,7 @@ Builds:

  - versionName: 0.17.4
    versionCode: 174
+    disable: fails to build
    commit: 0.17.4
    subdir: VirtualApp/app/
    submodules: true
--- a/metadata/ru.yanus171.feedexfork.yml
+++ b/metadata/ru.yanus171.feedexfork.yml
@ -210,6 +210,7 @@ Builds:

  - versionName: 0.10.7
    versionCode: 182
+    disable: fails to build
    commit: v0.10.7
    subdir: FlymFork
    gradle:
--- a/metadata/ryey.easer.beta.yml
+++ b/metadata/ryey.easer.beta.yml
@ -79,6 +79,7 @@ Builds:

  - versionName: 0.7.9-beta2
    versionCode: 121002
+    disable: fails to build
    commit: v0.7.9-beta2
    subdir: app
    gradle:
--- a/metadata/uk.co.yahoo.p1rpp.calendartrigger.yml
+++ b/metadata/uk.co.yahoo.p1rpp.calendartrigger.yml
@ -49,13 +49,13 @@ Builds:

  - versionName: '3.1'
    versionCode: 8
-    commit: v3.1
+    commit: 3.1
    subdir: app
    gradle:
      - yes
    prebuild: sed -i -e '/keystoreProperties/d' build.gradle

-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
 UpdateCheckIgnore: beta
 CurrentVersion: '3.1'