From b21d439187a8953e66a9e10548e38750403fb755 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Mon, 30 Mar 2020 14:06:43 +0000 Subject: [PATCH] Misc fixes for current cycle --- metadata/com.standardnotes.yml | 10 ++-- metadata/ga.testapp.testapp.yml | 1 + metadata/io.github.wulkanowy.yml | 1 + metadata/it.diab.yml | 10 ++-- metadata/jp.ddo.hotmist.unicodepad.yml | 3 +- metadata/network.ubic.ubic.yml | 1 + metadata/org.commonvoice.saverio.yml | 8 --- metadata/org.wownero.cyberwow.yml | 1 + metadata/se.manyver/build.patch | 59 ++++++++----------- metadata/se.oandell.riksdagen.yml | 4 +- ...inelabs.meditationassistant.opensource.yml | 3 +- 11 files changed, 43 insertions(+), 58 deletions(-) diff --git a/metadata/com.standardnotes.yml b/metadata/com.standardnotes.yml index a4e6494d50..f51583b5bd 100644 --- a/metadata/com.standardnotes.yml +++ b/metadata/com.standardnotes.yml @@ -170,9 +170,9 @@ Builds: - node_modules/ - vendor/ - - versionName: 3.0.18 - versionCode: 3000180 - commit: 777c57cb6f2a784a469df393d144ff7a614d1e1d + - versionName: 3.0.21 + versionCode: 3000210 + commit: 3.0.21 subdir: android/app/ submodules: true sudo: @@ -196,5 +196,5 @@ Builds: AutoUpdateMode: Version %v UpdateCheckMode: Tags -CurrentVersion: 3.0.18 -CurrentVersionCode: 3000180 +CurrentVersion: 3.0.21 +CurrentVersionCode: 3000210 diff --git a/metadata/ga.testapp.testapp.yml b/metadata/ga.testapp.testapp.yml index 585b45b5d0..8c6072ae80 100644 --- a/metadata/ga.testapp.testapp.yml +++ b/metadata/ga.testapp.testapp.yml @@ -80,6 +80,7 @@ Builds: - versionName: 3.7.0 versionCode: 47 + disable: fails to build commit: 3.7.0 output: build/app/outputs/apk/release/app-release.apk srclibs: diff --git a/metadata/io.github.wulkanowy.yml b/metadata/io.github.wulkanowy.yml index 2833a72eba..fe201816d2 100644 --- a/metadata/io.github.wulkanowy.yml +++ b/metadata/io.github.wulkanowy.yml @@ -146,6 +146,7 @@ Builds: - versionName: 0.16.0 versionCode: 53 + disable: fails to build commit: 0.16.0 subdir: app gradle: diff --git a/metadata/it.diab.yml b/metadata/it.diab.yml index 815be43221..4015cc3822 100644 --- a/metadata/it.diab.yml +++ b/metadata/it.diab.yml @@ -44,17 +44,17 @@ Builds: - googlefit prebuild: sed -i -e '/googleFitImplementation/d' build.gradle - - versionName: v1.3.5 + - versionName: 1.3.5 versionCode: 491 commit: v1.3.5 subdir: app gradle: - oss - rm: - - googlefit prebuild: sed -i -e '/googleFitImplementation/d' build.gradle + scanignore: + - buildSrc/build -AutoUpdateMode: Version %v -UpdateCheckMode: Tags +AutoUpdateMode: None +UpdateCheckMode: None CurrentVersion: v1.3.5 CurrentVersionCode: 491 diff --git a/metadata/jp.ddo.hotmist.unicodepad.yml b/metadata/jp.ddo.hotmist.unicodepad.yml index 3db04b993b..5612f13bf0 100644 --- a/metadata/jp.ddo.hotmist.unicodepad.yml +++ b/metadata/jp.ddo.hotmist.unicodepad.yml @@ -38,12 +38,13 @@ Builds: - versionName: 2.6.1 versionCode: 39 + disable: non-FOSS libs commit: v2.6.1 subdir: app/ gradle: - yes -AutoUpdateMode: Version v%v +AutoUpdateMode: None UpdateCheckMode: Tags CurrentVersion: 2.6.1 CurrentVersionCode: 39 diff --git a/metadata/network.ubic.ubic.yml b/metadata/network.ubic.ubic.yml index f89f85bbb7..7e173b75e3 100644 --- a/metadata/network.ubic.ubic.yml +++ b/metadata/network.ubic.ubic.yml @@ -88,6 +88,7 @@ Builds: - versionName: '4.3' versionCode: 12 + disable: fails to build commit: '4.3' subdir: app sudo: diff --git a/metadata/org.commonvoice.saverio.yml b/metadata/org.commonvoice.saverio.yml index 38fc2791c3..d1fbc8689d 100644 --- a/metadata/org.commonvoice.saverio.yml +++ b/metadata/org.commonvoice.saverio.yml @@ -19,14 +19,6 @@ Builds: gradle: - yes - - versionName: 0.2.6b - versionCode: 78 - disable: fails to build - commit: 0.2.6b - subdir: app - gradle: - - yes - - versionName: 0.2.8b versionCode: 81 commit: 0.2.8b diff --git a/metadata/org.wownero.cyberwow.yml b/metadata/org.wownero.cyberwow.yml index 7d016e0eb6..fa47b76995 100644 --- a/metadata/org.wownero.cyberwow.yml +++ b/metadata/org.wownero.cyberwow.yml @@ -54,6 +54,7 @@ Builds: sudo: - apt-get update || apt-get update - apt install -y build-essential + - apt install -y -t stretch-backports-sloppy libarchive13 - apt install -y -t stretch-backports cmake output: build/app/outputs/apk/release/app-release.apk srclibs: diff --git a/metadata/se.manyver/build.patch b/metadata/se.manyver/build.patch index aec99407af..db95f81299 100644 --- a/metadata/se.manyver/build.patch +++ b/metadata/se.manyver/build.patch @@ -1,39 +1,28 @@ ---- 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 @@ +--- a/android/app/build.gradle ++++ b/android/app/build.gradle +@@ -173,14 +173,6 @@ + // keyPassword 'android' + // } release { - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' -- if (keystorePropertiesFile.exists()) { -- signingConfig signingConfigs.release +- if (project.hasProperty('MYAPP_RELEASE_STORE_FILE')) { +- storeFile file(MYAPP_RELEASE_STORE_FILE) +- storePassword MYAPP_RELEASE_STORE_PASSWORD +- keyAlias MYAPP_RELEASE_KEY_ALIAS +- keyPassword MYAPP_RELEASE_KEY_PASSWORD +- } else { +- throw new Exception('Refusing to make release build with wrong keystore') +- } + } + } + +@@ -203,11 +195,6 @@ + // signingConfig signingConfigs.debug + minifyEnabled enableProguardInReleaseBuilds + proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" +- if (project.hasProperty('MYAPP_RELEASE_STORE_FILE')) { +- signingConfig signingConfigs.release +- } else { +- throw new Exception('Refusing to make release build with wrong keystore') - } } } diff --git a/metadata/se.oandell.riksdagen.yml b/metadata/se.oandell.riksdagen.yml index dc8471da9a..aec1737d24 100644 --- a/metadata/se.oandell.riksdagen.yml +++ b/metadata/se.oandell.riksdagen.yml @@ -128,7 +128,7 @@ Builds: - versionName: 2.14.1 versionCode: 32 - commit: 2.14.1 + commit: 2.14.1-fdroid subdir: app gradle: - fdroid @@ -139,6 +139,6 @@ Builds: - sed -i -e '/playImplementation(.*) {/,/}/d; /playImplementation/d' build.gradle AutoUpdateMode: Version %v -UpdateCheckMode: Tags +UpdateCheckMode: Tags ^[0-9.]+-fdroid$ CurrentVersion: 2.14.1 CurrentVersionCode: 32 diff --git a/metadata/sh.ftp.rocketninelabs.meditationassistant.opensource.yml b/metadata/sh.ftp.rocketninelabs.meditationassistant.opensource.yml index 3ded62d683..28a2c7d930 100644 --- a/metadata/sh.ftp.rocketninelabs.meditationassistant.opensource.yml +++ b/metadata/sh.ftp.rocketninelabs.meditationassistant.opensource.yml @@ -406,11 +406,10 @@ Builds: subdir: MeditationAssistant gradle: - opensource - rm: - - MeditationAssistantWear prebuild: - sed -i -e '/play-services/d' build.gradle - sed -i 's/4096m/1024m/' ../gradle.properties + - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties AutoUpdateMode: Version %v UpdateCheckMode: Tags