From d2b0416b50ba761c34b8ad916d30f1de7289e6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=A3=D8=AD=D9=85=D8=AF=20=D8=A7=D9=84=D9=85=D8=AD=D9=85?= =?UTF-8?q?=D9=88=D8=AF=D9=8A=20=28Ahmed=20El-Mahmoudy=29?= Date: Tue, 30 Jun 2015 14:16:49 +0200 Subject: [PATCH] Update Twidere to 0.3.0-dev-116 (116) Add RestFu & PickNCrop srclibs --- metadata/org.mariotaku.twidere.txt | 31 ++++++++++++++++++++++++++++++ srclibs/MariotakuPickNCrop.txt | 2 ++ srclibs/MariotakuRestFu.txt | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 srclibs/MariotakuPickNCrop.txt create mode 100644 srclibs/MariotakuRestFu.txt diff --git a/metadata/org.mariotaku.twidere.txt b/metadata/org.mariotaku.twidere.txt index 36440080e4..49c9f3c57e 100644 --- a/metadata/org.mariotaku.twidere.txt +++ b/metadata/org.mariotaku.twidere.txt @@ -379,6 +379,37 @@ Build:0.3.0-dev-115,115 sed -i -e '/versionNameSuffix String/aversionNameSuffix "-dev-$$VERCODE$$"' build.gradle && \ sed -i -e '/versionNameSuffix String/d' build.gradle +Build:0.3.0-dev-116,116 + commit=0.3.0-dev1506289 + subdir=twidere + submodules=yes + gradle=fdroid + srclibs=CWACMerge@v1.1.1,CWACSacklist@v1.0.2,MariotakuDragSort@0.6.1,MariotakuMessageBubbleView@1.2,MariotakuSlidingMenu@501a9988a4d95958fe634fc09d5dc332de7830b9,ColorPicker-uucky@0.9.7,AsyncManager@9391ed71d7f3665217ab782acf4e6902d2425547,MariotakuRestFu@d965fcf941,MariotakuPickNCrop@76563fae81 + rm=twidere.wear,twidere.extension.push.xiaomi,twidere.donate.nyanwp.wear,libraries/SlidingMenu/example + prebuild=sed -i -e '/googleCompile/d' -e '/amazonaws/d' -e '/jitpack/d' build.gradle && \ + cp -fR $$CWACMerge$$/merge/src/com src/main/java/ && \ + cp -fR $$CWACSacklist$$/sacklist/src/com src/main/java && \ + sed -i -e '/xujiaao/d' -e '/jitpack/d' ../build.gradle && \ + sed -i -e '/wearApp/d' ../twidere.donate.nyanwp/build.gradle && \ + mkdir -p ../libraries/colorpicker && \ + cp -fR $$ColorPicker-uucky$$ ../libraries/colorpicker && \ + mkdir -p ../libraries/dragsort && \ + cp -fR $$MariotakuDragSort$$ ../libraries/dragsort && \ + mkdir -p ../libraries/slidingmenu && \ + cp -fR $$MariotakuSlidingMenu$$ ../libraries/slidingmenu && \ + mkdir -p ../libraries/messagebubbleview && \ + cp -fR $$MariotakuMessageBubbleView$$ ../libraries/messagebubbleview && \ + cp -fR $$AsyncManager$$/asyncmanager ../libraries/ && \ + cp -fR $$MariotakuRestFu$$ ../libraries/restfu && \ + cp -fR $$MariotakuPickNCrop$$ ../libraries/pickncrop && \ + echo -e "\ninclude ':libraries:colorpicker:library'\ninclude ':libraries:dragsort:library'\ninclude ':libraries:slidingmenu:library'\ninclude ':libraries:messagebubbleview:library'\ninclude ':libraries:asyncmanager'\ninclude ':libraries:pickncrop:library'\ninclude ':libraries:restfu:library'" >> ../settings.gradle && \ + sed -i -e '/ColorPicker/acompile project(":libraries:colorpicker:library")' -e '/DragSortListView/acompile project(":libraries:dragsort:library")' -e '/SlidingMenu/acompile project(":libraries:slidingmenu:library")' -e '/MessageBubbleView/acompile project(":libraries:messagebubbleview:library")' -e '/AsyncManager/acompile project(":libraries:asyncmanager")' -e '/PickNCrop/acompile project(":libraries:pickncrop:library")' build.gradle && \ + sed -i -e '/ColorPicker/d' -e '/DragSortListView/d' -e '/SlidingMenu/d' -e '/MessageBubbleView/d' -e '/commonsware/d' -e '/AsyncManager/d' -e '/PickNCrop/d' build.gradle && \ + sed -i -e 's/compile.*RestFu.*/compile project(":libraries:restfu:library")/' ../twidere.component.common/build.gradle && \ + sed -i -e "/dependencies/aclasspath 'com.github.dcendents:android-maven-gradle-plugin:1.3'" ../build.gradle && \ + sed -i -e '/versionNameSuffix String/aversionNameSuffix "-dev-$$VERCODE$$"' build.gradle && \ + sed -i -e '/versionNameSuffix String/d' build.gradle + Maintainer Notes: * JonSerializer issues when using srclib, see: https://github.com/TwidereProject/Twidere-Android/issues/37 * We might want to install CWAC into mavenLocal. Use this instead of copying: diff --git a/srclibs/MariotakuPickNCrop.txt b/srclibs/MariotakuPickNCrop.txt new file mode 100644 index 0000000000..d135102fe5 --- /dev/null +++ b/srclibs/MariotakuPickNCrop.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:https://github.com/mariotaku/PickNCrop diff --git a/srclibs/MariotakuRestFu.txt b/srclibs/MariotakuRestFu.txt new file mode 100644 index 0000000000..fdaf95bbd9 --- /dev/null +++ b/srclibs/MariotakuRestFu.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:https://github.com/mariotaku/RestFu