Skip to content

Commit

Permalink
Merge pull request #188 from SpineEventEngine/update-recordspec-api
Browse files Browse the repository at this point in the history
Update to latest changes in Spine Storage API
  • Loading branch information
armiol authored Nov 9, 2023
2 parents 2563913 + 219d606 commit 23a9ab8
Show file tree
Hide file tree
Showing 55 changed files with 1,020 additions and 631 deletions.
4 changes: 4 additions & 0 deletions .idea/dictionaries/common.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 50 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions .idea/live-templates/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 58 additions & 0 deletions .idea/live-templates/Spine.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/live-templates/User.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .lift.toml

This file was deleted.

9 changes: 4 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,8 @@ buildscript {
spine.toolBase,
spine.server,
io.spine.internal.dependency.Spine.Logging.lib,
io.spine.internal.dependency.Spine.Logging.backend,
io.spine.internal.dependency.Spine.Logging.floggerApi,
io.spine.internal.dependency.Validation.runtime,
io.spine.internal.dependency.Grpc.api,
)
}
}
Expand Down Expand Up @@ -116,6 +115,8 @@ allprojects {
apply(from = "$rootDir/version.gradle.kts")
group = "io.spine.gcloud"
version = extra["versionToPublish"]!!

forceConfigurations()
}

subprojects {
Expand All @@ -127,7 +128,6 @@ subprojects {
setupKotlin(javaVersion)

defineDependencies()
forceConfigurations()

val generated = "$projectDir/generated"
applyGeneratedDirectories(generated)
Expand Down Expand Up @@ -340,8 +340,7 @@ fun Subproject.forceConfigurations() {
Validation.runtime,
Spine.time,
Spine.Logging.lib,
Spine.Logging.backend,
Spine.Logging.floggerApi,
Spine.Logging.middleware,
Spine.baseTypes,
Spine.change,
Spine.testlib,
Expand Down
67 changes: 55 additions & 12 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,12 @@ plugins {
java
groovy
`kotlin-dsl`
val licenseReportVersion = "2.1"
id("com.github.jk1.dependency-license-report").version(licenseReportVersion)

// https://github.com/jk1/Gradle-License-Report/releases
id("com.github.jk1.dependency-license-report").version("2.1")

// https://github.com/johnrengelman/shadow/releases
id("com.github.johnrengelman.shadow").version("7.1.2")
}

repositories {
Expand All @@ -50,17 +54,27 @@ repositories {
* Please keep this value in sync. with `io.spine.internal.dependency.Jackson.version`.
* It's not a requirement, but would be good in terms of consistency.
*/
val jacksonVersion = "2.13.4"
val jacksonVersion = "2.15.3"

/**
* The version of Google Artifact Registry used by `buildSrc`.
*
* The version `2.1.5` is the latest before `2.2.0`, which introduces breaking changes.
*
* @see <a href="https://mvnrepository.com/artifact/com.google.cloud.artifactregistry/artifactregistry-auth-common">
* Google Artifact Registry at Maven</a>
*/
val googleAuthToolVersion = "2.1.5"

val googleAuthToolVersion = "2.1.2"
val licenseReportVersion = "2.1"

val grGitVersion = "4.1.1"

/**
* The version of the Kotlin Gradle plugin.
* The version of the Kotlin Gradle plugin and Kotlin binaries used by the build process.
*
* Please check that this value matches one defined in
* [io.spine.internal.dependency.Kotlin.version].
* This version may change from the [version of Kotlin][io.spine.internal.dependency.Kotlin.version]
* used by the project.
*/
val kotlinVersion = "1.8.22"

Expand All @@ -70,7 +84,7 @@ val kotlinVersion = "1.8.22"
* Always use the same version as the one specified in [io.spine.internal.dependency.Guava].
* Otherwise, when testing Gradle plugins, clashes may occur.
*/
val guavaVersion = "32.1.2-jre"
val guavaVersion = "32.1.3-jre"

/**
* The version of ErrorProne Gradle plugin.
Expand Down Expand Up @@ -100,7 +114,7 @@ val protobufPluginVersion = "0.9.4"
* @see <a href="https://github.com/Kotlin/dokka/releases">
* Dokka Releases</a>
*/
val dokkaVersion = "1.8.10"
val dokkaVersion = "1.9.10"

/**
* The version of Detekt Gradle Plugin.
Expand All @@ -119,11 +133,19 @@ val kotestJvmPluginVersion = "0.4.10"
*/
val koverVersion = "0.7.2"

/**
* The version of the Shadow Plugin.
*
* `7.1.2` is the last version compatible with Gradle 7.x. Newer versions require Gradle v8.x.
*
* @see <a href="https://github.com/johnrengelman/shadow/releases">Shadow Plugin releases</a>
*/
val shadowVersion = "7.1.2"

configurations.all {
resolutionStrategy {
force(
"com.google.guava:guava:$guavaVersion",

"com.google.guava:guava:${guavaVersion}",
"com.google.protobuf:protobuf-gradle-plugin:$protobufPluginVersion",

// Force Kotlin lib versions avoiding using those bundled with Gradle.
Expand All @@ -149,9 +171,29 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
dependencies {
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jacksonVersion")
implementation("com.google.cloud.artifactregistry:artifactregistry-auth-common:$googleAuthToolVersion") {

@Suppress(
"VulnerableLibrariesLocal", "RedundantSuppression" /*
`artifactregistry-auth-common` has transitive dependency on Gson and Apache `commons-codec`.
Gson from version `2.8.6` until `2.8.9` is vulnerable to Deserialization of Untrusted Data
(https://devhub.checkmarx.com/cve-details/CVE-2022-25647/).
Apache `commons-codec` before 1.13 is vulnerable to information exposure
(https://devhub.checkmarx.com/cve-details/Cxeb68d52e-5509/).
We use Gson `2.10.1`and we force it in `forceProductionDependencies()`.
We use `commons-code` with version `1.16.0`, forcing it in `forceProductionDependencies()`.
So, we should be safe with the current version `artifactregistry-auth-common` until
we migrate to a later version. */
)
implementation(
"com.google.cloud.artifactregistry:artifactregistry-auth-common:$googleAuthToolVersion"
) {
exclude(group = "com.google.guava")
}

implementation("com.google.guava:guava:$guavaVersion")
api("com.github.jk1:gradle-license-report:$licenseReportVersion")
implementation("org.ajoberstar.grgit:grgit-core:${grGitVersion}")
Expand All @@ -165,6 +207,7 @@ dependencies {
implementation("com.google.protobuf:protobuf-gradle-plugin:$protobufPluginVersion")
implementation("org.jetbrains.dokka:dokka-gradle-plugin:${dokkaVersion}")
implementation("org.jetbrains.dokka:dokka-base:${dokkaVersion}")
implementation("gradle.plugin.com.github.johnrengelman:shadow:${shadowVersion}")

// https://github.com/srikanth-lingala/zip4j
implementation("net.lingala.zip4j:zip4j:2.10.0")
Expand Down
Loading

0 comments on commit 23a9ab8

Please sign in to comment.