Skip to content

Commit

Permalink
Remove ActionBarSherlock
Browse files Browse the repository at this point in the history
  • Loading branch information
cketti committed Jun 21, 2014
1 parent 103f85a commit ba69b3a
Show file tree
Hide file tree
Showing 475 changed files with 185 additions and 38,903 deletions.
1 change: 0 additions & 1 deletion .project
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<name>k9mail</name>
<comment></comment>
<projects>
<project>k9mail-ActionBarSherlock</project>
<project>k9mail-Android-PullToRefresh</project>
<project>k9mail-ckChangeLog</project>
<project>k9mail-HoloColorPicker</project>
Expand Down
4 changes: 1 addition & 3 deletions Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
LOCAL_MODULE_TAGS := eng

LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SRC_FILES += $(call all-java-files-under, plugins/ActionBarSherlock/library/src)
LOCAL_SRC_FILES += $(call all-java-files-under, plugins/Android-PullToRefresh/library/src)
LOCAL_SRC_FILES += $(call all-java-files-under, plugins/ckChangeLog/library/src)
LOCAL_SRC_FILES += $(call all-java-files-under, plugins/HoloColorPicker/src)

res_dir := res plugins/ActionBarSherlock/library/res plugins/Android-PullToRefresh/library/res plugins/ckChangeLog/library/res plugins/HoloColorPicker/res
res_dir := res plugins/Android-PullToRefresh/library/res plugins/ckChangeLog/library/res plugins/HoloColorPicker/res
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))

LOCAL_SDK_VERSION := current
Expand All @@ -28,7 +27,6 @@ LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
LOCAL_AAPT_FLAGS := --auto-add-overlay
LOCAL_AAPT_FLAGS += --extra-packages de.cketti.library.changelog
LOCAL_AAPT_FLAGS += --extra-packages android.support.v4.app
LOCAL_AAPT_FLAGS += --extra-packages com.actionbarsherlock
LOCAL_AAPT_FLAGS += --extra-packages com.handmark.pulltorefresh.library
LOCAL_AAPT_FLAGS += --extra-packages com.larswerkman.colorpicker

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ buildscript {
apply plugin: 'android'

dependencies {
compile project(':plugins:ActionBarSherlock:library')
compile project(':plugins:Android-PullToRefresh:library')
compile project(':plugins:ckChangeLog:library')
compile project(':plugins:HoloColorPicker')
compile project(':plugins:openpgp-api-library')
compile 'com.android.support:support-v13:19.1.0'
compile fileTree(dir: 'libs', include: '*.jar')
}

Expand Down
16 changes: 1 addition & 15 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -399,20 +399,6 @@
<delete dir="${javadoc-dir}" verbose="${verbose}" />
</target>

<target name="-update-abs">
<if.contrib>
<resourceexists>
<file file="plugins/ActionBarSherlock/library/build.xml" />
</resourceexists>
<else>
<echo message="android update lib-project -p plugins/ActionBarSherlock/library/" />
<exec executable="${sdk.dir}/tools/${android.executable}" failonerror="true">
<arg line="update lib-project -p plugins/ActionBarSherlock/library/" />
</exec>
</else>
</if.contrib>
</target>

<target name="-update-ptr">
<if.contrib>
<resourceexists>
Expand Down Expand Up @@ -469,7 +455,7 @@
</if.contrib>
</target>

<target name="init" depends="-update-abs, -update-ptr, -update-cl, -update-hcp, -update-opa"
<target name="init" depends="-update-ptr, -update-cl, -update-hcp, -update-opa"
description="Initialize environment for building" />

<!-- overrides default "debug" target" -->
Expand Down
34 changes: 0 additions & 34 deletions plugins/ActionBarSherlock/.gitignore

This file was deleted.

11 changes: 0 additions & 11 deletions plugins/ActionBarSherlock/.travis.yml

This file was deleted.

Loading

0 comments on commit ba69b3a

Please sign in to comment.