mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-10-07 01:41:06 +03:00
convert metadata.Build to a subclass of dict
Like with the App class in the commit before, this makes it a lot
easier to work with this data when converting between the internal
formats and external formats like YAML, JSON, MsgPack, protobuf, etc.
The one unfortunate thing here is Build.update. It becomes
dict.update(), which is a method not an attribute.
build.get('update') or build['update'] could be used, but that would
be oddly inconsistent. So instead the field is renamed to
'androidupdate', except for in the .txt v0 metadata files. This better
describes what field does anyway, since it runs `android update`.
Build.update is only referenced in two places right next to each other
for the ant builds, so this change still seems worthwhile.
This commit is contained in:
Hans-Christoph Steiner
parent
b7fc7f2228
commit
c0bc3afda9
9 changed files with 450 additions and 552 deletions
|
|
@ -58,10 +58,10 @@ VercodeOperation: null
|
|||
WebSite: http://sufficientlysecure.org/index.php/adaway
|
||||
added: null
|
||||
builds:
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9
|
||||
disable: false
|
||||
encoding: null
|
||||
|
|
@ -87,13 +87,12 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '13'
|
||||
version: '1.12'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: 4128e59da2eac5c2904c7c7568d298ca51e79540
|
||||
disable: false
|
||||
encoding: null
|
||||
|
|
@ -120,13 +119,12 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '16'
|
||||
version: '1.15'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: 0b9985398b9eef7baf6aadd0dbb12002bc199d2e
|
||||
disable: false
|
||||
encoding: null
|
||||
|
|
@ -153,13 +151,12 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '19'
|
||||
version: '1.18'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22
|
||||
disable: false
|
||||
encoding: null
|
||||
|
|
@ -186,13 +183,12 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '20'
|
||||
version: '1.19'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: 695e3801e4081026c8f7213a2345fc451d5eb89c
|
||||
disable: false
|
||||
encoding: null
|
||||
|
|
@ -219,13 +215,12 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '21'
|
||||
version: '1.20'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: 65138c11cc8b6affd28b68e125fbc1dff0886a4e
|
||||
disable: false
|
||||
encoding: null
|
||||
|
|
@ -252,10 +247,10 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '22'
|
||||
version: '1.21'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni: []
|
||||
commit: unknown - see disabled
|
||||
|
|
@ -283,13 +278,12 @@ builds:
|
|||
subdir: null
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '24'
|
||||
version: '1.23'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: f811e53e1e1d2ee047b18715fd7d2072b90ae76b
|
||||
disable: false
|
||||
encoding: null
|
||||
|
|
@ -315,13 +309,12 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '25'
|
||||
version: '1.24'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: ff97932761cdee68638dc2550751a64b2cbe18e7
|
||||
disable: false
|
||||
encoding: null
|
||||
|
|
@ -347,13 +340,12 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '26'
|
||||
version: '1.25'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: 33d4d80998f30bafc88c04c80cbae00b03916f99
|
||||
disable: false
|
||||
encoding: null
|
||||
|
|
@ -379,13 +371,12 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '27'
|
||||
version: '1.26'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: 743d25a7e287505461f33f4b8e57e4cf988fffea
|
||||
disable: false
|
||||
encoding: null
|
||||
|
|
@ -411,13 +402,12 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '28'
|
||||
version: '1.27'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: eaa07f4
|
||||
disable: false
|
||||
encoding: null
|
||||
|
|
@ -443,10 +433,10 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '30'
|
||||
version: '1.29'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni: false
|
||||
commit: 71ced3f
|
||||
|
|
@ -475,10 +465,10 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '33'
|
||||
version: '1.32'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni: false
|
||||
commit: 9d63c18
|
||||
|
|
@ -506,10 +496,10 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '34'
|
||||
version: '1.33'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni: false
|
||||
commit: f2568b1
|
||||
|
|
@ -538,10 +528,10 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '35'
|
||||
version: '1.34'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni: false
|
||||
commit: 7442d5d
|
||||
|
|
@ -570,10 +560,10 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '36'
|
||||
version: '1.35'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni: false
|
||||
commit: 83fc713
|
||||
|
|
@ -602,10 +592,10 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '37'
|
||||
version: '1.36'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni: false
|
||||
commit: 70da32b567122b701cdcb1609b780eb85732028f
|
||||
|
|
@ -634,13 +624,16 @@ builds:
|
|||
subdir: org_adaway/
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '38'
|
||||
version: '1.37'
|
||||
- antcommands: []
|
||||
- androidupdate:
|
||||
- .
|
||||
- android-libs/Donations
|
||||
- android-libs/ActionBarSherlock
|
||||
- android-libs/HtmlSpanner/htmlspanner
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: v2.1
|
||||
disable: false
|
||||
encoding: null
|
||||
|
|
@ -674,17 +667,16 @@ builds:
|
|||
subdir: AdAway
|
||||
submodules: false
|
||||
target: null
|
||||
update:
|
||||
vercode: '40'
|
||||
version: '2.1'
|
||||
- androidupdate:
|
||||
- .
|
||||
- android-libs/Donations
|
||||
- android-libs/ActionBarSherlock
|
||||
- android-libs/HtmlSpanner/htmlspanner
|
||||
vercode: '40'
|
||||
version: '2.1'
|
||||
- antcommands: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: v2.3
|
||||
disable: false
|
||||
encoding: null
|
||||
|
|
@ -718,25 +710,19 @@ builds:
|
|||
subdir: AdAway
|
||||
submodules: false
|
||||
target: null
|
||||
update:
|
||||
- .
|
||||
- android-libs/Donations
|
||||
- android-libs/ActionBarSherlock
|
||||
- android-libs/HtmlSpanner/htmlspanner
|
||||
vercode: '42'
|
||||
version: '2.3'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: v2.6
|
||||
disable: false
|
||||
encoding: null
|
||||
extlibs: []
|
||||
forcevercode: false
|
||||
forceversion: false
|
||||
gradle:
|
||||
- 'yes'
|
||||
gradle: true
|
||||
gradleprops: []
|
||||
init: ''
|
||||
kivy: false
|
||||
|
|
@ -756,21 +742,19 @@ builds:
|
|||
subdir: AdAway
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '45'
|
||||
version: '2.6'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: v2.7
|
||||
disable: false
|
||||
encoding: null
|
||||
extlibs: []
|
||||
forcevercode: false
|
||||
forceversion: false
|
||||
gradle:
|
||||
- 'yes'
|
||||
gradle: true
|
||||
gradleprops: []
|
||||
init: ''
|
||||
kivy: false
|
||||
|
|
@ -790,21 +774,19 @@ builds:
|
|||
subdir: AdAway
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '46'
|
||||
version: '2.7'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: v2.8
|
||||
disable: false
|
||||
encoding: null
|
||||
extlibs: []
|
||||
forcevercode: false
|
||||
forceversion: false
|
||||
gradle:
|
||||
- 'yes'
|
||||
gradle: true
|
||||
gradleprops: []
|
||||
init: ''
|
||||
kivy: false
|
||||
|
|
@ -824,21 +806,19 @@ builds:
|
|||
subdir: AdAway
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '47'
|
||||
version: '2.8'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: v2.8.1
|
||||
disable: false
|
||||
encoding: null
|
||||
extlibs: []
|
||||
forcevercode: false
|
||||
forceversion: false
|
||||
gradle:
|
||||
- 'yes'
|
||||
gradle: true
|
||||
gradleprops: []
|
||||
init: ''
|
||||
kivy: false
|
||||
|
|
@ -858,21 +838,19 @@ builds:
|
|||
subdir: AdAway
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '48'
|
||||
version: 2.8.1
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: v2.9
|
||||
disable: false
|
||||
encoding: null
|
||||
extlibs: []
|
||||
forcevercode: false
|
||||
forceversion: false
|
||||
gradle:
|
||||
- 'yes'
|
||||
gradle: true
|
||||
gradleprops: []
|
||||
init: ''
|
||||
kivy: false
|
||||
|
|
@ -892,21 +870,19 @@ builds:
|
|||
subdir: AdAway
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '49'
|
||||
version: '2.9'
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: v2.9.1
|
||||
disable: false
|
||||
encoding: null
|
||||
extlibs: []
|
||||
forcevercode: false
|
||||
forceversion: false
|
||||
gradle:
|
||||
- 'yes'
|
||||
gradle: true
|
||||
gradleprops: []
|
||||
init: ''
|
||||
kivy: false
|
||||
|
|
@ -926,21 +902,19 @@ builds:
|
|||
subdir: AdAway
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '50'
|
||||
version: 2.9.1
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: v2.9.2
|
||||
disable: false
|
||||
encoding: null
|
||||
extlibs: []
|
||||
forcevercode: false
|
||||
forceversion: false
|
||||
gradle:
|
||||
- 'yes'
|
||||
gradle: true
|
||||
gradleprops: []
|
||||
init: ''
|
||||
kivy: false
|
||||
|
|
@ -960,21 +934,19 @@ builds:
|
|||
subdir: AdAway
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '51'
|
||||
version: 2.9.2
|
||||
- antcommands: []
|
||||
- androidupdate: []
|
||||
antcommands: []
|
||||
build: ''
|
||||
buildjni:
|
||||
- 'yes'
|
||||
buildjni: true
|
||||
commit: v3.0
|
||||
disable: false
|
||||
encoding: null
|
||||
extlibs: []
|
||||
forcevercode: false
|
||||
forceversion: false
|
||||
gradle:
|
||||
- 'yes'
|
||||
gradle: true
|
||||
gradleprops: []
|
||||
init: ''
|
||||
kivy: false
|
||||
|
|
@ -994,7 +966,6 @@ builds:
|
|||
subdir: AdAway
|
||||
submodules: false
|
||||
target: null
|
||||
update: []
|
||||
vercode: '52'
|
||||
version: '3.0'
|
||||
comments:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue