fix Twidere build and remove old versions

This commit is contained in:
Torsten Grote 2014-04-01 21:34:46 +02:00
parent e1a81ed658
commit 997bbb7826
3 changed files with 14 additions and 131 deletions

View file

@ -24,7 +24,6 @@ Features include:
Development is focussed on Twitter and that service is the only one officially
supported.
Versions prior to 0.2.0 use Twitter API v1.0.
If you want a StatusNet account press the button at the top of the account
setup page.
@ -40,90 +39,6 @@ donations.
Repo Type:git
Repo:https://github.com/mariotaku/twidere.git
# needs Google API to build but also works without Google Maps installed
# using later commit for 0.1.1 because it includes bugfix
Build:0.1.1,28
commit=4db856984ecb1636daf6c97947dcb49069ec1c11
target=Google Inc.:Google APIs:16
Build:0.1.3,31
commit=5a577b1c0248e0
target=Google Inc.:Google APIs:16
Build:0.1.5,33
commit=b3409715af
target=Google Inc.:Google APIs:16
Build:0.1.6,35
commit=b87d64e197
target=Google Inc.:Google APIs:16
Build:0.1.8,39
commit=4946938d3
target=Google Inc.:Google APIs:16
Build:0.1.9,42
commit=ff62cd1fb
target=Google Inc.:Google APIs:16
Build:0.2.0,47
commit=0.2.0
patch=constants.patch
Build:0.2.0.5,48
disable=no source
commit=unknown
Build:0.2.1,49
commit=0.2.1
patch=constants.patch
prebuild=rm -rf dist/
# From here on it can't find some symbols that should come fron android-support-v4.jar
Build:0.2.2,50
disable=build error
commit=0.2.2
patch=constants.patch
prebuild=rm -rf dist/
Build:0.2.8.3,72
disable=still fails
commit=eefd4bf2d79f21f0
patch=constants1.patch
prebuild=rm -rf dist/ art/
# From here on, the api keys are already hard-coded in the source code
Build:0.2.8.6,76
disable=still fails
commit=8b7f5477018d6cc56a
prebuild=rm -rf dist/ art/
Build:0.2.9.1,78
disable=Fails due to missing symbols - see https://github.com/mariotaku/twidere/issues/74
commit=0.2.9.1
prebuild=rm -rf dist/ art/
Build:0.2.9.3,79
disable=builds but crashes during setup
commit=0.2.9.3
init=rm libs/android-support-v13.jar
extlibs=android/android-support-v4.jar,android/android-support-v13.jar
srclibs=1:ActionBar-PullToRefresh@v0.9.1,2:DragSort@0.6.1,3:SlidingMenu@7ebe32772
patch=GooglePlay.patch
prebuild=rm -rf dist/ art/ src/org/mariotaku/twidere/fragment/support/NativeMapFragment.java && \
cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \
cp libs/android-support-v4.jar $$DragSort$$/libs/
Build:0.2.9.4,80
commit=0.2.9.4
init=rm libs/android-support-v13.jar
extlibs=android/android-support-v4.jar,android/android-support-v13.jar
srclibs=1:ActionBar-PullToRefresh@v0.9.1,2:DragSort@0.6.1,3:SlidingMenu@7ebe32772
patch=GooglePlay.patch
prebuild=rm -rf dist/ art/ src/org/mariotaku/twidere/fragment/support/NativeMapFragment.java && \
cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \
cp libs/android-support-v4.jar $$DragSort$$/libs/
Build:0.2.9.5,81
commit=0.2.9.5
init=rm libs/android-support-v13.jar
@ -185,11 +100,12 @@ Build:0.2.9.10,92
cp $$HoloAccent$$/libs/android-support-v4.jar $$AndroidStaggeredGrid$$/libs/
Build:0.2.9.12,94
commit=503153f
commit=503153f4ec
target=android-19
rm=dist,art
patch=HomeActivity.patch
extlibs=android/android-support-v4.jar
srclibs=SmoothProgressBar@0.3.3,1:RefreshNow@3090bcde2a,2:DragSort@0.6.1,3:SlidingMenu@4254feca3ec,4:HoloAccent@v0.9.1,5:MenuComponent@2caf41895e,6:AndroidStaggeredGrid@1.0.4,7:ViewPagerIndicator@2.4.1
srclibs=SmoothProgressBar@0.4.0,1:RefreshNow@edea0165172e3,2:DragSort@0.6.1,3:SlidingMenu@4254feca3ec,4:HoloAccent@v0.9.1,5:MenuComponent@2caf41895e,6:AndroidStaggeredGrid@1.0.4,7:ViewPagerIndicator@2.4.1
prebuild=cp libs/android-support-v4.jar $$DragSort$$/libs/ && \
cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \
cp libs/android-support-v4.jar $$MenuComponent$$/libs/ && \

View file

@ -1,43 +0,0 @@
diff --git a/project.properties b/project.properties
index 79a96c4..910deaf 100644
--- a/project.properties
+++ b/project.properties
@@ -13,4 +13,3 @@ target=android-19
android.library.reference.1=../ActionBar-PullToRefresh
android.library.reference.2=../drag-sort-listview
android.library.reference.3=../SlidingMenu
-android.library.reference.4=../google-play-services_lib
diff --git a/src/org/mariotaku/twidere/activity/MapViewerActivity.java b/src/org/mariotaku/twidere/activity/MapViewerActivity.java
index 23e9fc7..d8d5a3f 100644
--- a/src/org/mariotaku/twidere/activity/MapViewerActivity.java
+++ b/src/org/mariotaku/twidere/activity/MapViewerActivity.java
@@ -26,13 +26,9 @@ import android.support.v4.app.FragmentTransaction;
import android.view.Menu;
import android.view.MenuItem;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GooglePlayServicesUtil;
-
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.support.TwidereSwipeBackActivity;
-import org.mariotaku.twidere.fragment.support.NativeMapFragment;
import org.mariotaku.twidere.fragment.support.WebMapFragment;
import org.mariotaku.twidere.util.MapInterface;
import org.mariotaku.twidere.util.ThemeUtils;
@@ -92,13 +88,13 @@ public class MapViewerActivity extends TwidereSwipeBackActivity implements Const
finish();
return;
}
- final Fragment fragment = isNativeMapSupported() ? new NativeMapFragment() : new WebMapFragment();
+ final Fragment fragment = new WebMapFragment();
fragment.setArguments(bundle);
final FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
ft.replace(android.R.id.content, fragment).commit();
}
private boolean isNativeMapSupported() {
- return GooglePlayServicesUtil.isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS;
+ return false;
}
}

View file

@ -0,0 +1,10 @@
--- a/src/org/mariotaku/twidere/activity/support/HomeActivity.java
+++ b/src/org/mariotaku/twidere/activity/support/HomeActivity.java
@@ -896,7 +896,6 @@
return super.dispatchTouchEvent(ev);
}
- @Override
protected CustomViewBehind newCustomViewBehind(final Context context) {
return new MyCustomViewBehind(context, this);
}