Skip to content

Update Gradle and Android SDK to current versions #737

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
pi-byteorbit wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Update Gradle and Android SDK to current versions #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6f39fca
Update Android SDK Build Tools to rev. 22.0.1 (March 2015)
PiDelport Mar 31, 2015
273c4da
Remove ignored *.iml files
PiDelport Mar 31, 2015
cc745e4
Add Gradle build output to .gitignore
PiDelport Mar 31, 2015
a69fdd0
Update Android Gradle plugin to 1.1.0
PiDelport Mar 31, 2015
3f08502
Update Android Gradle plugin: 1.1.0 -> 1.3.0
PiDelport Oct 14, 2015
1701e48
(Ignore .gradle and local.properties)
PiDelport Oct 14, 2015
ca846bd
Remove Android SDK versions from AndroidManifest.xml
PiDelport Oct 14, 2015
d5ba4ff
Update Android Support library version: 13.0.0 -> 23.0.1
PiDelport Oct 14, 2015
448895c
Update buildToolsVersion: 22.0.1 -> 23.0.1
PiDelport Oct 14, 2015
28f7cff
Update compileSdkVersion: 22 -> 23
PiDelport Oct 14, 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
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,8 @@ gen
target/

*.iml

# Gradle build
library/.gradle/
library/build/
library/local.properties
18 changes: 0 additions & 18 deletions example/example.iml
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions library/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,4 @@
android:versionCode="1"
android:versionName="1.0" >

<uses-sdk
android:minSdkVersion="5"
android:targetSdkVersion="17" />

</manifest>
</manifest>
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 @@ -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
Expand Down
19 changes: 0 additions & 19 deletions library/library.iml
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down