Skip to content

Commit 0725512

Browse files
authored
Merge pull request #5 from IAmNickNack/develop
2 parents 1f59599 + 37bfa6f commit 0725512

4 files changed

Lines changed: 8 additions & 5 deletions

File tree

‎build-logic/build.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ dependencies {
1515
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
1616
implementation("com.google.protobuf:protobuf-gradle-plugin:0.9.5")
1717
}
18+
19+
kotlin {
20+
jvmToolchain(24)
21+
}

‎build-logic/src/main/kotlin/buildlogic/github-package.gradle.kts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ publishing {
2121
groupId = project.group as String
2222
artifactId = project.name
2323
version = project.version as String
24-
// Only publish the standard JAR. No shadow jars
25-
artifact(tasks.named<Jar>("jar").get())
24+
from(components["java"])
2625
}
2726
}
2827
}

‎pi4j-plugin-grpc-server/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ plugins {
55
id("buildlogic.grpc.grpc-kotlin")
66
id("buildlogic.kotlin-core")
77
id("buildlogic.test.test-kotlin")
8-
id("buildlogic.github-package")
98
alias(libs.plugins.shadow)
109
application
1110
}

‎pi4j-plugin-grpc/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ plugins {
77
}
88

99
dependencies {
10-
implementation(libs.bundles.pi4j)
11-
implementation(libs.jakarta.annotation)
10+
api(libs.pi4j.core)
11+
compileOnly(libs.jakarta.annotation)
1212

1313
testImplementation(project(":pi4j-plugin-grpc-server"))
14+
testImplementation(libs.pi4j.plugin.mock)
1415
testImplementation(libs.grpc.testing)
1516
testImplementation(libs.kotlin.coroutines.core)
1617
testImplementation(libs.protobuf.kotlin)

0 commit comments

Comments
 (0)