Skip to content

Commit

Permalink
build: Dependencies updates [2021-03-01] (#1636)
Browse files Browse the repository at this point in the history
Dependencies updates
  • Loading branch information
flank-release[bot] authored Mar 1, 2021
1 parent 2584eeb commit 0b86f0b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion flank-scripts/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ shadowJar.apply {
}
}
// <breaking change>.<feature added>.<fix/minor change>
version = "1.7.0"
version = "1.7.1"
group = "com.github.flank"

application {
Expand Down
2 changes: 1 addition & 1 deletion flank-scripts/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion test_runner/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 0b86f0b

Please sign in to comment.