Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ allprojects {

subprojects {
apply<JavaConventionPlugin>()
apply<DependencyManagementPlugin>()
}
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
36 changes: 36 additions & 0 deletions buildSrc/src/main/kotlin/dependency-management.gradle.kts
Original file line number Diff line number Diff line change
@@ -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
)
}
}
20 changes: 13 additions & 7 deletions buildSrc/src/main/kotlin/deps.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,22 @@
*/

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 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"
const val log4j2 = "2.13.3"
}

Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/java-convention.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import net.ltgt.gradle.errorprone.errorprone

plugins {
`java-library`
java
id("net.ltgt.errorprone")
id("net.ltgt.apt-idea")
}
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion version.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")