diff --git a/build.gradle b/build.gradle index e148820..f085933 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.10.+' + classpath 'com.android.tools.build:gradle:1.3.0' } } diff --git a/demo/build.gradle b/demo/build.gradle index d0b160d..2f9ec57 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -5,14 +5,14 @@ dependencies { } android { - compileSdkVersion 19 - buildToolsVersion "19.0.3" + compileSdkVersion 23 + buildToolsVersion '23.0.1' defaultConfig { versionCode 1 versionName '1.0.0' minSdkVersion 9 - targetSdkVersion 19 + targetSdkVersion 23 } sourceSets { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 46e8179..29b90aa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 04 09:42:43 EST 2014 +#Tue Oct 27 11:05:58 CET 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip diff --git a/library/build.gradle b/library/build.gradle index 50608d5..4d1f988 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -4,18 +4,18 @@ group GROUP version VERSION_NAME android { - compileSdkVersion 19 - buildToolsVersion "19.0.3" + compileSdkVersion 23 + buildToolsVersion '23.0.1' defaultConfig { minSdkVersion 9 - targetSdkVersion 19 + targetSdkVersion 23 versionCode 1 versionName version } buildTypes { release { - runProguard false + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } @@ -23,7 +23,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:support-v4:19.1.+' + compile 'com.android.support:support-v4:23.1.0' } diff --git a/library/src/main/java/it/sephiroth/android/library/widget/OverScroller.java b/library/src/main/java/it/sephiroth/android/library/widget/OverScroller.java index e664c99..9560307 100644 --- a/library/src/main/java/it/sephiroth/android/library/widget/OverScroller.java +++ b/library/src/main/java/it/sephiroth/android/library/widget/OverScroller.java @@ -18,7 +18,7 @@ import android.content.Context; import android.hardware.SensorManager; -import android.util.FloatMath; +import java.lang.Math; import android.util.Log; import android.view.ViewConfiguration; import android.view.animation.AnimationUtils; @@ -200,7 +200,7 @@ public final int getCurrY() { public float getCurrVelocity() { float squaredNorm = mScrollerX.mCurrVelocity * mScrollerX.mCurrVelocity; squaredNorm += mScrollerY.mCurrVelocity * mScrollerY.mCurrVelocity; - return FloatMath.sqrt(squaredNorm); + return (float) Math.sqrt(squaredNorm); } /**