From 0b86f0b39096d9dc77a73c841b30d04563511415 Mon Sep 17 00:00:00 2001 From: "flank-release[bot]" <73127551+flank-release[bot]@users.noreply.github.com> Date: Mon, 1 Mar 2021 08:18:50 +0000 Subject: [PATCH] build: Dependencies updates [2021-03-01] (#1636) Dependencies updates --- buildSrc/src/main/kotlin/Versions.kt | 10 +++++----- flank-scripts/build.gradle.kts | 2 +- flank-scripts/gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- test_runner/gradle/wrapper/gradle-wrapper.properties | 2 +- test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 8ccc2c9b24..ec66ed0fd8 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -14,7 +14,7 @@ object Versions { const val KTLINT = "0.40.0" // https://github.com/Codearte/gradle-nexus-staging-plugin - const val NEXUS_STAGING = "0.22.0" + const val NEXUS_STAGING = "0.30.0" // https://github.com/johnrengelman/shadow/releases const val SHADOW = "6.1.0" @@ -23,7 +23,7 @@ object Versions { const val DEX_TEST_PARSER = "2.2.1" // match to Tools -> Kotlin -> Configure Kotlin Plugin Updates -> Update Channel: Stable - const val KOTLIN = "1.4.30" + const val KOTLIN = "1.4.31" // https://github.com/Kotlin/kotlinx.coroutines/releases const val KOTLIN_COROUTINES = "1.4.2" @@ -40,13 +40,13 @@ object Versions { // https://github.com/googleapis/google-auth-library-java/releases // NOTE: https://github.com/googleapis/google-oauth-java-client is End of Life and replaced by google-auth-library-java // https://github.com/googleapis/google-oauth-java-client/issues/251#issuecomment-504565533 - const val GOOGLE_AUTH = "0.23.0" + const val GOOGLE_AUTH = "0.24.1" // https://search.maven.org/search?q=a:google-cloud-nio%20g:com.google.cloud - const val GOOGLE_NIO = "0.122.6" + const val GOOGLE_NIO = "0.122.10" // https://search.maven.org/search?q=a:google-cloud-storage%20g:com.google.cloud - const val GOOGLE_STORAGE = "1.113.10" + const val GOOGLE_STORAGE = "1.113.11" // https://github.com/google/gson/releases const val GSON = "2.8.6" diff --git a/flank-scripts/build.gradle.kts b/flank-scripts/build.gradle.kts index 075217dab0..f2e2dca936 100644 --- a/flank-scripts/build.gradle.kts +++ b/flank-scripts/build.gradle.kts @@ -26,7 +26,7 @@ shadowJar.apply { } } // .. -version = "1.7.0" +version = "1.7.1" group = "com.github.flank" application { diff --git a/flank-scripts/gradle/wrapper/gradle-wrapper.properties b/flank-scripts/gradle/wrapper/gradle-wrapper.properties index 2a563242c1..442d9132ea 100644 --- a/flank-scripts/gradle/wrapper/gradle-wrapper.properties +++ b/flank-scripts/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a563242c1..442d9132ea 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.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/test_runner/gradle/wrapper/gradle-wrapper.properties b/test_runner/gradle/wrapper/gradle-wrapper.properties index 25d3265315..8cf6eb5ad2 100644 --- a/test_runner/gradle/wrapper/gradle-wrapper.properties +++ b/test_runner/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt b/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt index 4c0604f0b5..99fb06038e 100644 --- a/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt +++ b/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt @@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.registerKotlinModule import com.google.api.client.json.GenericJson import com.google.api.client.json.JsonObjectParser -import com.google.api.client.util.Charsets import com.google.cloud.ServiceOptions import com.google.cloud.storage.BucketInfo import com.google.cloud.storage.Storage @@ -33,6 +32,7 @@ import ftl.util.assertNotEmpty import ftl.util.getGACPathOrEmpty import java.io.File import java.net.URI +import java.nio.charset.StandardCharsets import java.nio.file.Files import java.nio.file.InvalidPathException import java.nio.file.Path @@ -197,7 +197,7 @@ object ArgsHelper { projectIdSource = jsonPath.toAbsolutePath().toString() JsonObjectParser(JSON_FACTORY).parseAndClose( Files.newInputStream(jsonPath), - Charsets.UTF_8, + StandardCharsets.UTF_8, GenericJson::class.java )["project_id"] as String }.onFailure {