Skip to content

Commit e13ef1a

Browse files
committed
try fixing publishing
1 parent e60721e commit e13ef1a

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ semver {
4949
}
5050

5151
val gitCommit = semver.info.shortCommit
52+
val dirty = semver.info.dirty
5253
ext {
5354
set("gitCommit", semver.info.shortCommit)
5455
set("gitBranch", semver.info.branch.name)
@@ -68,7 +69,7 @@ subprojects {
6869
}
6970

7071
tasks.withType<PublishToMavenRepository>().configureEach {
71-
onlyIf { !semver.info.dirty }
72+
onlyIf { !dirty }
7273
}
7374

7475
tasks.withType<JavaCompile>().configureEach {

publish.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
apply plugin: 'signing'
1818

19-
project.plugins.withType(MavenPublishPlugin).all {
19+
project.plugins.withType(MavenPublishPlugin).configureEach {
2020
def pubExt = project.extensions.getByType(PublishingExtension)
21-
pubExt.publications.withType(MavenPublication).all { pub ->
21+
pubExt.publications.withType(MavenPublication).configureEach { pub ->
2222

2323
if (rootProject.hasProperty('signingKey')) {
2424
def signingKey = findProperty("signingKey")

ziti/src/main/kotlin/org/openziti/net/ZitiServerSocketChannel.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ import kotlin.io.encoding.ExperimentalEncodingApi
4848
import kotlin.time.Duration.Companion.seconds
4949
import kotlinx.coroutines.channels.Channel as Chan
5050

51-
internal class ZitiServerSocketChannel(val ctx: ZitiContextImpl): AsynchronousServerSocketChannel(null),
52-
Channel.MessageReceiver, Logged by ZitiLog() {
51+
internal class ZitiServerSocketChannel(val ctx: ZitiContextImpl):
52+
AsynchronousServerSocketChannel(null),
53+
Channel.MessageReceiver,
54+
Logged by ZitiLog() {
5355

5456
lateinit var localAddr: ZitiAddress.Bind
5557
var channel: Channel? = null
@@ -312,4 +314,8 @@ internal class ZitiServerSocketChannel(val ctx: ZitiContextImpl): AsynchronousSe
312314
val REBIND_DELAY = 3.seconds
313315
val MAX_REBIND_INTERVAL = 5
314316
}
317+
318+
private inner class Binder(val ch: Channel) {
319+
320+
}
315321
}

0 commit comments

Comments
 (0)