Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pull request #671

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

pull request #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
05f6824
Making SlidingMenu work with Maven (outdated pom)
eropple Mar 18, 2013
c744e10
Merge https://github.com/jfeinstein10/SlidingMenu
eropple Jul 9, 2013
0330adc
Merge commit 'd929476bee721e295f7e73d7395e29ca090c122b'
seanedwards Jan 7, 2014
0e5535e
Merge commit '4254feca3ece9397cd501921ee733f19ea0fdad8'
seanedwards May 9, 2014
8222662
Updated SlidingMenu pom
seanedwards May 29, 2014
82e4b52
Extends sherlock activity
srikanthgupta Aug 18, 2014
fb62f90
added actionsherlockbar dependency
ankithabandaru Aug 18, 2014
b7e1c0c
Commented library-maps-support in modules section
ankithabandaru Aug 22, 2014
336ca6e
Commented library-maps-support in modules section
ankithabandaru Aug 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions library/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
<groupId>com.google.android</groupId>
<artifactId>support-v4</artifactId>
</dependency>
<dependency>
<groupId>com.actionbarsherlock</groupId>
<artifactId>actionbarsherlock</artifactId>
<version>4.4.0</version>
<type>apklib</type>
</dependency>
</dependencies>

<build>
Expand Down
3 changes: 2 additions & 1 deletion library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import com.actionbarsherlock.app.SherlockActivity;

import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu;

public class SlidingActivity extends Activity implements SlidingActivityBase {
public class SlidingActivity extends SherlockActivity implements SlidingActivityBase {

private SlidingActivityHelper mHelper;

Expand Down
7 changes: 4 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@

<modules>
<module>library</module>
<module>library-maps-support</module>
<!-- This is not used, so commenting this out -->
<!--<module>library-maps-support</module>-->
</modules>

<scm>
Expand Down Expand Up @@ -66,7 +67,7 @@
<dependency>
<groupId>com.google.android.maps</groupId>
<artifactId>maps</artifactId>
<version>17_r1</version>
<version>19_r5</version>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
Expand All @@ -82,7 +83,7 @@
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<version>3.6.0</version>
<version>3.9.0-rc.2</version>

<configuration>
<sdk>
Expand Down