From 2ce442ecaf7996cd2902c05220179caabc7b84f7 Mon Sep 17 00:00:00 2001 From: Yuri Sergiichuk Date: Fri, 14 Aug 2020 16:47:09 +0300 Subject: [PATCH 1/5] Upgradle v6.6 The new Gradle version has contains the fix for the issue that prevented using Gradle v6.5.x with the Bootstrap plugin (see https://github.com/SpineEventEngine/bootstrap/issues/61) for details. --- cloudbuild.yaml | 2 +- gradle/wrapper/gradle-wrapper.properties | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 0da28f53..019b5b70 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -2,7 +2,7 @@ steps: # The following step starts the build process using Gradle official image, performs the build # and runs `jib` for the specified `gcpProject` in order to build and deploy the container # image to the Google Container Registry. - - name: 'gradle:6.4.1-jdk11' + - name: 'gradle:6.6-jdk11' entrypoint: 'gradle' args: [ 'build', 'jib', '-PgcpProject=${PROJECT_ID}' ] # The following step deploys the previously produced container image to the Cloud Run environment diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7c0e0d60..bca17f36 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Mon Jun 15 15:39:45 EEST 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists From 540eaa2f6b28a03c7510999d6df63f504c900ba8 Mon Sep 17 00:00:00 2001 From: Yuri Sergiichuk Date: Fri, 14 Aug 2020 16:49:27 +0300 Subject: [PATCH 2/5] Update `jib` plugin version --- buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index c07f4329..7182742c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { implementation("net.ltgt.gradle:gradle-errorprone-plugin:1.2.1") implementation("net.ltgt.gradle:gradle-apt-plugin:0.21") implementation("com.github.jengelman.gradle.plugins:shadow:6.0.0") - implementation("gradle.plugin.com.google.cloud.tools:jib-gradle-plugin:2.4.0") + implementation("gradle.plugin.com.google.cloud.tools:jib-gradle-plugin:2.5.0") implementation("io.spine.tools:spine-bootstrap:1.5.24") implementation("net.saliman:gradle-properties-plugin:1.5.1") } From c5231af3d9ce80db695b83df73078df4f99cc6ad Mon Sep 17 00:00:00 2001 From: Yuri Sergiichuk Date: Fri, 14 Aug 2020 16:53:34 +0300 Subject: [PATCH 3/5] Update dependencies --- buildSrc/src/main/kotlin/deps.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/buildSrc/src/main/kotlin/deps.kt b/buildSrc/src/main/kotlin/deps.kt index bcceae7b..9d523202 100644 --- a/buildSrc/src/main/kotlin/deps.kt +++ b/buildSrc/src/main/kotlin/deps.kt @@ -19,20 +19,20 @@ */ object Versions { - const val checkerFramework = "3.4.1" + const val checkerFramework = "3.6.0" const val errorProne = "2.4.0" - const val pmd = "6.24.0" - const val checkstyle = "8.33" + const val pmd = "6.26.0" + const val checkstyle = "8.35" const val findBugs = "3.0.2" const val guava = "29.0-jre" const val flogger = "0.5.1" const val junit5 = "5.6.2" const val truth = "1.0.1" - const val micronaut = "2.0.0" + const val micronaut = "2.0.1" const val spineGcloud = "1.5.22" - const val googleSecretManager = "1.1.0" - const val googleChat = "v1-rev20200617-1.30.9" - const val googleAuth = "0.20.0" + const val googleSecretManager = "1.1.1" + const val googleChat = "v1-rev20200801-1.30.10" + const val googleAuth = "0.21.1" const val log4j2 = "2.13.3" } From 215222348283cd758c6ba57f156f22b04f8a1b63 Mon Sep 17 00:00:00 2001 From: Yuri Sergiichuk Date: Fri, 14 Aug 2020 17:29:01 +0300 Subject: [PATCH 4/5] Upgrade Spine `base` and `core` versions. Force dependencies. The new `base` version has the Java time fix related directly to Java9+ (see https://github.com/SpineEventEngine/base/pull/554 for details). We must force dependencies because the `Bootstrap` plugin configured Spine dependencies for us with the versions pre-configured in the plugin itself. --- build.gradle.kts | 1 + .../kotlin/dependency-management.gradle.kts | 36 +++++++++++++++++++ buildSrc/src/main/kotlin/deps.kt | 6 ++++ .../main/kotlin/java-convention.gradle.kts | 2 +- 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 buildSrc/src/main/kotlin/dependency-management.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index 33c40115..1826fb60 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,4 +37,5 @@ allprojects { subprojects { apply() + apply() } diff --git a/buildSrc/src/main/kotlin/dependency-management.gradle.kts b/buildSrc/src/main/kotlin/dependency-management.gradle.kts new file mode 100644 index 00000000..d9bfef90 --- /dev/null +++ b/buildSrc/src/main/kotlin/dependency-management.gradle.kts @@ -0,0 +1,36 @@ +/* + * Copyright 2020, TeamDev. All rights reserved. + * + * Redistribution and use in source and/or binary forms, with or without + * modification, must retain the above copyright notice and the following + * disclaimer. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +plugins { + java +} + +configurations.all { + resolutionStrategy { + force( + Deps.build.guava, + Deps.build.errorProneAnnotations, + Deps.build.spine.base, + Deps.build.spine.core, + Deps.build.spine.server, + Deps.build.spine.client + ) + } +} diff --git a/buildSrc/src/main/kotlin/deps.kt b/buildSrc/src/main/kotlin/deps.kt index 9d523202..eb682b6e 100644 --- a/buildSrc/src/main/kotlin/deps.kt +++ b/buildSrc/src/main/kotlin/deps.kt @@ -30,6 +30,8 @@ object Versions { const val truth = "1.0.1" const val micronaut = "2.0.1" const val spineGcloud = "1.5.22" + const val spineBase = "1.5.23" + const val spineCore = "1.5.24" const val googleSecretManager = "1.1.1" const val googleChat = "v1-rev20200801-1.30.10" const val googleAuth = "0.21.1" @@ -62,6 +64,10 @@ object Build { object Spine { const val datastore = "io.spine.gcloud:spine-datastore:${Versions.spineGcloud}" const val pubsub = "io.spine.gcloud:spine-pubsub:${Versions.spineGcloud}" + const val base = "io.spine:spine-base:${Versions.spineBase}" + const val server = "io.spine:spine-server:${Versions.spineCore}" + const val client = "io.spine:spine-client:${Versions.spineCore}" + const val core = "io.spine:spine-core:${Versions.spineCore}" } object Log4j2 { diff --git a/buildSrc/src/main/kotlin/java-convention.gradle.kts b/buildSrc/src/main/kotlin/java-convention.gradle.kts index 11eca08e..c44e2339 100644 --- a/buildSrc/src/main/kotlin/java-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/java-convention.gradle.kts @@ -21,7 +21,7 @@ import net.ltgt.gradle.errorprone.errorprone plugins { - `java-library` + java id("net.ltgt.errorprone") id("net.ltgt.apt-idea") } From 9c92c8e1efa4de0d62df87dabab3245e1337dc01 Mon Sep 17 00:00:00 2001 From: Yuri Sergiichuk Date: Fri, 14 Aug 2020 17:50:42 +0300 Subject: [PATCH 5/5] Bump version --- version.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle.kts b/version.gradle.kts index 79c72ebb..29dda29f 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -22,4 +22,4 @@ * The version of the application. */ -val botVersion: String by extra("1.0.0") +val botVersion: String by extra("1.1.0")