Skip to content

Commit b36843d

Browse files
authored
Adaptions to build and publications (#220)
* Adaptions to build and publications * Adapt deprecated wrapper validation action
1 parent b4aa177 commit b36843d

3 files changed

Lines changed: 33 additions & 13 deletions

File tree

.github/workflows/update-gradle-wrapper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ jobs:
2222
with:
2323
repo-token: ${{ secrets.GH_ACTION_TOKEN }}
2424
labels: dependencies
25-
- uses: gradle/wrapper-validation-action@v3
25+
- uses: gradle/actions/wrapper-validation@v3

build.gradle.kts

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
val javaVersion = JavaVersion.VERSION_17
4+
val jvmVersion = JvmTarget.JVM_17
25

36
plugins {
47
alias(libs.plugins.kotlinJvm)
@@ -12,7 +15,9 @@ val dependencyVersions = listOf(
1215
libs.annotations,
1316
libs.mockk,
1417
libs.okio,
15-
libs.opentest4j
18+
libs.okioJvm,
19+
libs.opentest4j,
20+
libs.slf4j
1621
)
1722

1823
val dependencyVersionsByGroup = mapOf(
@@ -31,9 +36,9 @@ tasks {
3136
useJUnitPlatform()
3237
}
3338
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
34-
kotlinOptions {
35-
jvmTarget = javaVersion.toString()
36-
freeCompilerArgs = listOf("-Xjsr305=strict")
39+
compilerOptions {
40+
jvmTarget.set(jvmVersion)
41+
freeCompilerArgs.set(listOf("-Xjsr305=strict"))
3742
}
3843
}
3944
}
@@ -67,8 +72,9 @@ allprojects {
6772
}
6873

6974
gradlePlugin {
70-
website.set("https://github.com/europace/docker-publish-gradle-plugin")
71-
vcsUrl.set("https://github.com/europace/docker-publish-gradle-plugin")
75+
val scmUrl = "https://github.com/europace/docker-publish-gradle-plugin"
76+
website.set(scmUrl)
77+
vcsUrl.set(scmUrl)
7278
plugins {
7379
create("dockerPublishPlugin") {
7480
id = "de.europace.docker-publish"
@@ -79,11 +85,22 @@ gradlePlugin {
7985
}
8086
}
8187
publishing {
82-
publications.withType(MavenPublication::class).configureEach {
83-
pom {
84-
url.set("https://github.com/europace/docker-publish-gradle-plugin")
85-
scm {
86-
url.set("https://github.com/europace/docker-publish-gradle-plugin")
88+
publications {
89+
register("plugin", MavenPublication::class) {
90+
from(components["java"])
91+
pom {
92+
url.set(scmUrl)
93+
scm {
94+
url.set(scmUrl)
95+
}
96+
}
97+
}
98+
withType(MavenPublication::class).configureEach {
99+
pom {
100+
url.set(scmUrl)
101+
scm {
102+
url.set(scmUrl)
103+
}
87104
}
88105
}
89106
}

gradle/libs.versions.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ kotest = "5.9.1"
55
kotlin = "2.0.0"
66
kotlinx = "1.8.1"
77
mockk = "1.13.12"
8+
okio = "3.9.0"
89

910

1011
[libraries]
@@ -19,8 +20,10 @@ mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
1920
annotations = { module = "org.jetbrains:annotations", version = "24.1.0" }
2021
byteBuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "byteBuddy" }
2122
kotlinx = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "kotlinx" }
22-
okio = { module = "com.squareup.okio:okio", version = "3.9.0" }
23+
okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
24+
okioJvm = { module = "com.squareup.okio:okio-jvm", version.ref = "okio" }
2325
opentest4j = { module = "org.opentest4j:opentest4j", version = "1.3.0" }
26+
slf4j = { module = "org.slf4j:slf4j-api", version = "2.0.13" }
2427

2528
[bundles]
2629
kotest = ["kotest", "kotestEngine", "kotestProperty", "kotestRunner"]

0 commit comments

Comments
 (0)