Merge remote-tracking branch 'upstream/master'

This commit is contained in:
yoimox 2015-03-20 10:52:46 -04:00
commit 8c649b8b07
7 changed files with 44 additions and 0 deletions

View file

@ -25,6 +25,11 @@ Build:1.2,4
gradle=yes
prebuild=sed -i -e 's@lista/string@lista</string@g' src/main/res/values-pt/strings.xml
Build:2.0,5
commit=bf6b5d17d208770c0b773d6b3015074c0d38a4b7
subdir=privacypolice
gradle=yes
Auto Update Mode:None
Update Check Mode:RepoManifest
Current Version:2.0

View file

@ -35,6 +35,11 @@ Build:2.0.5,205
subdir=app
gradle=yes
Build:2.1.1,211
commit=108616ab3f6df5f168827fffa08c162df6999676
subdir=app
gradle=yes
Auto Update Mode:None
Update Check Mode:RepoManifest
Current Version:2.1.1

View file

@ -68,6 +68,17 @@ Build:2.0.3,8
sed -i -e 's/com.android.support:support-v4:+/com.android.support:support-v4:20.+/g' build.gradle && \
cp -fR $$PkRequestManager$$/PkRequestManager/src/com src/main/java/
Build:2.1,10
disable=play-services
commit=v2.1
subdir=MainActivity22/app
gradle=yes
srclibs=PkRequestManager@v1.0
rm=.metadata,actionbarsherlock,MainActivity22/build,MainActivity22/app/libs/*
prebuild=echo "sdk.dir=$$SDK$$" > ../local.properties && \
sed -i -e 's/com.android.support:support-v4:+/com.android.support:support-v4:20.+/g' build.gradle && \
cp -fR $$PkRequestManager$$/PkRequestManager/src/com src/main/java/
Auto Update Mode:None
Update Check Mode:Tags
Current Version:2.1

View file

@ -25,6 +25,11 @@ Build:1.5.1,12
subdir=NetInfo_Widget
gradle=yes
Build:1.5.2,13
commit=2ddcd8a0aed2d712f3df50d9bd4345106bb14d8a
subdir=NetInfo_Widget
gradle=yes
Auto Update Mode:None
Update Check Mode:RepoManifest
Current Version:1.5.2

View file

@ -65,6 +65,11 @@ Build:2.4,501
subdir=app
gradle=yes
Build:2.5.1,520
commit=2.5.1
subdir=app
gradle=yes
Auto Update Mode:None
Update Check Mode:RepoManifest
Current Version:2.5.1

View file

@ -41,6 +41,14 @@ Build:1.6.1,161
subdir=LC1
gradle=yes
Build:1.7.0,1703
commit=v1.7.0b
subdir=LC1
gradle=yes
disable=play-services (wear)
rm=wear
prebuild=sed -i -e '/play-services/d' -e '/wearApp/d' build.gradle && sed -i -e '/wear/d' ../settings.gradle
Auto Update Mode:None
Update Check Mode:Tags
Current Version:1.7.0

View file

@ -43,6 +43,11 @@ Build:1.0.6,7
subdir=app
gradle=yes
Build:1.0.7,8
commit=423d21efa0f2177d36c58a356155755df23b9821
subdir=app
gradle=yes
Auto Update Mode:None
Update Check Mode:RepoManifest
Current Version:1.0.7