Merge branch 'Twidere' into 'master'

Update Twidere to 0.3.0-dev-117 (117)

See merge request !859
This commit is contained in:
Boris Kraut 2015-07-08 14:43:15 +00:00
commit e32b5ac8cf
2 changed files with 35 additions and 0 deletions

View file

@ -410,6 +410,39 @@ Build:0.3.0-dev-116,116
sed -i -e '/versionNameSuffix String/aversionNameSuffix "-dev-$$VERCODE$$"' build.gradle && \
sed -i -e '/versionNameSuffix String/d' build.gradle
Build:0.3.0-dev-117,117
commit=0.3.0-dev150706
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@0.9,MariotakuPickNCrop@44b09cbc69,MariotakuSQLiteQB@ef3f596199
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 && \
cp -fR $$MariotakuSQLiteQB$$ ../libraries/sqliteqb && \
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'\ninclude ':libraries:sqliteqb: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 's/compile.*SQLiteQB.*/compile project(":libraries:sqliteqb: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:

View file

@ -0,0 +1,2 @@
Repo Type:git
Repo:https://github.com/mariotaku/SQLiteQB