Merge branch 'Twidere' into 'master'

Update Twidere to 0.3.0-dev-fdroid (110)

See merge request !735
This commit is contained in:
Boris Kraut 2015-04-26 20:31:10 +00:00
commit 340dbbbe38

View file

@ -219,6 +219,32 @@ Build:0.3.0-dev-fdroid,108
sed -i -e '/versionNameSuffix String/aversionNameSuffix "-dev-fdroid"' build.gradle && \
sed -i -e '/versionNameSuffix String/d' build.gradle
Build:0.3.0-dev-fdroid,110
commit=1a0d3eeb838d0a3585c18212361d12d3b54a93f8
subdir=twidere
submodules=yes
gradle=fdroid
srclibs=CWACMerge@v1.1.1,CWACSacklist@v1.0.2,MariotakuDragSort@0.6.1,MariotakuMessageBubbleView@1.0,MariotakuSlidingMenu@501a9988a4d95958fe634fc09d5dc332de7830b9,ColorPicker-uucky@0.9.4
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' ../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 && \
echo -e "\ninclude ':libraries:colorpicker:library'\ninclude ':libraries:dragsort:library'\ninclude ':libraries:slidingmenu:library'\ninclude ':libraries:messagebubbleview: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")' build.gradle -e '/MessageBubbleView/acompile project(":libraries:messagebubbleview:library")' && \
sed -i -e '/ColorPicker/d' -e '/DragSortListView/d' -e '/SlidingMenu/d' -e '/MessageBubbleView/d' -e '/commonsware/d' build.gradle && \
sed -i -e '/versionNameSuffix String/aversionNameSuffix "-dev-fdroid"' 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:
@ -228,5 +254,5 @@ sed -i -e '/googleCompile/d' -e "/twitter-text/acompile 'com.commonsware.cwac:me
Auto Update Mode:None
Update Check Mode:RepoManifest
Current Version:0.3.0
Current Version Code:108
Current Version Code:110