diff --git a/build.gradle b/build.gradle index cde8c03..0845a3d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.2.61' + ext.kotlin_version = '1.3.41' repositories { google() jcenter() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0-beta05' + classpath 'com.android.tools.build:gradle:3.6.0-alpha06' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } @@ -14,9 +14,9 @@ buildscript { allprojects { repositories { - mavenCentral() + mavenCentral() google() + maven { url "https://jitpack.io" } jcenter() - maven { url "https://jitpack.io" } } } diff --git a/gradle.properties b/gradle.properties index e69de29..5465fec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -0,0 +1,2 @@ +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bd24854..cd7237a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 186da0b..ede787f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -13,15 +13,15 @@ group = 'com.github.jitpack' version = '1.0' android { - compileSdkVersion 28 - buildToolsVersion "28.0.2" + compileSdkVersion 29 + buildToolsVersion "28.0.3" defaultConfig { - minSdkVersion 16 - targetSdkVersion 28 + minSdkVersion 21 + targetSdkVersion 29 versionCode 1 versionName version - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -40,13 +40,11 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - implementation 'com.android.support:appcompat-v7:28.0.0-rc01' + implementation 'androidx.appcompat:appcompat:1.0.2' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" }