Skip to content

Commit ba9ce4b

Browse files
authored
Merge pull request #21 from IgorGanapolsky/master
Update gradle depependencies and AndroidX.
2 parents 72a8004 + 2ffbdb3 commit ba9ce4b

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
buildscript {
2-
ext.kotlin_version = '1.2.61'
2+
ext.kotlin_version = '1.3.41'
33
repositories {
44
google()
55
jcenter()
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.0-beta05'
9+
classpath 'com.android.tools.build:gradle:3.6.0-alpha06'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1212
}
1313
}
1414

1515
allprojects {
1616
repositories {
17-
mavenCentral()
17+
mavenCentral()
1818
google()
19+
maven { url "https://jitpack.io" }
1920
jcenter()
20-
maven { url "https://jitpack.io" }
2121
}
2222
}

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
android.enableJetifier=true
2+
android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip

library/build.gradle

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ group = 'com.github.jitpack'
1313
version = '1.0'
1414

1515
android {
16-
compileSdkVersion 28
17-
buildToolsVersion "28.0.2"
16+
compileSdkVersion 29
17+
buildToolsVersion "28.0.3"
1818

1919
defaultConfig {
20-
minSdkVersion 16
21-
targetSdkVersion 28
20+
minSdkVersion 21
21+
targetSdkVersion 29
2222
versionCode 1
2323
versionName version
24-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
24+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2525
}
2626
buildTypes {
2727
release {
@@ -40,13 +40,11 @@ android {
4040
}
4141

4242
dependencies {
43-
implementation fileTree(dir: 'libs', include: ['*.jar'])
44-
4543
testImplementation 'junit:junit:4.12'
46-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
47-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
44+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
45+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
4846

49-
implementation 'com.android.support:appcompat-v7:28.0.0-rc01'
47+
implementation 'androidx.appcompat:appcompat:1.0.2'
5048
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
5149
}
5250

0 commit comments

Comments
 (0)