Skip to content

Commit f028642

Browse files
committed
Merge pull request ikew0ng#76 from mwong56/update
Update library and samples to ActionBarCompat. Remove sample_sherlock
2 parents 78e1d8d + a51e34d commit f028642

File tree

29 files changed

+42
-521
lines changed

29 files changed

+42
-521
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
jcenter()
44
}
55
dependencies {
6-
classpath 'com.android.tools.build:gradle:1.1.2'
6+
classpath 'com.android.tools.build:gradle:1.2.3'
77
classpath 'com.github.dcendents:android-maven-plugin:1.2'
88
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
99
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Jul 02 17:20:01 CST 2014
1+
#Sat Jul 11 17:40:25 PDT 2015
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip

library/build.gradle

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'com.github.dcendents.android-maven'
3-
apply plugin: 'com.jfrog.bintray'
4-
5-
version = "1.0.0"
62

73
repositories {
84
mavenCentral()
95
}
106

117
dependencies {
12-
compile 'com.android.support:support-v4:21.0.3'
8+
compile 'com.android.support:appcompat-v7:22.2.0'
139
}
1410

1511
android {
16-
compileSdkVersion 21
17-
buildToolsVersion "21.1.2"
12+
compileSdkVersion 22
13+
buildToolsVersion "22.0.1"
1814

1915
defaultConfig {
2016
minSdkVersion 7
21-
targetSdkVersion 21
17+
targetSdkVersion 22
2218
versionCode 1
23-
versionName version
19+
versionName "1.0.0"
2420
}
2521
}
2622

23+
/*
2724
def siteUrl = 'https://github.com/ikew0ng/SwipeBackLayout'
2825
def gitUrl = 'https://github.com/ikew0ng/SwipeBackLayout.git'
2926
group = "me.imid.swipebacklayout.lib"
@@ -91,4 +88,4 @@ bintray {
9188
licenses = ["Apache-2.0"]
9289
publish = true
9390
}
94-
}
91+
}*/

library/src/main/java/me/imid/swipebacklayout/lib/app/SwipeBackActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33

44
import android.os.Bundle;
55
import android.support.v4.app.FragmentActivity;
6+
import android.support.v7.app.AppCompatActivity;
67
import android.view.View;
78

89
import me.imid.swipebacklayout.lib.SwipeBackLayout;
910
import me.imid.swipebacklayout.lib.Utils;
1011

11-
public class SwipeBackActivity extends FragmentActivity implements SwipeBackActivityBase {
12+
public class SwipeBackActivity extends AppCompatActivity implements SwipeBackActivityBase {
1213
private SwipeBackActivityHelper mHelper;
1314

1415
@Override
-543 KB
Binary file not shown.

sample_sherlock/src/main/AndroidManifest.xml

Lines changed: 0 additions & 30 deletions
This file was deleted.

sample_sherlock/src/main/java/me/imid/swipebacklayout/demo/sherlock/DemoSherlockActivity.java

Lines changed: 0 additions & 180 deletions
This file was deleted.

sample_sherlock/src/main/java/me/imid/swipebacklayout/demo/sherlock/PreferenceUtils.java

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)