Skip to content

Commit

Permalink
Merge pull request #162 from square/ralf/fix-red-main-branch
Browse files Browse the repository at this point in the history
Use the Kotlin 1.4 dependencies in the gradle plugin
  • Loading branch information
vRallev authored Nov 20, 2020
2 parents f60d00d + 58b1b79 commit 91e93ab
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
7 changes: 0 additions & 7 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,6 @@ ext {
stdlib: "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion",
],

// Required until Gradle uses Kotlin 1.4.
kotlin_gradle: [
gradle_plugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72",
gradle_plugin_api: "org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.3.72",
stdlib: "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72",
],

kotlinpoet: "com.squareup:kotlinpoet:1.7.2",

truth: "com.google.truth:truth:1.0.1",
Expand Down
8 changes: 4 additions & 4 deletions gradle-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ buildscript {
}

dependencies {
classpath deps.kotlin_gradle.gradle_plugin
classpath deps.kotlin.gradle_plugin
classpath deps.maven_publishing_plugin
classpath deps.gradle_publishing_plugin
classpath deps.ktlint_plugin
Expand Down Expand Up @@ -75,9 +75,9 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
}

dependencies {
implementation deps.kotlin_gradle.gradle_plugin
implementation deps.kotlin_gradle.gradle_plugin_api
implementation deps.kotlin_gradle.stdlib
implementation deps.kotlin.gradle_plugin
implementation deps.kotlin.gradle_plugin_api
implementation deps.kotlin.stdlib

// Compile only so that Java / Kotlin modules don't download it unnecessarily.
compileOnly deps.android_gradle_plugin
Expand Down

0 comments on commit 91e93ab

Please sign in to comment.