From b8c3b586ebc0becfe8fe9b35a6d985924f394a8d Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Fri, 11 Apr 2025 18:45:01 +0100 Subject: [PATCH 1/3] Bump version -> `2.0.0-SNAPSHOT.7` --- version.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle.kts b/version.gradle.kts index 6a471ac..2e191d0 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -29,4 +29,4 @@ * * For dependencies on Spine modules please see [io.spine.dependency.local.Spine]. */ -val versionToPublish: String by extra("2.0.0-SNAPSHOT.6") +val versionToPublish: String by extra("2.0.0-SNAPSHOT.7") From 7948941d36d496b267e1cafb133344f843482f6b Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Fri, 11 Apr 2025 18:45:36 +0100 Subject: [PATCH 2/3] Update `config` --- .github/workflows/build-on-ubuntu.yml | 2 +- .github/workflows/build-on-windows.yml | 2 +- .../workflows/gradle-wrapper-validation.yml | 2 +- .github/workflows/increment-guard.yml | 2 +- .github/workflows/publish.yml | 2 +- .gitignore | 8 ++ .idea/inspectionProfiles/Project_Default.xml | 12 +++ .idea/misc.xml | 4 +- .lift.toml | 1 - build.gradle.kts | 21 ++-- buildSrc/build.gradle.kts | 25 +++-- buildSrc/src/main/kotlin/BuildExtensions.kt | 90 ++++++++++++++---- buildSrc/src/main/kotlin/BuildSettings.kt | 7 +- .../src/main/kotlin/DependencyResolution.kt | 2 +- buildSrc/src/main/kotlin/DokkaExts.kt | 6 +- buildSrc/src/main/kotlin/Strings.kt | 17 +--- .../main/kotlin/compile-protobuf.gradle.kts | 10 +- .../kotlin/io/spine/dependency/build/Dokka.kt | 4 +- .../io/spine/dependency/build/ErrorProne.kt | 4 +- .../kotlin/io/spine/dependency/build/Ksp.kt | 12 ++- .../kotlin/io/spine/dependency/lib/Auto.kt | 7 +- .../io/spine/dependency/lib/Coroutines.kt | 16 ++-- .../kotlin/io/spine/dependency/lib/Kotlin.kt | 46 ++++++--- .../io/spine/dependency/lib/KotlinPoet.kt | 35 +++++++ .../kotlin/io/spine/dependency/lib/KotlinX.kt | 10 +- .../kotlin/io/spine/dependency/local/Base.kt | 4 +- .../io/spine/dependency/local/BaseTypes.kt | 2 +- .../io/spine/dependency/local/Change.kt | 2 +- .../io/spine/dependency/local/CoreJava.kt | 2 +- .../io/spine/dependency/local/Logging.kt | 2 +- .../io/spine/dependency/local/McJava.kt | 4 +- .../io/spine/dependency/local/ProtoData.kt | 4 +- .../io/spine/dependency/local/ProtoTap.kt | 2 +- .../kotlin/io/spine/dependency/local/Spine.kt | 14 ++- .../io/spine/dependency/local/TestLib.kt | 2 +- .../kotlin/io/spine/dependency/local/Time.kt | 2 +- .../io/spine/dependency/local/ToolBase.kt | 2 +- .../io/spine/dependency/local/Validation.kt | 2 +- .../kotlin/io/spine/dependency/test/Kotest.kt | 2 +- .../dependency/test/KotlinCompileTesting.kt | 40 ++++++++ .../main/kotlin/io/spine/gradle/RunBuild.kt | 2 +- .../main/kotlin/io/spine/gradle/RunGradle.kt | 2 +- .../gradle/checkstyle/CheckStyleConfig.kt | 11 ++- .../io/spine/gradle/javac/ErrorProne.kt | 1 + .../io/spine/gradle/javascript/JsContext.kt | 5 +- .../gradle/javascript/plugin/Protobuf.kt | 2 - .../io/spine/gradle/kotlin/KotlinConfig.kt | 23 ++--- .../gradle/protobuf/ProtoTaskExtensions.kt | 15 +-- .../gradle/report/pom/DependencyWriter.kt | 4 +- .../gradle/report/pom/ModuleDependency.kt | 4 +- .../spine/gradle/report/pom/PomGenerator.kt | 21 ++-- .../src/main/kotlin/jvm-module.gradle.kts | 13 +-- .../src/main/kotlin/write-manifest.gradle.kts | 2 +- .../resources/dokka/styles/custom-styles.css | 4 +- config | 2 +- dokka-extensions/build.gradle.kts | 3 - gradle/wrapper/gradle-wrapper.jar | Bin 61624 -> 43705 bytes gradle/wrapper/gradle-wrapper.properties | 29 +----- gradlew | 33 ++++--- gradlew.bat | 22 +++-- 60 files changed, 387 insertions(+), 244 deletions(-) delete mode 100644 .lift.toml create mode 100644 buildSrc/src/main/kotlin/io/spine/dependency/lib/KotlinPoet.kt create mode 100644 buildSrc/src/main/kotlin/io/spine/dependency/test/KotlinCompileTesting.kt diff --git a/.github/workflows/build-on-ubuntu.yml b/.github/workflows/build-on-ubuntu.yml index 028e583..f8c2493 100644 --- a/.github/workflows/build-on-ubuntu.yml +++ b/.github/workflows/build-on-ubuntu.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 distribution: zulu cache: gradle diff --git a/.github/workflows/build-on-windows.yml b/.github/workflows/build-on-windows.yml index 3627bbf..4e6b57f 100644 --- a/.github/workflows/build-on-windows.yml +++ b/.github/workflows/build-on-windows.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 distribution: zulu cache: gradle diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index b2955de..858cebb 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -9,7 +9,7 @@ on: jobs: validation: - name: Validation + name: Gradle Wrapper Validation runs-on: ubuntu-latest steps: - name: Checkout latest code diff --git a/.github/workflows/increment-guard.yml b/.github/workflows/increment-guard.yml index a1c90c3..1993841 100644 --- a/.github/workflows/increment-guard.yml +++ b/.github/workflows/increment-guard.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 distribution: zulu cache: gradle diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 73a0a69..8b5b4d5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 distribution: zulu cache: gradle diff --git a/.gitignore b/.gitignore index 56187d6..e4e87f0 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,14 @@ # # Therefore, instructions below are superset of instructions required for all the projects. +.DS_Store + +# `jenv` file with the local version of Java. +.java-version + +# Kotlin temp directories. +**/.kotlin/** + # IntelliJ IDEA modules and interim config files. *.iml .idea/*.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index b091734..229f1d3 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -255,6 +255,18 @@