Merge pull request #43 from Yelp/update-deps

Updating all the dependencies
Yelp · Jul 10, 2019 · 45041f4 · 45041f4
2 parents adf0516 + a65dc13
commit 45041f4
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 41 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -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"
 }
 

diff --git a/plugin/src/main/java/com/yelp/codegen/SharedCodegen.kt b/plugin/src/main/java/com/yelp/codegen/SharedCodegen.kt
@@ -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()
         })
 

diff --git a/plugin/src/main/kotlin/com/yelp/codegen/plugin.gradle.kts b/plugin/src/main/kotlin/com/yelp/codegen/plugin.gradle.kts
@@ -13,6 +13,7 @@ tasks {
         specVersion = config.specVersion
         inputFile = config.inputFile
         outputDir = config.outputDir
+
         extraFiles = config.extraFiles
         features = config.features
     }

diff --git a/samples/generated-code/build.gradle b/samples/generated-code/build.gradle
@@ -8,8 +8,8 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:3.4.1"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31"
+        classpath "com.android.tools.build:gradle:3.4.2"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41"
         classpath "com.yelp.codegen:plugin:1.1.1"
     }
 }
@@ -30,21 +30,23 @@ 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
+    // Moshi + OkHttp + Retrofit
     implementation "com.squareup.moshi:moshi:1.8.0"
     implementation "com.squareup.moshi:moshi-adapters:1.8.0"
     implementation "com.squareup.moshi:moshi-kotlin:1.8.0"
-    implementation "com.squareup.retrofit2:converter-moshi:2.5.0"
-    implementation "com.squareup.retrofit2:adapter-rxjava2:2.5.0"
+    implementation "com.squareup.okhttp3:okhttp:3.12.3"
+    implementation "com.squareup.retrofit2:retrofit:2.6.0"
+    implementation "com.squareup.retrofit2:converter-moshi:2.6.0"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:2.6.0"
 
     // Date Support
-    implementation "com.jakewharton.threetenabp:threetenabp:1.1.1"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
 
     // RxJava
-    implementation "io.reactivex.rxjava2:rxjava:2.2.9"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.10"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
 
     // Testing Dependencies

diff --git a/samples/groovy-android/build.gradle b/samples/groovy-android/build.gradle
@@ -8,8 +8,8 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:3.4.1"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31"
+        classpath "com.android.tools.build:gradle:3.4.2"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41"
         classpath "com.yelp.codegen:plugin:1.1.1"
     }
 }
@@ -21,30 +21,32 @@ apply plugin: "com.yelp.codegen.plugin"
 android {
     compileSdkVersion = 28
     defaultConfig {
-        minSdkVersion = 21
-        targetSdkVersion = 28
+        minSdkVersion 21
+        targetSdkVersion 28
         versionCode = 1
         versionName = "1.0"
     }
 }
 
 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
+    // Moshi + OkHttp + Retrofit
     implementation "com.squareup.moshi:moshi:1.8.0"
     implementation "com.squareup.moshi:moshi-adapters:1.8.0"
     implementation "com.squareup.moshi:moshi-kotlin:1.8.0"
-    implementation "com.squareup.retrofit2:converter-moshi:2.5.0"
-    implementation "com.squareup.retrofit2:adapter-rxjava2:2.5.0"
+    implementation "com.squareup.okhttp3:okhttp:3.12.3"
+    implementation "com.squareup.retrofit2:retrofit:2.6.0"
+    implementation "com.squareup.retrofit2:converter-moshi:2.6.0"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:2.6.0"
 
     // Date Support
-    implementation "com.jakewharton.threetenabp:threetenabp:1.1.1"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
 
     // RxJava
-    implementation "io.reactivex.rxjava2:rxjava:2.2.9"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.10"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
 }
 

diff --git a/samples/junit-tests/build.gradle b/samples/junit-tests/build.gradle
@@ -8,8 +8,8 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:3.4.1"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31"
+        classpath "com.android.tools.build:gradle:3.4.2"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41"
         classpath "com.yelp.codegen:plugin:1.1.1"
     }
 }
@@ -30,21 +30,23 @@ 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
+    // Moshi + OkHttp + Retrofit
     implementation "com.squareup.moshi:moshi:1.8.0"
     implementation "com.squareup.moshi:moshi-adapters:1.8.0"
     implementation "com.squareup.moshi:moshi-kotlin:1.8.0"
-    implementation "com.squareup.retrofit2:converter-moshi:2.5.0"
-    implementation "com.squareup.retrofit2:adapter-rxjava2:2.5.0"
+    implementation "com.squareup.okhttp3:okhttp:3.12.3"
+    implementation "com.squareup.retrofit2:retrofit:2.6.0"
+    implementation "com.squareup.retrofit2:converter-moshi:2.6.0"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:2.6.0"
 
     // Date Support
-    implementation "com.jakewharton.threetenabp:threetenabp:1.1.1"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
 
     // RxJava
-    implementation "io.reactivex.rxjava2:rxjava:2.2.9"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.10"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
 
     // Testing Dependencies

diff --git a/samples/kotlin-android/build.gradle.kts b/samples/kotlin-android/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.library") version "3.4.1"
-    kotlin("android") version "1.3.31"
+    id("com.android.library") version "3.4.2"
+    kotlin("android") version "1.3.41"
     id("com.yelp.codegen.plugin") version "1.1.1"
 }
 
@@ -16,21 +16,23 @@ 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
+    // Moshi + OkHttp + Retrofit
     implementation("com.squareup.moshi:moshi:1.8.0")
     implementation("com.squareup.moshi:moshi-adapters:1.8.0")
     implementation("com.squareup.moshi:moshi-kotlin:1.8.0")
-    implementation("com.squareup.retrofit2:converter-moshi:2.5.0")
-    implementation("com.squareup.retrofit2:adapter-rxjava2:2.5.0")
+    implementation("com.squareup.okhttp3:okhttp:3.12.3")
+    implementation("com.squareup.retrofit2:retrofit:2.6.0")
+    implementation("com.squareup.retrofit2:converter-moshi:2.6.0")
+    implementation("com.squareup.retrofit2:adapter-rxjava2:2.6.0")
 
     // Date Support
-    implementation("com.jakewharton.threetenabp:threetenabp:1.1.1")
+    implementation("com.jakewharton.threetenabp:threetenabp:1.2.1")
 
     // RxJava
-    implementation("io.reactivex.rxjava2:rxjava:2.2.9")
+    implementation("io.reactivex.rxjava2:rxjava:2.2.10")
     implementation("io.reactivex.rxjava2:rxandroid:2.1.1")
 }