From 8518f47f52bdec6af5b604f2b046ea2952f77c06 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Tue, 2 Feb 2021 13:11:20 -0500 Subject: [PATCH] Update dependencies (#1258) --- buildSrc/src/main/kotlin/Dependencies.kt | 7 +++---- gradle/wrapper/gradle-wrapper.properties | 2 +- kotlin/codegen/build.gradle.kts | 1 - kotlin/tests/build.gradle.kts | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index aae1f54..787ed9d 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -19,8 +19,7 @@ object Dependencies { const val asm = "org.ow2.asm:asm:7.1" const val jsr305 = "com.google.code.findbugs:jsr305:3.0.2" const val ktlintVersion = "0.39.0" - const val okio = "com.squareup.okio:okio:1.17.5" - const val okio2 = "com.squareup.okio:okio:2.8.0" + const val okio = "com.squareup.okio:okio:2.10.0" object AutoService { private const val version = "1.0-rc7" @@ -50,8 +49,8 @@ object Dependencies { object Testing { const val assertj = "org.assertj:assertj-core:3.11.1" - const val compileTesting = "com.github.tschuchortdev:kotlin-compile-testing:1.2.11" - const val junit = "junit:junit:4.13" + const val compileTesting = "com.github.tschuchortdev:kotlin-compile-testing:1.3.4" + const val junit = "junit:junit:4.13.1" const val truth = "com.google.truth:truth:1.0.1" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 33682bb..14e30f7 100644 --- 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-6.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/kotlin/codegen/build.gradle.kts b/kotlin/codegen/build.gradle.kts index d8aa2fa..94bb818 100644 --- a/kotlin/codegen/build.gradle.kts +++ b/kotlin/codegen/build.gradle.kts @@ -83,7 +83,6 @@ dependencies { testImplementation(Dependencies.Testing.junit) testImplementation(Dependencies.Testing.truth) testImplementation(Dependencies.Testing.compileTesting) - testImplementation(Dependencies.okio2) } val relocateShadowJar = tasks.register("relocateShadowJar") { diff --git a/kotlin/tests/build.gradle.kts b/kotlin/tests/build.gradle.kts index bd34e1f..1805400 100644 --- a/kotlin/tests/build.gradle.kts +++ b/kotlin/tests/build.gradle.kts @@ -39,5 +39,4 @@ dependencies { testImplementation(Dependencies.Testing.junit) testImplementation(Dependencies.Testing.assertj) testImplementation(Dependencies.Testing.truth) - testImplementation(Dependencies.okio2) }