From e12ae39a86e9f9d3cf0efd56c256264b2a2e77ae Mon Sep 17 00:00:00 2001 From: Jeziel Lago Date: Thu, 8 Oct 2020 15:39:35 -0300 Subject: [PATCH] Bumps libraries to kotlin 1.4 --- build.gradle | 9 ++------- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- lintversioncheck/build.gradle.kts | 7 ++++--- .../gradlelint/versioncheck/VersionCheckerGradleLint.kt | 3 +-- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index cb9ba6a..ea14005 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,13 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { - ext.kotlin_version = '1.3.72' + ext.kotlin_version = '1.4.10' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files } } diff --git a/gradle.properties b/gradle.properties index 0ff4204..e3f703f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ android.enableJetifier=true kotlin.code.style=official # Info to Maven Publish -library.version=0.1.3 +library.version=0.1.4 library.groupId=com.picpay.gradlelint library.artifactId=version-checker library.repository=version-checker-gradle-lint diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 01a4271..4eee64e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Apr 30 12:36:54 BRT 2020 +#Thu Oct 08 15:30:34 BRT 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.1.1-all.zip diff --git a/lintversioncheck/build.gradle.kts b/lintversioncheck/build.gradle.kts index a40f871..5271b2b 100644 --- a/lintversioncheck/build.gradle.kts +++ b/lintversioncheck/build.gradle.kts @@ -13,9 +13,10 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72") - implementation("com.android.tools.lint:lint-api:26.6.3") - implementation("com.android.tools.lint:lint-checks:26.6.3") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10") + implementation("org.jetbrains.kotlin:kotlin-reflect:1.4.10") + implementation("com.android.tools.lint:lint-api:27.0.2") + implementation("com.android.tools.lint:lint-checks:27.0.2") testImplementation("junit:junit:4.13") } diff --git a/lintversioncheck/src/main/java/com/picpay/gradlelint/versioncheck/VersionCheckerGradleLint.kt b/lintversioncheck/src/main/java/com/picpay/gradlelint/versioncheck/VersionCheckerGradleLint.kt index ab8395e..45960ab 100644 --- a/lintversioncheck/src/main/java/com/picpay/gradlelint/versioncheck/VersionCheckerGradleLint.kt +++ b/lintversioncheck/src/main/java/com/picpay/gradlelint/versioncheck/VersionCheckerGradleLint.kt @@ -16,7 +16,6 @@ import com.picpay.gradlelint.versioncheck.extensions.getVarNameInVersionDeclarat import com.picpay.gradlelint.versioncheck.extensions.getVarValueFromVersionsFileLines import com.picpay.gradlelint.versioncheck.extensions.isVersionNumber import com.picpay.gradlelint.versioncheck.extensions.removeComments -import com.picpay.gradlelint.versioncheck.extensions.tokenize import com.picpay.gradlelint.versioncheck.extensions.tokenizeCodeLine import com.picpay.gradlelint.versioncheck.library.Library import com.picpay.gradlelint.versioncheck.library.toLibrary @@ -80,7 +79,7 @@ class VersionCheckerGradleLint : Detector(), Detector.GradleScanner { val enableCheckForPreReleases: Boolean = properties .getProperty(LINT_ENABLE_CHECK_PRE_RELEASES) - ?.toBoolean() ?: false + .toBoolean() val librariesKotlinFiles = getMapOfKotlinFilesFromBuildSrc( buildSrcDir = getBuildSrcDir(context.project.dir),