Commit eda5261
committed
Merge remote-tracking branch 'origin/master' into major-bumps
# Conflicts:
# build.gradle.kts
# buildSrc/build.gradle.kts
# buildSrc/src/main/kotlin/BuildExtensions.kt
# buildSrc/src/main/kotlin/BuildSettings.kt
# buildSrc/src/main/kotlin/DependencyResolution.kt
# buildSrc/src/main/kotlin/DokkaExts.kt
# buildSrc/src/main/kotlin/Strings.kt
# buildSrc/src/main/kotlin/compile-protobuf.gradle.kts
# buildSrc/src/main/kotlin/config-tester.gradle.kts
# buildSrc/src/main/kotlin/detekt-code-analysis.gradle.kts
# buildSrc/src/main/kotlin/dokka-for-java.gradle.kts
# buildSrc/src/main/kotlin/dokka-for-kotlin.gradle.kts
# buildSrc/src/main/kotlin/io/spine/dependency/build/AnimalSniffer.kt
# buildSrc/src/main/kotlin/io/spine/dependency/build/CheckStyle.kt
# buildSrc/src/main/kotlin/io/spine/dependency/build/CheckerFramework.kt
# buildSrc/src/main/kotlin/io/spine/dependency/build/Dokka.kt
# buildSrc/src/main/kotlin/io/spine/dependency/build/ErrorProne.kt
# buildSrc/src/main/kotlin/io/spine/dependency/build/FindBugs.kt
# buildSrc/src/main/kotlin/io/spine/dependency/build/GradleDoctor.kt
# buildSrc/src/main/kotlin/io/spine/dependency/build/Ksp.kt
# buildSrc/src/main/kotlin/io/spine/dependency/build/LicenseReport.kt
# buildSrc/src/main/kotlin/io/spine/dependency/build/OsDetector.kt
# buildSrc/src/main/kotlin/io/spine/dependency/build/Pmd.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Aedile.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/ApacheHttp.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/AppEngine.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Asm.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Auto.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/BouncyCastle.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Caffeine.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Clikt.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/CommonsCli.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/CommonsCodec.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/CommonsLogging.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Coroutines.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Firebase.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Flogger.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/GoogleApis.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/GoogleCloud.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Grpc.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/GrpcKotlin.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Gson.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Guava.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/HttpClient.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/IntelliJ.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/J2ObjC.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Jackson.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/JavaDiffUtils.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/JavaJwt.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/JavaPoet.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/JavaX.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Klaxon.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Kotlin.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/KotlinSemver.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/KotlinX.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Log4j2.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Netty.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Okio.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Plexus.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Protobuf.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Roaster.kt
# buildSrc/src/main/kotlin/io/spine/dependency/lib/Slf4J.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/ArtifactVersion.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/BaseTypes.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/Change.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJava.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/Logging.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/McJava.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/ModelCompiler.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/ProtoData.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/ProtoTap.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/Reflect.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/Text.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/ToolBase.kt
# buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt
# buildSrc/src/main/kotlin/io/spine/dependency/test/AssertK.kt
# buildSrc/src/main/kotlin/io/spine/dependency/test/Hamcrest.kt
# buildSrc/src/main/kotlin/io/spine/dependency/test/JUnit.kt
# buildSrc/src/main/kotlin/io/spine/dependency/test/Jacoco.kt
# buildSrc/src/main/kotlin/io/spine/dependency/test/Kotest.kt
# buildSrc/src/main/kotlin/io/spine/dependency/test/Kover.kt
# buildSrc/src/main/kotlin/io/spine/dependency/test/OpenTest4J.kt
# buildSrc/src/main/kotlin/io/spine/dependency/test/SystemLambda.kt
# buildSrc/src/main/kotlin/io/spine/dependency/test/TestKitTruth.kt
# buildSrc/src/main/kotlin/io/spine/dependency/test/Truth.kt
# buildSrc/src/main/kotlin/io/spine/docs/MarkdownDocument.kt
# buildSrc/src/main/kotlin/io/spine/gradle/Build.kt
# buildSrc/src/main/kotlin/io/spine/gradle/Clean.kt
# buildSrc/src/main/kotlin/io/spine/gradle/ConfigTester.kt
# buildSrc/src/main/kotlin/io/spine/gradle/ProjectExtensions.kt
# buildSrc/src/main/kotlin/io/spine/gradle/RepoSlug.kt
# buildSrc/src/main/kotlin/io/spine/gradle/Repositories.kt
# buildSrc/src/main/kotlin/io/spine/gradle/RunBuild.kt
# buildSrc/src/main/kotlin/io/spine/gradle/RunGradle.kt
# buildSrc/src/main/kotlin/io/spine/gradle/Runtime.kt
# buildSrc/src/main/kotlin/io/spine/gradle/StringExtensions.kt
# buildSrc/src/main/kotlin/io/spine/gradle/TaskName.kt
# buildSrc/src/main/kotlin/io/spine/gradle/VersionWriter.kt
# buildSrc/src/main/kotlin/io/spine/gradle/base/Tasks.kt
# buildSrc/src/main/kotlin/io/spine/gradle/checkstyle/CheckStyleConfig.kt
# buildSrc/src/main/kotlin/io/spine/gradle/dart/DartContext.kt
# buildSrc/src/main/kotlin/io/spine/gradle/dart/DartEnvironment.kt
# buildSrc/src/main/kotlin/io/spine/gradle/dart/DartExtension.kt
# buildSrc/src/main/kotlin/io/spine/gradle/dart/plugin/DartPlugins.kt
# buildSrc/src/main/kotlin/io/spine/gradle/dart/plugin/Protobuf.kt
# buildSrc/src/main/kotlin/io/spine/gradle/dart/task/Build.kt
# buildSrc/src/main/kotlin/io/spine/gradle/dart/task/DartTasks.kt
# buildSrc/src/main/kotlin/io/spine/gradle/dart/task/IntegrationTest.kt
# buildSrc/src/main/kotlin/io/spine/gradle/dart/task/Publish.kt
# buildSrc/src/main/kotlin/io/spine/gradle/dokka/DokkaExtensions.kt
# buildSrc/src/main/kotlin/io/spine/gradle/dokka/TaskContainerExtensions.kt
# buildSrc/src/main/kotlin/io/spine/gradle/fs/LazyTempPath.kt
# buildSrc/src/main/kotlin/io/spine/gradle/git/Branch.kt
# buildSrc/src/main/kotlin/io/spine/gradle/git/Repository.kt
# buildSrc/src/main/kotlin/io/spine/gradle/git/UserInfo.kt
# buildSrc/src/main/kotlin/io/spine/gradle/github/pages/AuthorEmail.kt
# buildSrc/src/main/kotlin/io/spine/gradle/github/pages/RepositoryExtensions.kt
# buildSrc/src/main/kotlin/io/spine/gradle/github/pages/SshKey.kt
# buildSrc/src/main/kotlin/io/spine/gradle/github/pages/TaskName.kt
# buildSrc/src/main/kotlin/io/spine/gradle/github/pages/Update.kt
# buildSrc/src/main/kotlin/io/spine/gradle/github/pages/UpdateGitHubPages.kt
# buildSrc/src/main/kotlin/io/spine/gradle/github/pages/UpdateGitHubPagesExtension.kt
# buildSrc/src/main/kotlin/io/spine/gradle/java/Tasks.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javac/ErrorProne.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javac/Javac.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javadoc/Encoding.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javadoc/ExcludeInternalDoclet.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javadoc/JavadocConfig.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javadoc/JavadocTag.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javadoc/TaskContainerExtensions.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/JsContext.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/JsEnvironment.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/JsExtension.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/Idea.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/JsPlugins.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/McJs.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/plugin/Protobuf.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Assemble.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Check.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Clean.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/IntegrationTest.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/JsTasks.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/LicenseReport.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Publish.kt
# buildSrc/src/main/kotlin/io/spine/gradle/javascript/task/Webpack.kt
# buildSrc/src/main/kotlin/io/spine/gradle/kotlin/KotlinConfig.kt
# buildSrc/src/main/kotlin/io/spine/gradle/protobuf/ProtoTaskExtensions.kt
# buildSrc/src/main/kotlin/io/spine/gradle/publish/CheckVersionIncrement.kt
# buildSrc/src/main/kotlin/io/spine/gradle/publish/CloudArtifactRegistry.kt
# buildSrc/src/main/kotlin/io/spine/gradle/publish/CloudRepo.kt
# buildSrc/src/main/kotlin/io/spine/gradle/publish/GitHubPackages.kt
# buildSrc/src/main/kotlin/io/spine/gradle/publish/IncrementGuard.kt
# buildSrc/src/main/kotlin/io/spine/gradle/publish/JarDsl.kt
# buildSrc/src/main/kotlin/io/spine/gradle/publish/ProtoExts.kt
# buildSrc/src/main/kotlin/io/spine/gradle/publish/Publications.kt
# buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingExts.kt
# buildSrc/src/main/kotlin/io/spine/gradle/publish/PublishingRepos.kt
# buildSrc/src/main/kotlin/io/spine/gradle/publish/SpinePublishing.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/CodebaseFilter.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileExtension.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileExtensions.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/FileFilter.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/JacocoConfig.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/PathMarker.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/coverage/TaskName.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/license/Configuration.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/license/LicenseReporter.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/license/MarkdownReportRenderer.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/license/ModuleDataExtensions.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/license/Paths.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/license/ProjectDependencies.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/license/Tasks.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/license/Template.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyScope.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/pom/DependencyWriter.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/pom/InceptionYear.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/pom/MarkupExtensions.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ModuleDependency.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomFormatting.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomGenerator.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/pom/PomXmlWriter.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ProjectMetadata.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/pom/ScopedDependency.kt
# buildSrc/src/main/kotlin/io/spine/gradle/report/pom/SpineLicense.kt
# buildSrc/src/main/kotlin/io/spine/gradle/testing/Logging.kt
# buildSrc/src/main/kotlin/io/spine/gradle/testing/Multiproject.kt
# buildSrc/src/main/kotlin/io/spine/gradle/testing/Tasks.kt
# buildSrc/src/main/kotlin/jacoco-kotlin-jvm.gradle.kts
# buildSrc/src/main/kotlin/jvm-module.gradle.kts
# buildSrc/src/main/kotlin/pmd-settings.gradle.kts
# buildSrc/src/main/kotlin/write-manifest.gradle.kts
# dependencies.md
# gradle/wrapper/gradle-wrapper.properties
# pom.xml
# version.gradle.kts2 files changed
+3
-791
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
66 | 69 | | |
67 | 70 | | |
68 | 71 | | |
| |||
0 commit comments