From f29d2e0d52d5337895e9911a8002f5f9c2b0dc79 Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@gmail.com> Date: Wed, 23 Jun 2021 10:55:45 +0100 Subject: [PATCH] Update gradle dependencies --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 14 ++++++++++---- sample/build.gradle | 17 +++++++++++------ 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 2cfcf08..4f1938b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.1' + classpath 'com.android.tools.build:gradle:4.2.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e21d31..9185224 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 4e1be01..6742fed 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -46,6 +46,11 @@ android { lintOptions { abortOnError false } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } } task checkstyle(type: Checkstyle) { @@ -60,7 +65,8 @@ task checkstyle(type: Checkstyle) { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.2.0' } + implementation 'androidx.appcompat:appcompat:1.3.0' +} // Bintray installing and uploading scripts // Can be found here: https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle @@ -110,7 +116,7 @@ install { if (project.hasProperty("android")) { // Android libraries task sourcesJar(type: Jar) { - classifier = 'sources' + archiveClassifier.set('sources') from android.sourceSets.main.java.srcDirs } @@ -120,13 +126,13 @@ if (project.hasProperty("android")) { // Android libraries } } else { // Java libraries task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' + archiveClassifier.set('sources') from sourceSets.main.allSource } } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + archiveClassifier.set('javadoc') from javadoc.destinationDir } diff --git a/sample/build.gradle b/sample/build.gradle index 1dc7da7..e54b4e6 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -24,6 +24,11 @@ android { packagingOptions { exclude 'LICENSE.txt' } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } } task checkstyle(type: Checkstyle) { @@ -38,13 +43,13 @@ task checkstyle(type: Checkstyle) { dependencies{ implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.appcompat:appcompat:1.3.0' implementation project(":library") - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' - androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0' - androidTestImplementation 'androidx.test:runner:1.1.0' - androidTestImplementation 'androidx.test:rules:1.1.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0' + androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation 'androidx.test:rules:1.3.0' } \ No newline at end of file