Skip to content

Commit

Permalink
Merge pull request #21 from IgorGanapolsky/master
Browse files Browse the repository at this point in the history
Update gradle depependencies and AndroidX.
  • Loading branch information
jitpack-io authored Jan 2, 2021
2 parents 72a8004 + 2ffbdb3 commit ba9ce4b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
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'
}
}

allprojects {
repositories {
mavenCentral()
mavenCentral()
google()
maven { url "https://jitpack.io" }
jcenter()
maven { url "https://jitpack.io" }
}
}
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
android.enableJetifier=true
android.useAndroidX=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 8 additions & 10 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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"
}

Expand Down

0 comments on commit ba9ce4b

Please sign in to comment.