Merge branch 'trifa_1.0.5__' into 'master'

trifa 1.0.5

See merge request !2356
This commit is contained in:
Michel Le Bihan 2017-06-30 20:05:20 +00:00
commit 1891f4de91

View file

@ -24,7 +24,22 @@ Build:1.0.3,10003
subdir=android-refimpl-app/app subdir=android-refimpl-app/app
gradle=yes gradle=yes
Build:1.0.4,10004
commit=c94404779343280593fc42a93a246b6496fd240c
subdir=android-refimpl-app/app
gradle=yes
prebuild=cd ../gwitness ; rm -f build/libs/* ; gradle build --info && \
cp build/libs/gwitness.jar ./gwitness.jar && \
sed -i -e 's#../gwitness/build/libs/gwitness.jar#../gwitness/gwitness.jar#' ../app/build.gradle
scanignore=android-refimpl-app/gwitness/gwitness.jar
Build:1.0.5,10005
commit=5d4349e31333ba4ae67caafba4976322841ee6d3
subdir=android-refimpl-app/app
gradle=yes
ndk=r13b
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:None Update Check Mode:None
Current Version:1.0.3 Current Version:1.0.5
Current Version Code:10003 Current Version Code:10005