Merge branch 'miscfixes432' into 'master'

Misc fixes

See merge request fdroid/fdroiddata!8502
This commit is contained in:
Licaon_Kter 2021-03-05 11:03:50 +00:00
commit c7c341f717
9 changed files with 17 additions and 68 deletions

View file

@ -22,6 +22,7 @@ Builds:
- versionName: 1.1.4
versionCode: 8
disable: fails to build
commit: 1.1.4
subdir: app
gradle:

View file

@ -138,13 +138,6 @@ Builds:
gradle:
- yes
- versionName: 2.0.3
versionCode: 5329
commit: v2.0.3
subdir: app
gradle:
- yes
- versionName: 2.0.5
versionCode: 5331
commit: v2.0.5

View file

@ -2748,6 +2748,7 @@ Builds:
- versionName: 6.3.8
versionCode: 228
disable: fails to build
commit: 6.3.8
subdir: opacclient/opacapp
submodules: true

View file

@ -102,18 +102,9 @@ Builds:
- regular
ndk: r16b
- versionName: 1.1.7
versionCode: 1010704
disable: fails to build
commit: v1.1.7
subdir: app
submodules: true
gradle:
- regular
ndk: r16b
- versionName: 1.1.8
versionCode: 1010803
disable: unknown maven
commit: v1.1.8
subdir: app
submodules: true

View file

@ -3738,9 +3738,19 @@ Builds:
prebuild: sed -i -e '/keystoreProperties/d' build.gradle
ndk: r21d
- versionName: '1.1519'
versionCode: 1519
commit: '1.1519'
subdir: app
submodules: true
gradle:
- fdroid
prebuild: sed -i -e '/keystoreProperties/d' build.gradle
ndk: r21d
MaintainerNotes: Dynamic versionName and version code, so no autoupdates anymore.
AutoUpdateMode: None
UpdateCheckMode: None
CurrentVersion: '1.1518'
CurrentVersionCode: 1518
CurrentVersion: '1.1519'
CurrentVersionCode: 1519

View file

@ -229,17 +229,6 @@ Builds:
prebuild: sed -r "s:29.0.1:29.0.2:" -i build.gradle
ndk: r21d
- versionName: 0.16.15
versionCode: 16153
commit: v0.16.15-fdroid
subdir: app
gradle:
- __32bit
rm:
- .gitsecret/keys/random_seed
prebuild: sed -r "s:29.0.1:29.0.2:" -i build.gradle
ndk: r21d
MaintainerNotes: |-
+0: - (upstream)
+1: armv7 (CV)
@ -250,4 +239,4 @@ AutoUpdateMode: Version v%v-fdroid
UpdateCheckMode: Tags v\d+.\d+.\d+[a-z]?-fdroid
VercodeOperation: '%c*10 + 3'
CurrentVersion: 0.16.15
CurrentVersionCode: 16153
CurrentVersionCode: 16151

View file

@ -78,7 +78,7 @@ Builds:
- versionName: 2021.02.25
versionCode: 20210225
commit: 2021.02.25
commit: 2021.02.27
subdir: Smoke/app
gradle:
- yes

View file

@ -489,26 +489,6 @@ Builds:
- online
prebuild: sed -i -e '/kotlin.bintray.com/d' ../build.gradle
- versionName: 0.49.0
versionCode: 490
commit: 0.49.0
subdir: app
gradle:
- noGeth
- forFDroid
- online
prebuild: sed -i -e '/kotlin.bintray.com/d' ../build.gradle
- versionName: 0.49.1
versionCode: 491
commit: 0.49.1
subdir: app
gradle:
- noGeth
- forFDroid
- online
prebuild: sed -i -e '/kotlin.bintray.com/d' ../build.gradle
- versionName: 0.49.2
versionCode: 492
commit: 0.49.2

View file

@ -174,22 +174,6 @@ Builds:
gradle:
- yes
- versionName: 1.1.4
versionCode: 44
commit: v1.1.4
subdir: app
submodules: true
gradle:
- yes
- versionName: 1.1.5
versionCode: 46
commit: v1.1.5
subdir: app
submodules: true
gradle:
- yes
- versionName: 1.1.6
versionCode: 48
commit: v1.1.6