Skip to content

Build system modernizations #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmongard merged 4 commits into from
Jun 28, 2025
Merged

Build system modernizations #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5bedcd
test: Do not rely on the current working directory in functional tests
sschuberth Jun 24, 2025
9b62542
build: Migrate dependency versions to a version catalog
sschuberth Jun 24, 2025
6404661
build: Remove the Kotlin stdlib as an explicit dependency
sschuberth Jun 24, 2025
c14b2f2
deps: Upgrade JGit to address CVE-2025-4949
sschuberth Jun 24, 2025
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
19 changes: 9 additions & 10 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ plugins {
`java-gradle-plugin`

// Apply the Kotlin JVM plugin to add support for Kotlin.
kotlin("jvm") version "1.9.10"
id("com.gradle.plugin-publish") version "1.2.1"
id("com.github.jmongard.git-semver-plugin") version "0.13.0"
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.plugin.publish)
alias(libs.plugins.git.semver)
id("jacoco")
}

Expand All @@ -22,14 +22,13 @@ repositories {
}

dependencies {
implementation(kotlin("stdlib"))
implementation("org.eclipse.jgit:org.eclipse.jgit:7.1.0.202411261347-r")
implementation("org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.1.0.202411261347-r")
implementation("org.slf4j:slf4j-api:1.7.36")
implementation(libs.jgit.core)
implementation(libs.jgit.gpg)
implementation(libs.slf4j.api)

testImplementation(kotlin("test-junit5"))
testImplementation("org.junit.jupiter:junit-jupiter-params")
testImplementation("org.assertj:assertj-core:3.27.2")
testImplementation(libs.kotlin.test.junit5)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.assertj.core)
}

gradlePlugin {
Expand Down
20 changes: 20 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[versions]
assertj = "3.27.2"
git-semver-plugin = "0.13.0"
jgit = "7.3.0.202506031305-r"
kotlin = "1.9.10"
plugin-publish = "1.2.1"
slf4j = "1.7.36"

[plugins]
git-semver = { id = "com.github.jmongard.git-semver-plugin", version.ref = "git-semver-plugin" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
plugin-publish = { id = "com.gradle.plugin-publish", version.ref = "plugin-publish" }

[libraries]
assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" }
jgit-core = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "jgit" }
jgit-gpg = { module = "org.eclipse.jgit:org.eclipse.jgit.gpg.bc", version.ref = "jgit" }
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params" }
kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5" }
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
6 changes: 5 additions & 1 deletion src/functionalTest/kotlin/git/semver/plugin/gradle/GitSemverPluginFunctionalTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import org.eclipse.jgit.api.Git
import org.gradle.testkit.runner.BuildResult
import org.gradle.testkit.runner.GradleRunner
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.io.TempDir
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.Arguments
import org.junit.jupiter.params.provider.CsvSource
Expand All @@ -18,6 +19,9 @@ import java.io.File
class GitSemverPluginFunctionalTest {

companion object {
@TempDir
lateinit var tempDir: File

@JvmStatic
fun gradleVersions(): List<Arguments> {
return listOf(
Expand Down Expand Up @@ -125,7 +129,7 @@ class GitSemverPluginFunctionalTest {
""".trimIndent();

// Setup the test build
val projectDir = File("build/functionalTest")
val projectDir = tempDir.resolve("build/functionalTest")
projectDir.mkdirs()
projectDir.resolve(".gitignore").writeText(".gradle")
projectDir.resolve("settings.gradle").writeText("include ':sub1'")
Expand Down