From 6f39fca68ed434882209d2c34f4191482695a2c0 Mon Sep 17 00:00:00 2001 From: Piet Delport Date: Tue, 31 Mar 2015 19:11:14 +0200 Subject: [PATCH 01/10] Update Android SDK Build Tools to rev. 22.0.1 (March 2015) Changelog: https://developer.android.com/tools/revisions/build-tools.html --- library/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index e2a5bf978..2e1d66016 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -13,8 +13,8 @@ dependencies { } android { - compileSdkVersion 17 - buildToolsVersion "17.0.0" + compileSdkVersion 22 + buildToolsVersion '22.0.1' defaultConfig { minSdkVersion 7 From 273c4dac20e2660115b7e2957d1c6f244ceaac95 Mon Sep 17 00:00:00 2001 From: Piet Delport Date: Tue, 31 Mar 2015 19:13:45 +0200 Subject: [PATCH 02/10] Remove ignored *.iml files --- example/example.iml | 18 ------------------ library/library.iml | 19 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 example/example.iml delete mode 100644 library/library.iml 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/library.iml b/library/library.iml deleted file mode 100644 index a6e3c8f47..000000000 --- a/library/library.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - From cc745e47ded8f0876ae7d9161e1d802730b50855 Mon Sep 17 00:00:00 2001 From: Piet Delport Date: Tue, 31 Mar 2015 19:14:55 +0200 Subject: [PATCH 03/10] Add Gradle build output to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 9eed7dbf6..50e8a2c8b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ gen target/ *.iml + +# Gradle build +library/build/ From a69fdd0568c979d09123e415f33907a558f45607 Mon Sep 17 00:00:00 2001 From: Piet Delport Date: Tue, 31 Mar 2015 19:19:44 +0200 Subject: [PATCH 04/10] Update Android Gradle plugin to 1.1.0 This also updates the deprecated 'android-library' plugin id to 'com.android.library'. --- library/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 2e1d66016..df8044fa4 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,10 +3,10 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.4.+' + classpath 'com.android.tools.build:gradle:1.1.0' } } -apply plugin: 'android-library' +apply plugin: 'com.android.library' dependencies { compile 'com.android.support:support-v4:13.0.0' From 3f08502cb5df2b41a2e2d581b08d723608f06b3c Mon Sep 17 00:00:00 2001 From: Piet Delport Date: Wed, 14 Oct 2015 16:00:12 +0200 Subject: [PATCH 05/10] Update Android Gradle plugin: 1.1.0 -> 1.3.0 --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index df8044fa4..d62f0a3cc 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.0' + classpath 'com.android.tools.build:gradle:1.3.0' } } apply plugin: 'com.android.library' From 1701e48c274d01efe1583dbb21918f5a4a7aaa45 Mon Sep 17 00:00:00 2001 From: Piet Delport Date: Wed, 14 Oct 2015 16:00:32 +0200 Subject: [PATCH 06/10] (Ignore .gradle and local.properties) --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 50e8a2c8b..559aef1e5 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,6 @@ target/ *.iml # Gradle build +library/.gradle/ library/build/ +library/local.properties From ca846bd822af1a761cd93c74298ce958b7422998 Mon Sep 17 00:00:00 2001 From: Piet Delport Date: Wed, 14 Oct 2015 16:01:54 +0200 Subject: [PATCH 07/10] Remove Android SDK versions from AndroidManifest.xml These are ignored under Gradle. --- library/AndroidManifest.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 + From d5ba4ff5005aeccebfde3041670fb54663f11db8 Mon Sep 17 00:00:00 2001 From: Piet Delport Date: Wed, 14 Oct 2015 16:02:25 +0200 Subject: [PATCH 08/10] Update Android Support library version: 13.0.0 -> 23.0.1 --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index d62f0a3cc..c27e03047 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -9,7 +9,7 @@ buildscript { 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 { From 448895c175c2401df489156ddbe531b1da2b3783 Mon Sep 17 00:00:00 2001 From: Piet Delport Date: Wed, 14 Oct 2015 16:09:43 +0200 Subject: [PATCH 09/10] Update buildToolsVersion: 22.0.1 -> 23.0.1 --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index c27e03047..7b10b1177 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -14,7 +14,7 @@ dependencies { android { compileSdkVersion 22 - buildToolsVersion '22.0.1' + buildToolsVersion '23.0.1' defaultConfig { minSdkVersion 7 From 28f7cff5c7a9b2bb0a5cc4e9a056aa441802ac8b Mon Sep 17 00:00:00 2001 From: Piet Delport Date: Wed, 14 Oct 2015 16:25:15 +0200 Subject: [PATCH 10/10] Update compileSdkVersion: 22 -> 23 android.util.FloatMath was deprecated in 22, and removed in 23: this migrates to using java.lang.Math instead. --- library/build.gradle | 2 +- .../com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 7b10b1177..4265ddd42 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -13,7 +13,7 @@ dependencies { } android { - compileSdkVersion 22 + compileSdkVersion 23 buildToolsVersion '23.0.1' defaultConfig { 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) {