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
2 changes: 1 addition & 1 deletion .github/workflows/build-on-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

- uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: zulu
cache: gradle

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-on-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

- uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: zulu
cache: gradle

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
validation:
name: Validation
name: Gradle Wrapper Validation
runs-on: ubuntu-latest
steps:
- name: Checkout latest code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/increment-guard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: zulu
cache: gradle

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

- uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: zulu
cache: gradle

Expand Down
21 changes: 15 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#
# Copyright 2024, TeamDev. All rights reserved.
# Copyright 2025, TeamDev. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Redistribution and use in source and/or binary forms, with or without
# modification, must retain the above copyright notice and the following
Expand All @@ -31,6 +31,15 @@
#
# Therefore, instructions below are superset of instructions required for all the projects.

# `jenv` local configuration.
.java-version

# Internal tool directories.
.fleet/

# Kotlin temp directories.
**/.kotlin/

# IntelliJ IDEA modules and interim config files.
*.iml
.idea/*.xml
Expand All @@ -42,7 +51,6 @@

# Do not ignore the following IDEA settings
!.idea/misc.xml
!.idea/kotlinc.xml
!.idea/codeStyleSettings.xml
!.idea/codeStyles/
!.idea/copyright/
Expand All @@ -55,6 +63,10 @@

# Generated source code
**/generated/**
**/*.pb.dart
**/*.pbenum.dart
**/*.pbserver.dart
**/*.pbjson.dart

# Gradle build files
**/build/**
Expand All @@ -78,9 +90,6 @@ gradle-app.setting
# Spine internal directory for storing intermediate artifacts
**/.spine/**

# Spine model compiler auto-generated resources
/tools/gradle-plugins/model-compiler/src/main/resources/spine-protoc.gradle

# Login details to Maven repository.
# Each workstation should have developer's login defined in this file.
credentials.tar
Expand Down
3 changes: 2 additions & 1 deletion .idea/codeStyles/Project.xml

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

3 changes: 2 additions & 1 deletion .idea/dictionaries/common.xml

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

12 changes: 12 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.

10 changes: 3 additions & 7 deletions .idea/kotlinc.xml

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

2 changes: 1 addition & 1 deletion .idea/misc.xml

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

2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import io.spine.gradle.publish.spinePublishing
import io.spine.gradle.report.coverage.JacocoConfig
import io.spine.gradle.report.license.LicenseReporter
import io.spine.gradle.report.pom.PomGenerator
import io.spine.gradle.standardToSpineSdk
import io.spine.gradle.repo.standardToSpineSdk

buildscript {
standardSpineSdkRepositories()
Expand Down
44 changes: 20 additions & 24 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ plugins {

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

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

repositories {
Expand All @@ -56,7 +53,7 @@ repositories {
* Please keep this value in sync with [io.spine.dependency.lib.Jackson.version].
* It is not a requirement but would be good in terms of consistency.
*/
val jacksonVersion = "2.15.3"
val jacksonVersion = "2.18.3"

/**
* The version of Google Artifact Registry used by `buildSrc`.
Expand All @@ -73,20 +70,20 @@ val licenseReportVersion = "2.7"
val grGitVersion = "4.1.1"

/**
* The version of the Kotlin Gradle plugin and Kotlin binaries used by the build process.
* The version of the Kotlin Gradle plugin used by the build process.
*
* This version may change from the [version of Kotlin][io.spine.dependency.lib.Kotlin.version]
* used by the project.
*/
val kotlinVersion = "1.8.22"
val kotlinEmbeddedVersion = "2.1.20"

/**
* The version of Guava used in `buildSrc`.
*
* Always use the same version as the one specified in [io.spine.dependency.lib.Guava].
* Otherwise, when testing Gradle plugins, clashes may occur.
*/
val guavaVersion = "32.1.3-jre"
val guavaVersion = "33.4.8-jre"

/**
* The version of ErrorProne Gradle plugin.
Expand All @@ -96,7 +93,7 @@ val guavaVersion = "32.1.3-jre"
* @see <a href="https://github.com/tbroyer/gradle-errorprone-plugin/releases">
* Error Prone Gradle Plugin Releases</a>
*/
val errorPronePluginVersion = "3.1.0"
val errorPronePluginVersion = "4.2.0"

/**
* The version of Protobuf Gradle Plugin.
Expand All @@ -116,14 +113,14 @@ val protobufPluginVersion = "0.9.4"
* @see <a href="https://github.com/Kotlin/dokka/releases">
* Dokka Releases</a>
*/
val dokkaVersion = "1.9.20"
val dokkaVersion = "2.0.0"

/**
* The version of Detekt Gradle Plugin.
*
* @see <a href="https://github.com/detekt/detekt/releases">Detekt Releases</a>
*/
val detektVersion = "1.23.0"
val detektVersion = "1.23.8"

/**
* @see [io.spine.dependency.test.Kotest]
Expand All @@ -133,7 +130,7 @@ val kotestJvmPluginVersion = "0.4.10"
/**
* @see [io.spine.dependency.test.Kover]
*/
val koverVersion = "0.7.2"
val koverVersion = "0.9.1"

/**
* The version of the Shadow Plugin.
Expand All @@ -151,27 +148,26 @@ configurations.all {
"com.google.protobuf:protobuf-gradle-plugin:$protobufPluginVersion",

// Force Kotlin lib versions avoiding using those bundled with Gradle.
"org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion",
"org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion",
"org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
"org.jetbrains.kotlin:kotlin-stdlib:$kotlinEmbeddedVersion",
"org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinEmbeddedVersion",
"org.jetbrains.kotlin:kotlin-reflect:$kotlinEmbeddedVersion"
)
}
}

val jvmVersion = JavaLanguageVersion.of(11)

java {
toolchain.languageVersion.set(jvmVersion)
toolchain.languageVersion.set(JavaLanguageVersion.of(17))
}

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_11
jvmTarget.set(JvmTarget.JVM_17)
}
}

dependencies {
api("com.github.jk1:gradle-license-report:$licenseReportVersion")
api(platform("org.jetbrains.kotlin:kotlin-bom:$kotlinEmbeddedVersion"))
dependOnAuthCommon()

listOf(
Expand All @@ -180,17 +176,17 @@ dependencies {
"com.github.jk1:gradle-license-report:$licenseReportVersion",
"com.google.guava:guava:$guavaVersion",
"com.google.protobuf:protobuf-gradle-plugin:$protobufPluginVersion",
"gradle.plugin.com.github.johnrengelman:shadow:${shadowVersion}",
"gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion",
"io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion",
"io.kotest:kotest-gradle-plugin:$kotestJvmPluginVersion",
// https://github.com/srikanth-lingala/zip4j
"net.lingala.zip4j:zip4j:2.10.0",
"net.ltgt.gradle:gradle-errorprone-plugin:${errorPronePluginVersion}",
"org.ajoberstar.grgit:grgit-core:${grGitVersion}",
"org.jetbrains.dokka:dokka-base:${dokkaVersion}",
"net.ltgt.gradle:gradle-errorprone-plugin:$errorPronePluginVersion",
"org.ajoberstar.grgit:grgit-core:$grGitVersion",
"org.jetbrains.dokka:dokka-base:$dokkaVersion",
"org.jetbrains.dokka:dokka-gradle-plugin:${dokkaVersion}",
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion",
"org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion",
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinEmbeddedVersion",
"org.jetbrains.kotlin:kotlin-reflect:$kotlinEmbeddedVersion",
"org.jetbrains.kotlinx:kover-gradle-plugin:$koverVersion"
).forEach {
implementation(it)
Expand Down
Loading
Loading