Merge branch 'master' of gitorious.org:f-droid/fdroiddata

This commit is contained in:
David Black 2013-06-24 17:01:12 +01:00
commit b3436d30a1
3 changed files with 9 additions and 7 deletions

View file

@ -34,11 +34,10 @@ ActionBarSherlock@4.1.0;PullToRefresh@v1.4.1.1,extlibs=\
acra/acra-4.4.0.jar;commons-collections/commons-collections-3.2.1.jar;commons-lang/commons-lang3-3.1.jar;\ acra/acra-4.4.0.jar;commons-collections/commons-collections-3.2.1.jar;commons-lang/commons-lang3-3.1.jar;\
osmdroid/osmdroid-android-3.0.8.jar;sl4j/slf4j-android-1.6.1-RC1.jar;junit/junit-4.8.1.jar,prebuild=\ osmdroid/osmdroid-android-3.0.8.jar;sl4j/slf4j-android-1.6.1-RC1.jar;junit/junit-4.8.1.jar,prebuild=\
sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \ sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$/library@' project.properties && \ sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
sed -i 's@\(android.library.reference.3=\).*@\1$$PullToRefresh$$/extras/PullToRefreshListFragment@' project.properties && \ sed -i 's@\(android.library.reference.3=\).*@\1$$PullToRefresh$$/../extras/PullToRefreshListFragment@' project.properties && \
$$SDK$$/tools/android update project -p $$PullToRefresh$$/library -s && \ $$SDK$$/tools/android update project -p $$PullToRefresh$$/../extras/PullToRefreshListFragment -s && \
$$SDK$$/tools/android update project -p $$PullToRefresh$$/extras/PullToRefreshListFragment -s && \ cp $$PullToRefresh$$/../extras/PullToRefreshListFragment/libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
cp $$PullToRefresh$$/extras/PullToRefreshListFragment/libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
Auto Update Mode:None Auto Update Mode:None
#Can't find version code on playmarket; Tags are behind #Can't find version code on playmarket; Tags are behind

View file

@ -25,8 +25,7 @@ Repo:https://github.com/sozialhelden/wheelmap-android.git
Build Version:0.8.3,16,0.8.3_release,subdir=Wheelmap,\ Build Version:0.8.3,16,0.8.3_release,subdir=Wheelmap,\
srclibs=PullToRefresh@v1.3.0;NoAnalytics@158a4a,rm=Wheelmap/libs/libGoogleAnalytics.jar,prebuild=\ srclibs=PullToRefresh@v1.3.0;NoAnalytics@158a4a,rm=Wheelmap/libs/libGoogleAnalytics.jar,prebuild=\
$$SDK$$/tools/android update project -p $$PullToRefresh$$/library && \ sed -i 's@\(android.library.reference.1=\).*@\1$$PullToRefresh$$@' project.properties && \
sed -i 's@\(android.library.reference.1=\).*@\1$$PullToRefresh$$/library@' project.properties && \
echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties
#See Readme for using switch to disable Google Analytics, to be run in root directory #See Readme for using switch to disable Google Analytics, to be run in root directory

View file

@ -1,3 +1,7 @@
Repo Type:git Repo Type:git
Repo:https://github.com/chrisbanes/Android-PullToRefresh.git Repo:https://github.com/chrisbanes/Android-PullToRefresh.git
Subdir:library
Update Project:Yes