Skip to content

Commit

Permalink
Update library and samples to ActionBarCompat. Remove sample_sherlock
Browse files Browse the repository at this point in the history
  • Loading branch information
mwong56 committed Jul 12, 2015
1 parent 30dd1ac commit a51e34d
Show file tree
Hide file tree
Showing 29 changed files with 42 additions and 521 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.1.2'
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.github.dcendents:android-maven-plugin:1.2'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jul 02 17:20:01 CST 2014
#Sat Jul 11 17:40:25 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
17 changes: 7 additions & 10 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'

version = "1.0.0"

repositories {
mavenCentral()
}

dependencies {
compile 'com.android.support:support-v4:21.0.3'
compile 'com.android.support:appcompat-v7:22.2.0'
}

android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
compileSdkVersion 22
buildToolsVersion "22.0.1"

defaultConfig {
minSdkVersion 7
targetSdkVersion 21
targetSdkVersion 22
versionCode 1
versionName version
versionName "1.0.0"
}
}

/*
def siteUrl = 'https://github.com/ikew0ng/SwipeBackLayout'
def gitUrl = 'https://github.com/ikew0ng/SwipeBackLayout.git'
group = "me.imid.swipebacklayout.lib"
Expand Down Expand Up @@ -91,4 +88,4 @@ bintray {
licenses = ["Apache-2.0"]
publish = true
}
}
}*/
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@

import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.support.v7.app.AppCompatActivity;
import android.view.View;

import me.imid.swipebacklayout.lib.SwipeBackLayout;
import me.imid.swipebacklayout.lib.Utils;

public class SwipeBackActivity extends FragmentActivity implements SwipeBackActivityBase {
public class SwipeBackActivity extends AppCompatActivity implements SwipeBackActivityBase {
private SwipeBackActivityHelper mHelper;

@Override
Expand Down
Binary file removed sample_sherlock/libs/android-support-v4.jar
Binary file not shown.
30 changes: 0 additions & 30 deletions sample_sherlock/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit a51e34d

Please sign in to comment.