misc fixes

This commit is contained in:
linsui 2022-04-02 00:01:31 +08:00
parent c0ec7b475f
commit b521d92e0a
6 changed files with 12 additions and 127 deletions

View file

@ -428,6 +428,8 @@ Builds:
- obfs4@b5a9f3c5d239b2b1d2d5877c043c5893635334a0
rm:
- app/src/main/jniLibs/*/*.so
prebuild: sed -i -e 's/com.example.anonymousmessenger/com.dx.anonymousmessenger/'
build.gradle
build:
- pushd $$obfs4$$
- curl -Lso go.tar.gz https://golang.org/dl/go1.15.4.linux-amd64.tar.gz

View file

@ -13,9 +13,9 @@ RepoType: git
Repo: https://github.com/MovingBlocks/DestSolAndroid
Builds:
- versionName: 2.0.0
versionCode: 11
commit: 1b1c0db
- versionName: 2.1.0
versionCode: 13
commit: 1b1c0db0baf00c62ced328a690ffa0f85c8e9d71
patch:
- 2.0.0-android-backport.patch
gradle:
@ -28,6 +28,7 @@ Builds:
forceversion: true
forcevercode: true
prebuild:
- $$SDK$$/tools/bin/sdkmanager 'build-tools;30.0.3' > /dev/nulls
- printf '\nrootProject.projectDir = file("engine_workspace"); include ":android";
project(":android").projectDir = file(".\"); project(":android").buildFileName
= "android.gradle"; apply from:"engine_workspace/settings.gradle";' >> settings.gradle
@ -66,47 +67,6 @@ Builds:
- sed -i "s/.*com\.android\.tools\.build:gradle:.*/$(grep 'com\.android\.tools\.build:gradle:3.*'
android.gradle)/g" engine_workspace/libs/gestalt/build.gradle
- versionName: 2.1.0-SNAPSHOT
versionCode: 13
disable: not anywhere near release yet but this is to make sure it builds at least
under the current development branch.
commit: develop
gradle:
- yes
srclibs:
- MovingBlocks-DestinationSol-engine@develop
- MovingBlocks-gestalt@release/v7.x
- MovingBlocks-nui@v3.1.0
- MovingBlocks-joml-ext@v0.1.0
- MovingBlocks-org-reflections-fork@4fe6bd5
- antilaby-jsemver-fork@0.10.0
forceversion: true
forcevercode: true
prebuild:
- printf '\nrootProject.projectDir = file("engine_workspace"); include ":android";
project(":android").projectDir = file(".\"); project(":android").buildFileName
= "android.gradle"; apply from:"engine_workspace/settings.gradle";' >> settings.gradle
- mv build.gradle android.gradle
- ln -s $$MovingBlocks-DestinationSol-engine$$ engine_workspace
- ln -s engine_workspace/gradle gradle
- pushd engine_workspace
- ln -s $$MovingBlocks-gestalt$$ libs/gestalt
- ln -s $$MovingBlocks-nui$$ libs/TeraNUI
- ln -s $$MovingBlocks-joml-ext$$ libs/joml-ext
- ln -s $$MovingBlocks-org-reflections-fork$$ libs/reflections
- ln -s $$antilaby-jsemver-fork$$ libs/jsemver
- pushd $$MovingBlocks-org-reflections-fork$$
- gradle init --type pom
- popd
- echo 'sdk.dir=$$SDK$$' > local.properties
- echo 'sdk.dir=$$SDK$$' > libs/gestalt/local.properties
- popd
- sed -i '/artifactory.terasology.org/d' android.gradle engine_workspace/build.gradle
engine_workspace/config/gradle/common.gradle engine_workspace/engine/build.gradle
- sed -i -e '/heisluft.de/d' -e '/com.github.zafarkhaja:java-semver/d' android.gradle
- sed -i "s/.*com\.android\.tools\.build:gradle:.*/$(grep 'com\.android\.tools\.build:gradle:.*'
android.gradle)/g" engine_workspace/libs/gestalt/build.gradle
MaintainerNotes: |
The main engine code is at https://github.com/MovingBlocks/DestinationSol but the actual android application
can be found at https://github.com/MovingBlocks/DestSolAndroid.
@ -140,6 +100,6 @@ MaintainerNotes: |
Because the newer commit was intended for a later version, the version and version code need to be forced here.
AutoUpdateMode: None
UpdateCheckMode: Tags v\d+\.\d+\.\d+([-]alpha|beta)?$
UpdateCheckMode: Tags ^v[\d.]+$
CurrentVersion: 2.1.0
CurrentVersionCode: 12
CurrentVersionCode: 13

View file

@ -9025,42 +9025,6 @@ Builds:
scandelete:
- src/androidTest/assets/
- versionName: '20220324'
versionCode: 20220324
commit: 313ce06d2a649f45d00e96f81c5c63a75bc95af2
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- versionDev
rm:
- user_manual
prebuild:
- mkdir -p $HOME/.gradle
- echo "org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError"
> $HOME/.gradle/gradle.properties
scandelete:
- src/androidTest/assets/
- versionName: '20220329'
versionCode: 20220329
commit: 7ef2b0255ccc46b73019979e72bd31fc91338cb5
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- versionDev
rm:
- user_manual
prebuild:
- mkdir -p $HOME/.gradle
- echo "org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError"
> $HOME/.gradle/gradle.properties
scandelete:
- src/androidTest/assets/
- versionName: '20220331'
versionCode: 20220331
commit: 52bc2ab7bd3abf394f27cd78d73e4e68b7b04586

View file

@ -281,12 +281,7 @@ Builds:
- submodules
build:
- ../../scripts/prepare-exoplayer-ffmpeg.sh
- REACT_NATIVE_VERSION=`npm pkg get 'dependencies.react-native' | sed -E 's/^"([0-9]+\.[0-9]+\.[0-9]+)"/\1/'`
- REACT_NATIVE_VERSION_MINOR=`echo ${REACT_NATIVE_VERSION} | sed -E 's/^[0-9]+\.([0-9]+)\.[0-9]+/\1/'`
- pushd $$react-native-reanimated$$
- pushd ..
- yarn add react-native@"${REACT_NATIVE_VERSION}"
- popd
- FOR_HERMES=True gradle :assembleRelease
- popd
- mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-${REACT_NATIVE_VERSION_MINOR}-hermes.aar

View file

@ -809,46 +809,6 @@ Builds:
- sed -i -e 's/<lint>/<lint>\n <issue id="NullSafeMutableLiveData" severity="warning"
\/>/g' ../lint.xml
- versionName: 4.2.12
versionCode: 510
commit: 900b64a79f8d658473ccf5bec4975a8c1a4a2fd3
subdir: stopcovid
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- yes
rm:
- coreui/src/main/res/font/marianne_*.otf
- coreui/src/main/res/font/marianne.xml
prebuild:
- sed -i -e '/fontFamily.*marianne/d' ../coreui/src/main/res/values/styles_text.xml
../coreui/src/main/res/values/styles.xml ../stopcovid/src/main/res/layout/dcc_widget_no_fav_widget.xml
- sed -i -e 's/<lint>/<lint>\n <issue id="NullSafeMutableLiveData" severity="warning"
\/>/g' ../lint.xml
- versionName: 4.2.13
versionCode: 512
commit: 5bd85d28a37aff722a8ff1f5b140b2cd115b2ed9
subdir: stopcovid
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- yes
rm:
- coreui/src/main/res/font/marianne_*.otf
- coreui/src/main/res/font/marianne.xml
prebuild:
- sed -i -e '/fontFamily.*marianne/d' ../coreui/src/main/res/values/styles_text.xml
../coreui/src/main/res/values/styles.xml ../stopcovid/src/main/res/layout/dcc_widget_no_fav_widget.xml
- sed -i -e 's/<lint>/<lint>\n <issue id="NullSafeMutableLiveData" severity="warning"
\/>/g' ../lint.xml
- versionName: 4.2.14
versionCode: 514
commit: 70e7131b18543524fd29f8aac1a0cd6b8a983c81

View file

@ -28,6 +28,10 @@ Builds:
versionCode: 53
commit: 239f710810ea7fc6fffc56a95be8add7bd7edd50
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- yes
scanignore: