Merge branch 'merge-requests/121'

Conflicts:
	metadata/com.androsz.electricsleepbeta.txt
This commit is contained in:
David Black 2013-03-07 16:15:43 +00:00
commit 73f7744569
6 changed files with 10 additions and 19 deletions

View file

@ -13,7 +13,7 @@ ElectricSleep is a smarter alarm clock.
Repo Type:git
Repo:https://github.com/jondwillis/ElectricSleep.git
Build Version:1.1.1,50,!wait for patch 1.1.1,maven=yes,srclibs=NoAnalytics@158a4a,bindir=target,\
Build Version:1.1.1,50,1.1.1,maven=yes,srclibs=NoAnalytics@158a4a,bindir=target,\
prebuild=sed -i '79s/1.4.2/0.0.1/g' pom.xml && ant clean debug -f $$NoAnalytics$$/build.xml && \
sed -i '116s/android/android.apps/g' pom.xml && \
mvn install:install-file \

View file

@ -30,7 +30,7 @@ Build Version:1.2,700,1.2,maven=yes,bindir=app/target
Build Version:1.3.1,900,1.3.1,maven=yes,bindir=app/target
Build Version:1.4,1000,1.4,maven=yes,bindir=app/target
Build Version:1.5,1100,1.5,maven=yes,bindir=app/target
Build Version:1.6.1,1300,!Build failes - can't find apk (at 1.6.1),maven=yes,bindir=app/target
Build Version:1.6.1,1300,1.6.1,maven=yes,bindir=app/target
Auto Update Mode:Version %v
Update Check Mode:Market

View file

@ -13,10 +13,8 @@ their number. The web service is also FOSS.
Repo Type:git
Repo:git://gitorious.org/callerid-for-android/mainline.git
#Disabled pending figuring out how to stop it zipaligning....
#Build Version:1.0,1,e6d5a9ac4bb24a,subdir=application,maven=yes,bindir=application/target,prebuild=wget http://osmdroid.googlecode.com/files/osmdroid-android-3.0.3.jar && mvn install:install-file -DgroupId=org.osmdroid -DartifactId=osmdroid -Dversion=3.0.3 -Dpackaging=jar -Dfile=osmdroid-android-3.0.3.jar
Build Version:1.6,7,!can't find apk c54a018930a94d,subdir=application,maven=yes,bindir=application/target
Build Version:1.6,7,c54a018930a94d,subdir=application,maven=yes,bindir=application/target,prebuild=\
sed -i 's/1.4-SNAPSHOT/1.6/' pom.xml ../pom.xml
Update Check Mode:Market
Current Version:1.6

View file

@ -12,7 +12,7 @@ A git client - currently read-only.
Repo Type:git
Repo:https://github.com/rtyley/agit.git
Build Version:1.34,120801417,!can't find output (at agit-parent-1.34),maven=yes,bindir=agit/target
Build Version:1.37,130300220,!not working agit-parent-1.37,bindir=agit/target,maven=yes,forcevercode=yes
Auto Update Mode:None
Update Check Mode:Market

View file

@ -21,6 +21,8 @@ Build Version:0.5.21,48,!broken v0.5.21,buildjni=yes
Build Version:0.5.22,49,!broken v0.5.22,buildjni=yes
Build Version:0.5.24,51,!broken too v0.5.24,buildjni=no,target=android-14,prebuild=\
sed -i 's/ndk-build APP_API=all -j 8/ndk-build APP_ABI=all -j 2/g' build-native.sh && ./build-native.sh
Build Version:0.5.35,63,!broken too v0.5.35,buildjni=no,target=android-17,prebuild=\
sed -i 's/-j 8/-j 2/g' build-native.sh && ./build-native.sh
Auto Update Mode:None
Update Check Mode:Market

View file

@ -63,21 +63,12 @@ Build Version:0.9.6.1,22,0.9.6.1,srclibs=ActionBarSherlock@4.1.0;ViewPagerIndica
Build Version:0.9.6.2,23,0.9.6.2,srclibs=ActionBarSherlock@4.1.0;ViewPagerIndicator@2.3.1,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java,extlibs=flattr4j/flattr4j-core-2.4.jar;commons-lang/commons-lang3-3.1.jar;commons-io/commons-io-2.4.jar
Build Version:0.9.6.3,24,0.9.6.3,srclibs=ActionBarSherlock@4.1.0;ViewPagerIndicator@2.3.1,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java,extlibs=flattr4j/flattr4j-core-2.4.jar;commons-lang/commons-lang3-3.1.jar;commons-io/commons-io-2.4.jar
Build Version:0.9.6.4,25,0.9.6.4,srclibs=ActionBarSherlock@4.1.0;ViewPagerIndicator@2.4.1,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java,extlibs=flattr4j/flattr4j-core-2.4.jar;commons-lang/commons-lang3-3.1.jar;commons-io/commons-io-2.4.jar
Build Version:0.9.7,26,0.9.7,submodules=yes,\
extlibs=flattr4j/flattr4j-core-2.4.jar;commons-lang/commons-lang3-3.1.jar;commons-io/commons-io-2.4.jar,\
prebuild=\
$$SDK$$/tools/android update lib-project -p submodules/ActionBarSherlock/library/ -t "android-14" &&\
$$SDK$$/tools/android update lib-project -p submodules/ViewPagerIndicator/library/ -t "android-16" &&\
$$SDK$$/tools/android update lib-project -p submodules/dslv/library/ -t "android-14" &&\
cp submodules/ViewPagerIndicator/library/libs/android-support-v4.jar submodules/dslv/library/libs/ &&\
cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java
Build Version:0.9.7,26,0.9.7,maven=yes,submodules=yes,bindir=target,init=\
ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,\
prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java
Auto Update Mode:Version %v
Update Check Mode:Tags
Current Version:0.9.7
Current Version Code:26
#Build Version:0.9.7,26,!can't find apk 0.9.7,maven=yes,submodules=yes,init=\
#ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,\
#prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java