Skip to content

go for android 6 #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

go for android 6 #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc32114
fixes for android 6
Oct 27, 2015
0adb47d
fixes for android 6
Oct 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:0.10.+'
classpath 'com.android.tools.build:gradle:1.3.0'
}
}

Expand Down
6 changes: 3 additions & 3 deletions demo/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@ 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'
}
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-v4:19.1.+'
compile 'com.android.support:support-v4:23.1.0'
}


Expand Down
4 changes: 2 additions & 2 deletions library/src/main/java/it/sephiroth/android/library/widget/OverScroller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

/**
Expand Down