Update several dependencies (#80)

Update several dependencies
Yelp · Jan 20, 2020 · 1f522ec · 1f522ec
2 parents 9d9edce + bdda4b0
commit 1f522ec
Show file tree

Hide file tree

Showing 11 changed files with 681 additions and 143 deletions.
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
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.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -8,9 +8,9 @@ plugins {
     `kotlin-dsl`
     `maven-publish`
     jacoco
-    kotlin("jvm") version "1.3.50"
-    id("com.gradle.plugin-publish") version "0.10.0"
-    id("io.gitlab.arturbosch.detekt") version "1.0.1"
+    kotlin("jvm") version "1.3.61"
+    id("com.gradle.plugin-publish") version "0.10.1"
+    id("io.gitlab.arturbosch.detekt") version "1.4.0"
 }
 
 java {
@@ -54,11 +54,9 @@ pluginBundle {
 }
 
 detekt {
-    toolVersion = "1.0.1"
+    toolVersion = "1.4.0"
     input = files("src/")
-    config = files("./detekt-config.yml")
-    buildUponDefaultConfig = true
-    filters = ".*/resources/.*,.*/build/.*"
+    config = rootProject.files("./config/detekt/detekt.yml")
 }
 
 tasks.jacocoTestReport {

diff --git a/plugin/detekt-config.yml b/plugin/detekt-config.yml
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.5.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"
+        classpath "com.android.tools.build:gradle:3.5.3"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
         classpath "com.yelp.codegen:plugin:1.2.0"
     }
 }
@@ -30,28 +30,28 @@ android {
 
 dependencies {
     // Kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.50"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.61"
 
     // 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.moshi:moshi:1.9.2"
+    implementation "com.squareup.moshi:moshi-adapters:1.9.2"
+    implementation "com.squareup.moshi:moshi-kotlin:1.9.2"
     implementation "com.squareup.okhttp3:okhttp:3.12.3"
-    implementation "com.squareup.retrofit2:retrofit:2.6.1"
-    implementation "com.squareup.retrofit2:converter-moshi:2.6.1"
-    implementation "com.squareup.retrofit2:adapter-rxjava2:2.6.1"
+    implementation "com.squareup.retrofit2:retrofit:2.7.1"
+    implementation "com.squareup.retrofit2:converter-moshi:2.7.1"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:2.7.1"
 
     // Date Support
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.2"
 
     // RxJava
-    implementation "io.reactivex.rxjava2:rxjava:2.2.11"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.17"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
 
     // Testing Dependencies
     testImplementation "junit:junit:4.12"
-    testImplementation "com.squareup.okhttp3:mockwebserver:3.12.3"
+    testImplementation "com.squareup.okhttp3:mockwebserver:3.12.6"
 }
 
 generateSwagger {

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.5.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"
+        classpath "com.android.tools.build:gradle:3.5.3"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
         classpath "com.yelp.codegen:plugin:1.2.0"
     }
 }
@@ -30,23 +30,23 @@ android {
 
 dependencies {
     // Kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.50"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.61"
 
     // 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.moshi:moshi:1.9.2"
+    implementation "com.squareup.moshi:moshi-adapters:1.9.2"
+    implementation "com.squareup.moshi:moshi-kotlin:1.9.2"
     implementation "com.squareup.okhttp3:okhttp:3.12.3"
-    implementation "com.squareup.retrofit2:retrofit:2.6.1"
-    implementation "com.squareup.retrofit2:converter-moshi:2.6.1"
-    implementation "com.squareup.retrofit2:adapter-rxjava2:2.6.1"
+    implementation "com.squareup.retrofit2:retrofit:2.7.1"
+    implementation "com.squareup.retrofit2:converter-moshi:2.7.1"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:2.7.1"
 
     // Date Support
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.2"
 
     // RxJava
-    implementation "io.reactivex.rxjava2:rxjava:2.2.11"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.17"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
 }
 

diff --git a/samples/junit-tests/build.gradle b/samples/junit-tests/build.gradle
@@ -8,10 +8,10 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:3.5.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"
+        classpath "com.android.tools.build:gradle:3.5.3"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
         classpath "com.yelp.codegen:plugin:1.2.0"
-        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.1"
+        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.4.0"
     }
 }
 
@@ -32,28 +32,28 @@ android {
 
 dependencies {
     // Kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.41"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.41"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.61"
 
     // 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.moshi:moshi:1.9.2"
+    implementation "com.squareup.moshi:moshi-adapters:1.9.2"
+    implementation "com.squareup.moshi:moshi-kotlin:1.9.2"
     implementation "com.squareup.okhttp3:okhttp:3.12.3"
-    implementation "com.squareup.retrofit2:retrofit:2.6.1"
-    implementation "com.squareup.retrofit2:converter-moshi:2.6.1"
-    implementation "com.squareup.retrofit2:adapter-rxjava2:2.6.1"
+    implementation "com.squareup.retrofit2:retrofit:2.7.1"
+    implementation "com.squareup.retrofit2:converter-moshi:2.7.1"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:2.7.1"
 
     // Date Support
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.2"
 
     // RxJava
-    implementation "io.reactivex.rxjava2:rxjava:2.2.11"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.17"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
 
     // Testing Dependencies
     testImplementation "junit:junit:4.12"
-    testImplementation "com.squareup.okhttp3:mockwebserver:3.12.3"
+    testImplementation "com.squareup.okhttp3:mockwebserver:3.12.6"
 }
 
 generateSwagger {
@@ -69,7 +69,7 @@ repositories {
 }
 
 detekt {
-    toolVersion = "1.0.0-RC16"
+    toolVersion = "1.4.0"
     input = files("src/test")
-    filters = ".*/resources/.*,.*/build/.*"
+    config = rootProject.files("./config/detekt/detekt.yml")
 }
diff --git a/samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/EmptyEndpointTest.kt b/samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/EmptyEndpointTest.kt
@@ -13,7 +13,7 @@ class EmptyEndpointTest {
     val mockServerRule = MockServerApiRule()
 
     @Test
-    fun emptyEndpointTest() {
+    fun emptyEndpointTest_withEmptyBody() {
         mockServerRule.server.enqueue(MockResponse().setBody("{}"))
 
         val returned = mockServerRule.getApi<ResourceApi>().getEmptyEndpoint().blockingGet()

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.5.0"
-    kotlin("android") version "1.3.50"
+    id("com.android.library") version "3.5.3"
+    kotlin("android") version "1.3.61"
     id("com.yelp.codegen.plugin") version "1.2.0"
 }
 
@@ -16,23 +16,23 @@ android {
 
 dependencies {
     // Kotlin
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.50")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.61")
 
     // 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.moshi:moshi:1.9.2")
+    implementation("com.squareup.moshi:moshi-adapters:1.9.2")
+    implementation("com.squareup.moshi:moshi-kotlin:1.9.2")
     implementation("com.squareup.okhttp3:okhttp:3.12.3")
-    implementation("com.squareup.retrofit2:retrofit:2.6.1")
-    implementation("com.squareup.retrofit2:converter-moshi:2.6.1")
-    implementation("com.squareup.retrofit2:adapter-rxjava2:2.6.1")
+    implementation("com.squareup.retrofit2:retrofit:2.7.1")
+    implementation("com.squareup.retrofit2:converter-moshi:2.7.1")
+    implementation("com.squareup.retrofit2:adapter-rxjava2:2.7.1")
 
     // Date Support
-    implementation("com.jakewharton.threetenabp:threetenabp:1.2.1")
+    implementation("com.jakewharton.threetenabp:threetenabp:1.2.2")
 
     // RxJava
-    implementation("io.reactivex.rxjava2:rxjava:2.2.11")
+    implementation("io.reactivex.rxjava2:rxjava:2.2.17")
     implementation("io.reactivex.rxjava2:rxandroid:2.1.1")
 }
 

diff --git a/samples/kotlin-coroutines/build.gradle b/samples/kotlin-coroutines/build.gradle
@@ -8,17 +8,15 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:3.5.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"
+        classpath "com.android.tools.build:gradle:3.5.3"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
         classpath "com.yelp.codegen:plugin:1.2.0"
-        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.1"
     }
 }
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 apply plugin: "com.yelp.codegen.plugin"
-apply plugin: "io.gitlab.arturbosch.detekt"
 
 android {
     compileSdkVersion = 28
@@ -32,23 +30,23 @@ android {
 
 dependencies {
     // Kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.41"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.41"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.61"
 
     // 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.moshi:moshi:1.9.2"
+    implementation "com.squareup.moshi:moshi-adapters:1.9.2"
+    implementation "com.squareup.moshi:moshi-kotlin:1.9.2"
     implementation "com.squareup.okhttp3:okhttp:3.12.3"
-    implementation "com.squareup.retrofit2:retrofit:2.6.1"
-    implementation "com.squareup.retrofit2:converter-moshi:2.6.1"
+    implementation "com.squareup.retrofit2:retrofit:2.7.1"
+    implementation "com.squareup.retrofit2:converter-moshi:2.7.1"
 
     // Date Support
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.2"
 
     // Testing Dependencies
     testImplementation "junit:junit:4.12"
-    testImplementation "com.squareup.okhttp3:mockwebserver:3.12.3"
+    testImplementation "com.squareup.okhttp3:mockwebserver:3.12.6"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.3"
 }
 
@@ -63,9 +61,3 @@ generateSwagger {
 repositories {
     mavenCentral()
 }
-
-detekt {
-    toolVersion = "1.0.0-RC16"
-    input = files("src/test")
-    filters = ".*/resources/.*,.*/build/.*"
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,3 @@
-import java.net.URL
-
 pluginManagement {
     repositories {
         mavenLocal()
@@ -17,44 +15,9 @@ pluginManagement {
     }
 }
 
-include(":plugin")
-
-// Exclude the sample modules from the build if the Codegen plugin is not found in any Maven repository.
-if (pluginIsInstalled()) {
-    include(":samples:junit-tests",
-            ":samples:kotlin-android",
-            ":samples:kotlin-coroutines",
-            ":samples:groovy-android",
-            ":samples:generated-code")
-}
-
-fun pluginIsInstalled(): Boolean {
-    // Building the path to check the in the Maven repository if the plugin is available.
-    var path = PublishingVersions.PLUGIN_GROUP.replace('.', '/')
-    path += "/${PublishingVersions.PLUGIN_ARTIFACT}"
-    path += "/${PublishingVersions.PLUGIN_VERSION}"
-    path += "/${PublishingVersions.PLUGIN_ARTIFACT}-${PublishingVersions.PLUGIN_VERSION}.jar"
-
-    return this
-            .pluginManagement
-            .repositories
-            .filterIsInstance<MavenArtifactRepository>()
-            .any {
-                try {
-                    // Gradle portal is exposing a wrong URL:
-                    // https://plugins.gradle.org/m2
-                    // The trailing slash is missing and this is breaking
-                    // URL composition and plugin discovery.
-                    var baseUrlString = it.url.toString()
-                    if (!baseUrlString.endsWith("/")) {
-                        baseUrlString = baseUrlString.plus("/")
-                    }
-                    val baseUrl = URL(baseUrlString)
-                    URL(baseUrl, path).openStream().use { stream ->
-                        return@any stream.read() >= 0
-                    }
-                } catch (ignored: java.io.IOException) {
-                    return@any false
-                }
-            }
-}
+include(":plugin",
+        ":samples:junit-tests",
+        ":samples:kotlin-android",
+        ":samples:kotlin-coroutines",
+        ":samples:groovy-android",
+        ":samples:generated-code")