Merge branch 'mindustry' into 'master'

Mindustry: remove v97, add v98 and fix major version

See merge request fdroid/fdroiddata!5786
This commit is contained in:
Licaon_Kter 2019-10-26 13:59:15 +00:00
commit c2eec338af

View file

@ -87,9 +87,9 @@ Builds:
scandelete: scandelete:
- android/libs - android/libs
- versionName: 4-fdroid-97 - versionName: 5-fdroid-98
versionCode: 97 versionCode: 98
commit: v97 commit: v98
subdir: android subdir: android
gradle: gradle:
- yes - yes
@ -98,7 +98,6 @@ Builds:
- echo "build=$$VERCODE$$" >> ../core/assets/version.properties - echo "build=$$VERCODE$$" >> ../core/assets/version.properties
- echo "modifier=beta" >> ../core/assets/version.properties - echo "modifier=beta" >> ../core/assets/version.properties
- echo "type=fdroid" >> ../core/assets/version.properties - echo "type=fdroid" >> ../core/assets/version.properties
- echo "number=4" >> ../core/assets/version.properties
- echo "buildversion=$$VERCODE$$" >> gradle.properties - echo "buildversion=$$VERCODE$$" >> gradle.properties
- echo "versionType=fdroid" >> gradle.properties - echo "versionType=fdroid" >> gradle.properties
- grep archash ../gradle.properties >> gradle.properties - grep archash ../gradle.properties >> gradle.properties
@ -114,5 +113,5 @@ MaintainerNotes: |-
AutoUpdateMode: Version v%c AutoUpdateMode: Version v%c
UpdateCheckMode: HTTP UpdateCheckMode: HTTP
UpdateCheckData: https://raw.githubusercontent.com/Anuken/MindustryBuilds/master/version_fdroid.txt|versionCode=(.*)|.|versionName=(.*) UpdateCheckData: https://raw.githubusercontent.com/Anuken/MindustryBuilds/master/version_fdroid.txt|versionCode=(.*)|.|versionName=(.*)
CurrentVersion: 4-fdroid-97 CurrentVersion: 5-fdroid-98
CurrentVersionCode: 97 CurrentVersionCode: 98