Misc fixes after build cycle

This commit is contained in:
Jochen Sprickerhof 2021-04-22 15:13:54 +02:00
parent 731433dd32
commit 3dac4f6e59
8 changed files with 17 additions and 46 deletions

View file

@ -63,16 +63,6 @@ Builds:
- bash ./fdroid-build.sh
ndk: r21e
- versionName: 1.7.2
versionCode: 13
commit: v1.7.2
output: crocgui.apk
build:
- export ANDROID_SDK_ROOT=$$SDK$$
- export ANDROID_NDK_ROOT=$$NDK$$
- bash ./fdroid-build.sh
ndk: r21e
- versionName: 1.8.1
versionCode: 15
commit: v1.8.1

View file

@ -1952,6 +1952,7 @@ Builds:
- versionName: 3.5.7
versionCode: 357
disable: https://github.com/Blockstream/green_android/issues/114
commit: release_3.5.7
timeout: 25200
subdir: app

View file

@ -44,6 +44,8 @@ Builds:
- sed -i -e 's/priv_daemon-release/priv_daemon-release-unsigned/' build.gradle
- sed -i -e 's/pref_settings_check_for_updates_default">true/pref_settings_check_for_updates_default">false/'
src/main/res/values/preference_keys.xml
- sed -i -e 's#new File(sdkDir, "ndk/" + ndkVer).getAbsolutePath()#"$$NDK$$"#'
build.gradle
ndk: r22b
AutoUpdateMode: Version %v

View file

@ -674,19 +674,20 @@ Builds:
- sed -i -e '/publishing {/,/^}/d' ../terminal-{emulator,view}/build.gradle
ndk: r22
- versionName: '0.109'
versionCode: 109
commit: v0.109
- versionName: '0.111'
versionCode: 111
commit: v0.111
subdir: app
gradle:
- yes
prebuild:
- sed -i -e '/splits\ {/,+8d' build.gradle
- sed -i -e '/publishing {/,/^}/d' ../terminal-{emulator,view}/build.gradle
- sed -i -e '/publishing {/,/^}/d' ../termux-shared/build.gradle
- sed -i -e 's/22.0.7026061/22.1.7171670/' ../gradle.properties
ndk: r22b
AutoUpdateMode: Version v%v
UpdateCheckMode: Tags
CurrentVersion: '0.109'
CurrentVersionCode: 109
CurrentVersion: '0.111'
CurrentVersionCode: 111

View file

@ -812,6 +812,7 @@ Builds:
- versionName: 3.5.1
versionCode: 20210419
disable: fails to build https://github.com/ukanth/afwall/issues/1204
commit: v3.5.1
subdir: app
gradle:

View file

@ -107,15 +107,15 @@ Builds:
gradle:
- yes
- versionName: 2.3.3
- versionName: 2.3.3-foss
versionCode: 27
commit: 2.3.3
subdir: pretixprint/app
submodules: true
gradle:
- floss
- foss
AutoUpdateMode: Version %v
UpdateCheckMode: Tags
CurrentVersion: 2.3.3
CurrentVersion: 2.3.3-foss
CurrentVersionCode: 27

View file

@ -39,32 +39,7 @@ Builds:
preassemble:
- rclone:buildNative
- versionName: 1.12.0-pre1
versionCode: 180
commit: v1.12.0-r210418
gradle:
- oss
output: app/build/outputs/apk/oss/release/app-oss-universal-release-unsigned.apk
build:
- curl -o go.tar.gz https://dl.google.com/go/go1.15.8.linux-amd64.tar.gz
- echo 'd3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b go.tar.gz'
| sha256sum -c
- mkdir -p golang
- tar -C golang -xzf go.tar.gz
- export GOPATH="$PWD"
- export GOROOT="$PWD/golang/go"
- export PATH="$GOROOT/bin:$PATH"
- sed -i "27i environment 'GO111MODULE', 'off'" rclone/build.gradle
- sed -i "27i ignoreExitValue true" rclone/build.gradle
- sed -i -e 's/commandLine '\''go'\''/commandLine '\''\/home\/vagrant\/build\/io.github.x0b.rcx\/golang\/go\/bin\/go'\''/g'
rclone/build.gradle
- sed -i -e 's/'\''ndk-bundle'\'',/'\''..\/android-ndk'\'', '\''r20b'\'',/g'
rclone/build.gradle
ndk: r20b
preassemble:
- rclone:buildNative
AutoUpdateMode: Version v%v
UpdateCheckMode: Tags
CurrentVersion: 1.12.0-pre1
CurrentVersionCode: 180
UpdateCheckMode: Tags ^v?[.0-9]*$
CurrentVersion: 1.11.4
CurrentVersionCode: 170

View file

@ -2129,6 +2129,7 @@ Builds:
- sed -i -e '/com.google.firebase.crashlytics/d' -e '/googleplayImplementation(.*)
{/,/}/d; /googleplayImplementation/d' -e '/com.google.gms/d' -e '/signingConfig
=/d' -e '/firebaseCrashlytics {/,/}/d;' build.gradle.kts
- sed -i -e 's/gradle-7.0-rc-1/gradle-7.0/' ../gradle/wrapper/gradle-wrapper.properties
gradleprops:
- tasks_mapbox_key="pk.eyJ1IjoiYmFrZXJiYSIsImEiOiJjanUxZG51dDUwMGttNDlvN3p3cHZzaXB3In0.1UWYV5dhTKiw_MkHNkA1jA"