From e6a8200e0e642476c3388117c38e14f064b2d6c9 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sat, 22 Nov 2014 11:14:50 +0100 Subject: [PATCH] Twidere: Prepare for repochange and 0.3.0-dev (98) --- metadata/org.mariotaku.twidere.txt | 37 ++++++++++++++++++++++++----- srclibs/CWACMerge.txt | 2 ++ srclibs/CWACSacklist.txt | 2 ++ srclibs/MariotakuJsonSerializer.txt | 2 ++ 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 srclibs/CWACMerge.txt create mode 100644 srclibs/CWACSacklist.txt create mode 100644 srclibs/MariotakuJsonSerializer.txt diff --git a/metadata/org.mariotaku.twidere.txt b/metadata/org.mariotaku.twidere.txt index 06cb5f5836..091ea289de 100644 --- a/metadata/org.mariotaku.twidere.txt +++ b/metadata/org.mariotaku.twidere.txt @@ -1,8 +1,8 @@ Categories:Internet License:GPLv3 Web Site: -Source Code:https://github.com/mariotaku/twidere -Issue Tracker:https://github.com/mariotaku/twidere/issues +Source Code:https://github.com/TwidereProject/Twidere-Android +Issue Tracker:https://github.com/TwidereProject/Twidere-Android/issues Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mariotaku.lee%40gmail%2ecom&item_name=Donate%20to%20Twidere Bitcoin:1FHAVAzge7cj1LfCTMfnLL49DgA3mVUCuW @@ -37,9 +37,11 @@ donations. . Repo Type:git +#Repo:https://github.com/TwidereProject/Twidere-Android Repo:https://github.com/mariotaku/twidere.git Build:0.2.9.5,81 + disable=repo changed commit=0.2.9.5 init=rm libs/android-support-v13.jar srclibs=1:ActionBar-PullToRefresh@v0.9.1,2:DragSort@0.6.1,3:SlidingMenu@7ebe32772 @@ -49,6 +51,7 @@ Build:0.2.9.5,81 cp libs/android-support-v4.jar $$DragSort$$/libs/ Build:0.2.9.6-update2,84 + disable=repo changed commit=13811314f8ab9f14 init=rm libs/android-support-v13.jar srclibs=1:ActionBar-PullToRefresh@v0.9.1,2:DragSort@0.6.1,3:SlidingMenu@7ebe32772 @@ -58,6 +61,7 @@ Build:0.2.9.6-update2,84 cp libs/android-support-v4.jar $$DragSort$$/libs/ Build:0.2.9.7-update1,86 + disable=repo changed commit=da803eb75188eb9 init=rm libs/android-support-v13.jar srclibs=1:ActionBar-PullToRefresh@v0.9.1,2:DragSort@0.6.1,3:SlidingMenu@7ebe32772 @@ -77,6 +81,7 @@ Build:0.2.9.8-update2,90 cp libs/android-support-v4.jar $$DragSort$$/libs/ Build:0.2.9.9,91 + disable=repo changed commit=8a07f3a809 init=rm libs/android-support-v13.jar srclibs=1:ActionBar-PullToRefresh@v0.9.2,2:DragSort@0.6.1,3:SlidingMenu@d929476be,4:HoloAccent@v0.9,5:MenuComponent@ee3d4,6:SmoothProgressBar@v0.3.2 @@ -87,6 +92,7 @@ Build:0.2.9.9,91 cp $$HoloAccent$$/libs/android-support-v4.jar $$MenuComponent$$/libs/ Build:0.2.9.10,92 + disable=repo changed commit=8858369 init=rm libs/android-support-v13.jar srclibs=SmoothProgressBar@0.3.3,1:RefreshNow@3090bcde2a,2:DragSort@0.6.1,3:SlidingMenu@d929476be,4:HoloAccent@v0.9,5:MenuComponent@b52ff0493,6:AndroidStaggeredGrid@1.0.3 @@ -113,12 +119,31 @@ Build:0.2.9.12,94 cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs/ target=android-19 +Build:0.3.0-dev,98 + disable=doesn't build + commit=49742e744692a213668a7855f75148b5f00877a0 + subdir=twidere + srclibs=dnsjava@dnsjava-2.1.6,CWACMerge@v1.0.1,CWACSacklist@v1.0.1,MariotakuJsonSerializer@accef1652fddc3ee965dfc7a2d334e2463f1afb5 + submodules=yes + gradle=fdroid + rm=twidere.wear,libraries/SlidingMenu/example,twidere/libs/*.jar + prebuild=sed -i -e '/googleCompile/d' build.gradle && \ + cp -fR $$CWACMerge$$/merge/src/com src/main/java/ && \ + cp -fR $$CWACSacklist$$/sacklist/src/com src/main/java && \ + cp -fR $$dnsjava$$/org src/main/java/ && \ + cp -fR $$MariotakuJsonSerializer$$/src/org src/main/java/ + Maintainer Notes: -Tags are for the 'dev' branch, not the 'fdroid' branch that we want to use. +* Tags are for the 'dev' branch, not the 'fdroid' branch that we want to use. +* JavaNetDns issue: package sun.net.spi.nameservice does not exist +* JonSerializer issues: https://github.com/TwidereProject/Twidere-Android/issues/37 +* We might want to install CWAC into mavenLocal. Use this instead of copying: + +sed -i -e '/googleCompile/d' -e "/twitter-text/acompile 'com.commonsware.cwac:merge:1.0.1'\ncompile 'com.commonsware.cwac:sacklist:1.0.0'" build.gradle && \ . Auto Update Mode:None -Update Check Mode:Tags -Current Version:0.2.9.12 -Current Version Code:94 +Update Check Mode:RepoManifest +Current Version:0.3.0-dev +Current Version Code:98 diff --git a/srclibs/CWACMerge.txt b/srclibs/CWACMerge.txt new file mode 100644 index 0000000000..eccf212878 --- /dev/null +++ b/srclibs/CWACMerge.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:https://github.com/commonsguy/cwac-merge diff --git a/srclibs/CWACSacklist.txt b/srclibs/CWACSacklist.txt new file mode 100644 index 0000000000..d5800c3ee6 --- /dev/null +++ b/srclibs/CWACSacklist.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:https://github.com/commonsguy/cwac-sacklist diff --git a/srclibs/MariotakuJsonSerializer.txt b/srclibs/MariotakuJsonSerializer.txt new file mode 100644 index 0000000000..6559effe2e --- /dev/null +++ b/srclibs/MariotakuJsonSerializer.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:https://github.com/mariotaku/jsonserializer