From 6a21101afc41daf672763c8413eaf5fad7759af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc> Date: Mon, 24 Jun 2013 14:44:30 +0200 Subject: [PATCH 1/3] PullToRefresh requires updating the project --- srclibs/PullToRefresh.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srclibs/PullToRefresh.txt b/srclibs/PullToRefresh.txt index e14927e64d..6957703a1b 100644 --- a/srclibs/PullToRefresh.txt +++ b/srclibs/PullToRefresh.txt @@ -1,3 +1,5 @@ Repo Type:git Repo:https://github.com/chrisbanes/Android-PullToRefresh.git +Update Project:Yes + From 86414262d8ab29a9ea3f2da7722dc588052dcfb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc> Date: Mon, 24 Jun 2013 14:53:25 +0200 Subject: [PATCH 2/3] PullToRefresh has a subdir, remove Update --- srclibs/PullToRefresh.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srclibs/PullToRefresh.txt b/srclibs/PullToRefresh.txt index 6957703a1b..73584e5817 100644 --- a/srclibs/PullToRefresh.txt +++ b/srclibs/PullToRefresh.txt @@ -1,5 +1,5 @@ Repo Type:git Repo:https://github.com/chrisbanes/Android-PullToRefresh.git -Update Project:Yes +Subdir:library From 1996b968242de768583cf05c762dc9ee27ca22cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc> Date: Mon, 24 Jun 2013 14:57:00 +0200 Subject: [PATCH 3/3] Fix PullToRefresh recipes --- metadata/com.vlille.checker.txt | 9 ++++----- metadata/org.wheelmap.android.online.txt | 3 +-- srclibs/PullToRefresh.txt | 2 ++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/metadata/com.vlille.checker.txt b/metadata/com.vlille.checker.txt index abd5016a2b..6358d4e098 100644 --- a/metadata/com.vlille.checker.txt +++ b/metadata/com.vlille.checker.txt @@ -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;\ 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.2=\).*@\1$$PullToRefresh$$/library@' 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 && \ -cp $$PullToRefresh$$/extras/PullToRefreshListFragment/libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ +sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \ +sed -i 's@\(android.library.reference.3=\).*@\1$$PullToRefresh$$/../extras/PullToRefreshListFragment@' project.properties && \ +$$SDK$$/tools/android update project -p $$PullToRefresh$$/../extras/PullToRefreshListFragment -s && \ +cp $$PullToRefresh$$/../extras/PullToRefreshListFragment/libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ Auto Update Mode:None #Can't find version code on playmarket; Tags are behind diff --git a/metadata/org.wheelmap.android.online.txt b/metadata/org.wheelmap.android.online.txt index 10e37556ee..ce889aa5f5 100644 --- a/metadata/org.wheelmap.android.online.txt +++ b/metadata/org.wheelmap.android.online.txt @@ -25,8 +25,7 @@ Repo:https://github.com/sozialhelden/wheelmap-android.git 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=\ -$$SDK$$/tools/android update project -p $$PullToRefresh$$/library && \ -sed -i 's@\(android.library.reference.1=\).*@\1$$PullToRefresh$$/library@' project.properties && \ +sed -i 's@\(android.library.reference.1=\).*@\1$$PullToRefresh$$@' 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 diff --git a/srclibs/PullToRefresh.txt b/srclibs/PullToRefresh.txt index 73584e5817..6eeed0d4aa 100644 --- a/srclibs/PullToRefresh.txt +++ b/srclibs/PullToRefresh.txt @@ -3,3 +3,5 @@ Repo:https://github.com/chrisbanes/Android-PullToRefresh.git Subdir:library +Update Project:Yes +