Skip to content

Commit 7230103

Browse files
committed
updated gradle and appcompat dependency
1 parent 5ca10ea commit 7230103

File tree

6 files changed

+20
-17
lines changed

6 files changed

+20
-17
lines changed

app/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion parent.ext.androidCompileSdkVersion
5-
buildToolsVersion parent.ext.androidBuildToolsVersion
65

76
defaultConfig {
87
minSdkVersion parent.ext.androidMinSdkVersion
@@ -31,7 +30,7 @@ android {
3130
}
3231

3332
dependencies {
34-
compile fileTree(dir: 'libs', include: ['*.jar'])
35-
compile parent.ext.libAppcompat
36-
compile project(':library')
33+
implementation fileTree(dir: 'libs', include: ['*.jar'])
34+
implementation parent.ext.libAppcompat
35+
implementation project(':library')
3736
}

app/src/main/java/me/srodrigo/androidhintspinnersample/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
package me.srodrigo.androidhintspinnersample;
88

99
import android.os.Bundle;
10-
import android.support.v7.app.ActionBarActivity;
1110
import android.view.View;
1211
import android.view.ViewGroup;
1312
import android.widget.Button;
@@ -18,11 +17,12 @@
1817
import java.util.ArrayList;
1918
import java.util.List;
2019

20+
import androidx.appcompat.app.AppCompatActivity;
2121
import me.srodrigo.androidhintspinner.HintAdapter;
2222
import me.srodrigo.androidhintspinner.HintSpinner;
2323

2424

25-
public class MainActivity extends ActionBarActivity {
25+
public class MainActivity extends AppCompatActivity {
2626

2727
private static final String VALUE_STRING = "Value %d";
2828

build.gradle

Lines changed: 6 additions & 4 deletions
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.1.0'
9+
classpath 'com.android.tools.build:gradle:4.1.0-rc02'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
@@ -24,19 +25,20 @@ allprojects {
2425
// Android config
2526
androidBuildToolsVersion = '22.0.1'
2627
androidMinSdkVersion = 14
27-
androidTargetSdkVersion = 22
28-
androidCompileSdkVersion = 22
28+
androidTargetSdkVersion = 29
29+
androidCompileSdkVersion = 29
2930
androidVersionCode = VERSION_CODE.toInteger()
3031
androidVersionName = VERSION_NAME
3132

3233
// Libraries
33-
libAppcompat = 'com.android.support:appcompat-v7:22.0.0'
34+
libAppcompat = "androidx.appcompat:appcompat:1.2.0"
3435
libJunit = 'junit:junit:4.12'
3536
libRobolectric = 'org.robolectric:robolectric:2.4'
3637
libMockito = 'org.mockito:mockito-core:1.10.19'
3738
}
3839

3940
repositories {
4041
jcenter()
42+
google()
4143
}
4244
}

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ VERSION_NAME=1.0.0
2121
VERSION_CODE=1
2222
GROUP=me.srodrigo
2323

24+
android.useAndroidX=true
25+
2426
POM_DESCRIPTION=A hint spinner that allows showing a hint, similar to the HTML Select
2527
POM_URL=https://github.com/srodrigo/Android-Hint-Spinner
2628
POM_SCM_URL=https://github.com/srodrigo/Android-Hint-Spinner
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Tue Sep 01 16:07:12 CEST 2020
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-6.5-bin.zip

library/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ android {
3131
}
3232

3333
dependencies {
34-
androidTestCompile parent.ext.libJunit
35-
compile fileTree(dir: 'libs', include: ['*.jar'])
36-
compile parent.ext.libAppcompat
37-
androidTestCompile (parent.ext.libRobolectric) {
34+
androidTestImplementation parent.ext.libJunit
35+
api fileTree(dir: 'libs', include: ['*.jar'])
36+
api parent.ext.libAppcompat
37+
androidTestImplementation (parent.ext.libRobolectric) {
3838
exclude module: 'commons-logging'
3939
exclude module: 'httpclient'
4040
}
41-
androidTestCompile parent.ext.libMockito
41+
androidTestImplementation parent.ext.libMockito
4242
}
4343

4444
apply from: '../maven_push.gradle'

0 commit comments

Comments
 (0)