Skip to content

Commit 586033a

Browse files
authored
Dependency updates (#79)
1 parent 4078829 commit 586033a

File tree

8 files changed

+35
-15
lines changed

8 files changed

+35
-15
lines changed

build.gradle.kts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
3+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
4+
15
plugins {
26
// Apply the Java Gradle plugin development plugin to add support for developing Gradle plugins
37
`java-gradle-plugin`
@@ -62,6 +66,23 @@ val functionalTest by tasks.registering(Test::class) {
6266

6367
gradlePlugin.testSourceSets.add(functionalTestSourceSet)
6468

69+
tasks.named<JavaCompile>("compileJava") {
70+
targetCompatibility = JvmTarget.JVM_17.target
71+
}
72+
73+
tasks.named<KotlinCompile>("compileKotlin") {
74+
compilerOptions {
75+
optIn = listOf("kotlin.io.path.ExperimentalPathApi")
76+
77+
// See https://docs.gradle.org/current/userguide/compatibility.html#java_runtime.
78+
jvmTarget = JvmTarget.JVM_17
79+
80+
// See https://docs.gradle.org/current/userguide/compatibility.html#kotlin.
81+
languageVersion = @Suppress("DEPRECATION") KotlinVersion.KOTLIN_1_4
82+
apiVersion = @Suppress("DEPRECATION") KotlinVersion.KOTLIN_1_4
83+
}
84+
}
85+
6586
tasks.named<Task>("check") {
6687
// Run the functional tests as part of `check`
6788
dependsOn(functionalTest)

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[versions]
2-
assertj = "3.27.2"
2+
assertj = "3.27.3"
33
git-semver-plugin = "0.16.1"
44
jgit = "7.3.0.202506031305-r"
5-
kotlin = "1.9.10"
6-
plugin-publish = "1.2.1"
7-
slf4j = "1.7.36"
5+
kotlin = "2.0.0"
6+
plugin-publish = "1.3.1"
7+
slf4j = "2.0.17"
88

99
[plugins]
1010
git-semver = { id = "com.github.jmongard.git-semver-plugin", version.ref = "git-semver-plugin" }

gradle/wrapper/gradle-wrapper.jar

181 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in #(
115114
NONSTOP* ) nonstop=true ;;
116115
esac
117116

118-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
119118

120119

121120
# Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
206205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207206

208207
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210209
# and any embedded shellness will be escaped.
211210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212211
# treated as '${Hostname}' itself on the command line.
213212

214213
set -- \
215214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
216215
-classpath "$CLASSPATH" \
217-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
218217
"$@"
219218

220219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

src/main/kotlin/git/semver/plugin/changelog/ChangeLogFormat.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object ChangeLogFormat {
2121
}
2222

2323
// Fixes and then Features from typesOrder
24-
withType(types = constants.typesOrder.toTypedArray()) {
24+
withType(*constants.typesOrder.toTypedArray()) {
2525
filterEmptyHeader(constants.headerTexts[groupKey]) {
2626
appendLine(groupKey)
2727
formatChanges {
@@ -75,7 +75,7 @@ object ChangeLogFormat {
7575
}
7676
appendLine()
7777
}
78-
withType(types = constants.typesOrder.toTypedArray()) {
78+
withType(*constants.typesOrder.toTypedArray()) {
7979
appendLine(constants.headerTexts[groupKey])
8080
formatChanges {
8181
append("- ").append(scope()).appendLine(header())

src/main/kotlin/git/semver/plugin/semver/VersionFinder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class VersionFinder(private val settings: SemverSettings, private val tags: Map<
143143
return when {
144144
parentSemVersions.isEmpty() -> versionZero()
145145
parentSemVersions.size == 1 -> parentSemVersions[0]
146-
else -> parentSemVersions.max().mergeChanges(parentSemVersions)
146+
else -> checkNotNull(parentSemVersions.maxOrNull()).mergeChanges(parentSemVersions)
147147
}
148148
}
149149

0 commit comments

Comments
 (0)