diff --git a/.gitignore b/.gitignore index 9eed7dbf6..559aef1e5 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,8 @@ gen target/ *.iml + +# Gradle build +library/.gradle/ +library/build/ +library/local.properties diff --git a/example/example.iml b/example/example.iml deleted file mode 100644 index 24b793878..000000000 --- a/example/example.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml index 2d9e88a9e..244140328 100644 --- a/library/AndroidManifest.xml +++ b/library/AndroidManifest.xml @@ -4,8 +4,4 @@ android:versionCode="1" android:versionName="1.0" > - - - \ No newline at end of file + diff --git a/library/build.gradle b/library/build.gradle index e2a5bf978..4265ddd42 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,18 +3,18 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.4.+' + classpath 'com.android.tools.build:gradle:1.3.0' } } -apply plugin: 'android-library' +apply plugin: 'com.android.library' dependencies { - compile 'com.android.support:support-v4:13.0.0' + compile 'com.android.support:support-v4:23.0.1' } android { - compileSdkVersion 17 - buildToolsVersion "17.0.0" + compileSdkVersion 23 + buildToolsVersion '23.0.1' defaultConfig { minSdkVersion 7 diff --git a/library/library.iml b/library/library.iml deleted file mode 100644 index a6e3c8f47..000000000 --- a/library/library.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java index fa73ef05b..342a1599c 100644 --- a/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java @@ -13,7 +13,6 @@ import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewConfigurationCompat; import android.util.AttributeSet; -import android.util.FloatMath; import android.util.Log; import android.view.FocusFinder; import android.view.KeyEvent; @@ -300,7 +299,7 @@ public void clearIgnoredViews() { float distanceInfluenceForSnapDuration(float f) { f -= 0.5f; // center the values about 0. f *= 0.3f * Math.PI / 2.0f; - return (float) FloatMath.sin(f); + return (float) Math.sin(f); } public int getDestScrollX(int page) {