Skip to content

Commit f31f505

Browse files
committed
bump build tools versions and minSdkVersion to 14
1 parent ca58c04 commit f31f505

File tree

6 files changed

+24
-26
lines changed

6 files changed

+24
-26
lines changed

build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
google()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.5.0'
9+
classpath 'com.android.tools.build:gradle:3.0.0-beta5'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
@@ -15,5 +16,6 @@ buildscript {
1516
allprojects {
1617
repositories {
1718
jcenter()
19+
google()
1820
}
1921
}
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Fri Sep 15 20:50:04 ART 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

library/build.gradle

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.2"
4+
compileSdkVersion 26
5+
buildToolsVersion '26.0.1'
66

77
defaultConfig {
8-
minSdkVersion 9
9-
targetSdkVersion 23
8+
minSdkVersion 14
9+
targetSdkVersion 26
1010
}
1111
buildTypes {
1212
release {
@@ -17,10 +17,9 @@ android {
1717

1818

1919
dependencies {
20-
compile 'com.nineoldandroids:library:2.4.0'
21-
compile 'com.android.support:appcompat-v7:23.1.1'
22-
compile 'com.android.support:recyclerview-v7:23.1.1'
20+
compile 'com.android.support:appcompat-v7:26.0.2'
21+
compile 'com.android.support:recyclerview-v7:26.0.2'
2322
}
2423

2524
apply from: '../maven_push.gradle'
26-
}
25+
}

library/src/main/java/fr/ganfra/materialspinner/MaterialSpinner.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package fr.ganfra.materialspinner;
22

3+
import android.animation.ObjectAnimator;
4+
import android.animation.ValueAnimator;
35
import android.content.Context;
46
import android.content.res.TypedArray;
57
import android.graphics.Canvas;
@@ -25,9 +27,6 @@
2527
import android.widget.SpinnerAdapter;
2628
import android.widget.TextView;
2729

28-
import com.nineoldandroids.animation.ObjectAnimator;
29-
import com.nineoldandroids.animation.ValueAnimator;
30-
3130

3231
public class MaterialSpinner extends AppCompatSpinner implements ValueAnimator.AnimatorUpdateListener {
3332

@@ -964,4 +963,4 @@ private SpinnerAdapter getWrappedAdapter() {
964963
return mSpinnerAdapter;
965964
}
966965
}
967-
}
966+
}

sample/build.gradle

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.2"
4+
compileSdkVersion 26
5+
buildToolsVersion '26.0.1'
66

77
defaultConfig {
8-
applicationId "fr.ganfra.materialspinner.sample"
9-
minSdkVersion 9
10-
targetSdkVersion 23
8+
applicationId 'fr.ganfra.materialspinner.sample'
9+
minSdkVersion 14
10+
targetSdkVersion 26
1111
versionCode 4
12-
versionName "1.1.0"
12+
versionName '1.1.0'
1313
}
1414
buildTypes {
1515
release {
@@ -20,8 +20,6 @@ android {
2020
}
2121

2222
dependencies {
23-
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:appcompat-v7:23.1.1'
23+
compile 'com.android.support:appcompat-v7:26.0.2'
2524
compile project(':library')
26-
2725
}

sample/src/main/java/fr/ganfra/materialspinner/sample/MainActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package fr.ganfra.materialspinner.sample;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.ActionBarActivity;
4+
import android.support.v7.app.AppCompatActivity;
55
import android.view.View;
66
import android.widget.ArrayAdapter;
77

88
import fr.ganfra.materialspinner.MaterialSpinner;
99

1010

11-
public class MainActivity extends ActionBarActivity {
11+
public class MainActivity extends AppCompatActivity {
1212

1313
private static final String ERROR_MSG = "Very very very long error message to get scrolling or multiline animation when the error button is clicked";
1414
private static final String[] ITEMS = {"Item 1", "Item 2", "Item 3", "Item 4", "Item 5", "Item 6"};

0 commit comments

Comments
 (0)