Skip to content

Commit

Permalink
Bumps libraries to kotlin 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
jeziellago committed Oct 9, 2020
1 parent 9b6e855 commit e12ae39
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 15 deletions.
9 changes: 2 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions lintversioncheck/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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),
Expand Down

0 comments on commit e12ae39

Please # to comment.