Merge branch 'master' into 'master'
Typo with version number fixed. See merge request !1592
This commit is contained in:
commit
95c5777c3a
|
@ -87,22 +87,8 @@ Build:1.0.16.2,43
|
||||||
gradle=yes
|
gradle=yes
|
||||||
scanignore=app/src/main/resources/org/joda/time/tz/data
|
scanignore=app/src/main/resources/org/joda/time/tz/data
|
||||||
|
|
||||||
Build:1.1.0,45
|
Build:1.0.1.2,46
|
||||||
commit=v1.1.0.1
|
commit=v1.0.1.2
|
||||||
subdir=app
|
|
||||||
submodules=yes
|
|
||||||
gradle=yes
|
|
||||||
prebuild=mkdir -p libs && \
|
|
||||||
touch libs/tangram-release.aar #gradle clean will barf if this file doesn't exist
|
|
||||||
scanignore=app/src/main/resources/org/joda/time/tz/data
|
|
||||||
build=echo -e '#!/bin/sh\ngradle "$@"' > ../lib/tangram-es/android/gradlew && \
|
|
||||||
chmod +x ../lib/tangram-es/android/gradlew && \
|
|
||||||
../lib/tangram-es/android_aar_build.sh && \
|
|
||||||
cp ../lib/tangram-es/android/tangram/build/outputs/aar/tangram-release.aar libs
|
|
||||||
ndk=r10e
|
|
||||||
|
|
||||||
Build:1.1.0.2,46
|
|
||||||
commit=v1.1.0.2
|
|
||||||
subdir=app
|
subdir=app
|
||||||
submodules=yes
|
submodules=yes
|
||||||
gradle=yes
|
gradle=yes
|
||||||
|
@ -117,5 +103,5 @@ Build:1.1.0.2,46
|
||||||
|
|
||||||
Auto Update Mode:Version v%v
|
Auto Update Mode:Version v%v
|
||||||
Update Check Mode:Tags
|
Update Check Mode:Tags
|
||||||
Current Version:1.1.0.2
|
Current Version:1.0.1.2
|
||||||
Current Version Code:46
|
Current Version Code:46
|
||||||
|
|
Loading…
Reference in a new issue