From ddd8ab87837511f0aa8bc7d71a7a1b54c39b541d Mon Sep 17 00:00:00 2001 From: Jahir Fiquitiva Date: Sun, 8 Nov 2020 12:28:39 -0500 Subject: [PATCH] Update dependencies --- .travis.yml | 2 +- app/build.gradle | 16 ++++++++-------- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 14 +++++++------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3bfe80a..c42486e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ jdk: oraclejdk8 env: global: - - ANDROID_API=29 + - ANDROID_API=30 - ANDROID_BUILD_TOOLS=29.0.3 - EMULATOR_API=21 diff --git a/app/build.gradle b/app/build.gradle index c97e443..9a86476 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 + compileSdkVersion 30 buildToolsVersion "29.0.3" defaultConfig { applicationId "com.github.javiersantos.piracychecker.demo" minSdkVersion 14 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -39,18 +39,18 @@ dependencies { implementation project(':library') implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'com.google.android.material:material:1.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.2.1' implementation 'androidx.cardview:cardview:1.0.0' // Testing-only dependencies testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test:rules:1.2.0' - androidTestImplementation('androidx.test:runner:1.1.0', { + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test:rules:1.3.0' + androidTestImplementation('androidx.test:runner:1.3.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', { exclude group: 'com.android.support', module: 'support-annotations' }) } diff --git a/build.gradle b/build.gradle index 4ec67f6..63ab45a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.71' + ext.kotlin_version = '1.4.10' repositories { jcenter() google() maven { url 'https://jitpack.io' } } dependencies { - classpath 'com.android.tools.build:gradle:3.6.2' + classpath 'com.android.tools.build:gradle:4.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5640cdd..f507bba 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Sep 10 22:40:11 COT 2019 +#Sun Nov 08 12:25:50 COT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/library/build.gradle b/library/build.gradle index 838a7c2..75f5854 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -4,14 +4,14 @@ apply plugin: 'com.github.dcendents.android-maven' group = 'com.github.javiersantos' android { - compileSdkVersion 29 + compileSdkVersion 30 buildToolsVersion "29.0.3" defaultConfig { minSdkVersion 14 - targetSdkVersion 29 - versionCode 127 - versionName "1.2.7" + targetSdkVersion 30 + versionCode 128 + versionName "1.2.8" consumerProguardFiles 'proguard-rules.pro' } buildTypes { @@ -25,9 +25,9 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.preference:preference:1.1.0' - implementation 'com.google.android.material:material:1.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.preference:preference:1.1.1' + implementation 'com.google.android.material:material:1.2.1' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" }