Skip to content

Commit

Permalink
Merge branch 'master' into #1204-add-scenario-labels
Browse files Browse the repository at this point in the history
  • Loading branch information
Sloox authored Oct 19, 2020
2 parents f60b7d9 + 6589dff commit 7e14d9b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ object Versions {
const val KOTLIN_COROUTINES = "1.3.9"

// https://github.com/remkop/picocli/releases
const val PICOCLI = "4.5.1"
const val PICOCLI = "4.5.2"

// https://search.maven.org/search?q=a:google-api-services-toolresults%20g:com.google.apis
const val GOOGLE_API_TOOLRESULTS = "v1beta3-rev20200803-1.30.10"

// 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.21.1"
const val GOOGLE_AUTH = "0.22.0"

// https://search.maven.org/search?q=a:google-cloud-nio%20g:com.google.cloud
const val GOOGLE_NIO = "0.121.2"
Expand Down Expand Up @@ -68,7 +68,7 @@ object Versions {
const val TRUTH = "1.0.1"

// https://github.com/FasterXML/woodstox/releases
const val WOODSTOX = "6.2.1"
const val WOODSTOX = "6.2.3"

const val KOTLIN_LOGGING = "2.0.3"

Expand All @@ -88,7 +88,7 @@ object Versions {
const val PROGUARD = "7.0.0"

// ============== flank-scripts ==============
const val KOTLIN_SERIALIZATION = "1.0.0-RC2"
const val KOTLIN_SERIALIZATION = "1.0.0"
const val FUEL = "2.3.0"
const val CLIKT = "2.8.0"
const val JCABI_GITHUB = "1.1.2"
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.7-rc-4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-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.7-rc-4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-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.7-rc-4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 7e14d9b

Please sign in to comment.