Skip to content

Commit

Permalink
Kotlin to 1.3.41
Browse files Browse the repository at this point in the history
  • Loading branch information
cortinico committed Jul 10, 2019
1 parent adf0516 commit 0fc64c7
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
java
`kotlin-dsl`
`maven-publish`
kotlin("jvm") version "1.3.31"
kotlin("jvm") version "1.3.41"
id("com.gradle.plugin-publish") version "0.10.0"
}

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/com/yelp/codegen/SharedCodegen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ abstract class SharedCodegen : DefaultCodegen(), CodegenConfig {
super.preprocessSwagger(swagger)

unsafeOperations.addAll(when (val it = swagger.info.vendorExtensions["x-operation-ids-unsafe-to-use"]) {
is List<*> -> it.filterIsInstance()
is List<*> -> it.filterIsInstance<String>()
else -> listOf()
})

Expand Down
1 change: 1 addition & 0 deletions plugin/src/main/kotlin/com/yelp/codegen/plugin.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ tasks {
specVersion = config.specVersion
inputFile = config.inputFile
outputDir = config.outputDir

extraFiles = config.extraFiles
features = config.features
}
Expand Down
6 changes: 3 additions & 3 deletions samples/generated-code/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {

dependencies {
classpath "com.android.tools.build:gradle:3.4.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41"
classpath "com.yelp.codegen:plugin:1.1.1"
}
}
Expand All @@ -30,8 +30,8 @@ android {

dependencies {
// Kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.31"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.41"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.41"

// Moshi
implementation "com.squareup.moshi:moshi:1.8.0"
Expand Down
6 changes: 3 additions & 3 deletions samples/groovy-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {

dependencies {
classpath "com.android.tools.build:gradle:3.4.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41"
classpath "com.yelp.codegen:plugin:1.1.1"
}
}
Expand All @@ -30,8 +30,8 @@ android {

dependencies {
// Kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.31"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.41"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.41"

// Moshi
implementation "com.squareup.moshi:moshi:1.8.0"
Expand Down
6 changes: 3 additions & 3 deletions samples/junit-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {

dependencies {
classpath "com.android.tools.build:gradle:3.4.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41"
classpath "com.yelp.codegen:plugin:1.1.1"
}
}
Expand All @@ -30,8 +30,8 @@ android {

dependencies {
// Kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.31"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.41"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.41"

// Moshi
implementation "com.squareup.moshi:moshi:1.8.0"
Expand Down
6 changes: 3 additions & 3 deletions samples/kotlin-android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.android.library") version "3.4.1"
kotlin("android") version "1.3.31"
kotlin("android") version "1.3.41"
id("com.yelp.codegen.plugin") version "1.1.1"
}

Expand All @@ -16,8 +16,8 @@ android {

dependencies {
// Kotlin
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.31")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.41")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.41")

// Moshi
implementation("com.squareup.moshi:moshi:1.8.0")
Expand Down

0 comments on commit 0fc64c7

Please sign in to comment.