Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1145e67
Bump the version -> `2.0.0-SNAPSHOT.234`.
armiol Nov 26, 2023
9273c43
Update the versions of dependencies taken from the latest `config`.
armiol Nov 26, 2023
d10b60f
Suppress `Flogger` deprecation, as we really need it.
armiol Nov 26, 2023
47392de
Grab some minor change from `config`.
armiol Nov 26, 2023
cabc7c4
Address `license-report.md` to `dependencies.md` renaming.
armiol Nov 26, 2023
c8601d2
Grab the latest dependencies on `buildSrc` level from `config` and me…
armiol Nov 26, 2023
9703d4f
Update the reference to `config` itself.
armiol Nov 26, 2023
bb61315
Update the remaining report file.
armiol Nov 26, 2023
b8bcdb1
Use the latest versions of `reflect` and `base`.
armiol Nov 26, 2023
fcd48fb
Update the report files with the respect to the latest versions of `r…
armiol Nov 26, 2023
f2d146b
Merge remote-tracking branch 'origin/master' into update-config-26-11…
alexander-yevsyukov May 6, 2024
d9eb457
Bump version -> `2.0.0-SNAPSHOT.235`
alexander-yevsyukov May 6, 2024
92058bf
Bump Asm -> `9.4`
alexander-yevsyukov May 6, 2024
4c57e55
Update dependencies
alexander-yevsyukov May 6, 2024
c83cb0f
Use the latest Asm `9.6` which is still compatible with the latest Ko…
armiol May 6, 2024
fd1c8a7
Use the latest Kover at `0.7.6`.
armiol May 6, 2024
798cbc8
Use the latest Jacoco at `0.8.12`.
armiol May 6, 2024
dd939c3
Specify the Jacoco runner version explicitly.
armiol May 6, 2024
dbc3d78
Update the dependency reports.
armiol May 6, 2024
e80cf37
Force all ASM artifacts to be at `9.6`.
armiol May 6, 2024
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
4 changes: 4 additions & 0 deletions buildSrc/src/main/kotlin/DependencyResolution.kt
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ private fun ResolutionStrategy.forceTestDependencies() {
private fun ResolutionStrategy.forceTransitiveDependencies() {
force(
Asm.lib,
Asm.tree,
Asm.analysis,
Asm.util,
Asm.commons,
AutoValue.annotations,
CommonsCli.lib,
CommonsCodec.lib,
Expand Down
10 changes: 9 additions & 1 deletion buildSrc/src/main/kotlin/io/spine/internal/dependency/Asm.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ package io.spine.internal.dependency
// https://asm.ow2.io/
@Suppress("unused", "ConstPropertyName")
object Asm {
private const val version = "9.4"
private const val version = "9.6"
const val lib = "org.ow2.asm:asm:$version"

// We use the following artifacts only to force the versions
// of the dependencies which are transitive for us.
//
const val tree = "org.ow2.asm:asm-tree:$version"
const val analysis = "org.ow2.asm:asm-analysis:$version"
const val util = "org.ow2.asm:asm-util:$version"
const val commons = "org.ow2.asm:asm-commons:$version"
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ package io.spine.internal.dependency
*/
@Suppress("ConstPropertyName")
object Jacoco {
const val version = "0.8.10"
const val version = "0.8.12"
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ package io.spine.internal.dependency
// https://github.com/Kotlin/kotlinx-kover
@Suppress("unused", "ConstPropertyName")
object Kover {
const val version = "0.7.4"
const val version = "0.7.6"
const val id = "org.jetbrains.kotlinx.kover"
const val classpath = "org.jetbrains.kotlinx:kover-gradle-plugin:$version"
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@

package io.spine.internal.gradle.report.coverage

import io.spine.internal.dependency.Jacoco
import io.spine.internal.gradle.applyPlugin
import io.spine.internal.gradle.buildDirectory
import io.spine.internal.gradle.findTask
import io.spine.internal.gradle.report.coverage.TaskName.check
import io.spine.internal.gradle.report.coverage.TaskName.copyReports
Expand All @@ -45,7 +47,9 @@ import org.gradle.api.tasks.SourceSetOutput
import org.gradle.api.tasks.TaskContainer
import org.gradle.api.tasks.TaskProvider
import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.the
import org.gradle.testing.jacoco.plugins.JacocoPlugin
import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
import org.gradle.testing.jacoco.tasks.JacocoReport

/**
Expand Down Expand Up @@ -118,14 +122,23 @@ class JacocoConfig(
}

private fun configure() {
configureVersion()
configureTask()
}

private fun configureVersion() {
val jacoco = rootProject.the<JacocoPluginExtension>()
jacoco.toolVersion = Jacoco.version
}

private fun configureTask() {
val tasks = rootProject.tasks
val copyReports = registerCopy(tasks)
val rootReport = registerRootReport(tasks, copyReports)
rootProject
.findTask<Task>(check.name)
.dependsOn(rootReport)
tasks.named(check.name) {
dependsOn(rootReport)
}
}

private fun registerRootReport(
tasks: TaskContainer,
copyReports: TaskProvider<Copy>?
Expand Down
3 changes: 2 additions & 1 deletion buildSrc/src/main/kotlin/jvm-module.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import io.spine.internal.dependency.Dokka
import io.spine.internal.dependency.ErrorProne
import io.spine.internal.dependency.Guava
import io.spine.internal.dependency.JUnit
import io.spine.internal.dependency.Jacoco
import io.spine.internal.dependency.JavaX
import io.spine.internal.dependency.Kotest
import io.spine.internal.dependency.Protobuf
Expand Down Expand Up @@ -119,7 +120,7 @@ fun Module.configureKotlin(javaVersion: JavaLanguageVersion) {
}

kover {
useJacoco()
useJacoco(version = Jacoco.version)
}

koverReport {
Expand Down
504 changes: 223 additions & 281 deletions dependencies.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
-->
<groupId>io.spine</groupId>
<artifactId>spine-logging</artifactId>
<version>2.0.0-SNAPSHOT.234</version>
<version>2.0.0-SNAPSHOT.235</version>

<inceptionYear>2015</inceptionYear>

Expand Down Expand Up @@ -56,7 +56,7 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.4</version>
<version>9.6</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -210,12 +210,12 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.agent</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
</dependency>
<dependency>
<groupId>org.jetbrains.dokka</groupId>
Expand Down
2 changes: 1 addition & 1 deletion version.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

val versionToPublish: String by extra("2.0.0-SNAPSHOT.234")
val versionToPublish: String by extra("2.0.0-SNAPSHOT.235")