Skip to content

Commit c1562da

Browse files
committed
Change dir structure
1 parent 619e73f commit c1562da

File tree

70 files changed

+1945
-26
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1945
-26
lines changed

build-logic/src/main/kotlin/build.publish.gradle.kts

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66

77
publishing {
88
publications.create<MavenPublication>("jvm") {
9-
artifactId = project.name
9+
artifactId = artifactName()
1010
from(components["java"])
1111
versionMapping {
1212
usage("java-api") {
@@ -19,7 +19,7 @@ publishing {
1919
pom {
2020
name.set(project.name)
2121
description.set(project.description ?: rootProject.description ?: "Kotlin logging library")
22-
url.set("https://github.com/coditory/klog")
22+
url.set("https://github.com/coditory/kttp")
2323
organization {
2424
name = "Coditory"
2525
url = "https://coditory.com"
@@ -38,12 +38,12 @@ publishing {
3838
}
3939
}
4040
scm {
41-
connection.set("scm:git:git://github.com/coditory/klog.git")
42-
url.set("https://github.com/coditory/klog")
41+
connection.set("scm:git:git://github.com/coditory/kttp.git")
42+
url.set("https://github.com/coditory/kttp")
4343
}
4444
issueManagement {
4545
system.set("GitHub")
46-
url.set("https://github.com/coditory/klog/issues")
46+
url.set("https://github.com/coditory/kttp/issues")
4747
}
4848
}
4949
}
@@ -61,3 +61,23 @@ tasks.javadoc {
6161
(options as StandardJavadocDocletOptions).addBooleanOption("html5", true)
6262
}
6363
}
64+
65+
tasks.register("artifactName") {
66+
doLast {
67+
println(artifactName())
68+
}
69+
}
70+
71+
fun artifactName(): String {
72+
var result = project.name
73+
var proj = project.parent
74+
while (proj != null) {
75+
result = proj.name + "-" + result
76+
proj = proj.parent
77+
}
78+
return if (result.startsWith("kttp-")) {
79+
result
80+
} else {
81+
"kttp-$result"
82+
}
83+
}

build.gradle.kts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@ plugins {
55
}
66

77
allprojects {
8-
group = "com.coditory.ktserver"
9-
description = "Async Kotlin Http server"
8+
group = "com.coditory.kttp"
9+
description = "Kotlin HTTP layer"
1010
}
1111

1212
dependencies {
13-
project(":ktserver-api")
14-
project(":ktserver-core")
15-
project(":ktserver-jdk")
16-
project(":ktserver-sample")
13+
project(":api")
14+
project(":server:api")
15+
project(":server:core")
16+
project(":server:jdk")
17+
project(":server:samples")
1718

1819
// merged coverage report
19-
kover(project(":ktserver-api"))
20-
kover(project(":ktserver-core"))
21-
kover(project(":ktserver-jdk"))
20+
kover(project(":api"))
21+
kover(project(":server:api"))
22+
kover(project(":server:core"))
23+
kover(project(":server:jdk"))
2224
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id("build.publish")
55
}
66

7-
description = "KtServer - API"
7+
description = "Kttp Server - API"
88

99
dependencies {
1010
implementation(libs.kotlin.reflect)

ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpChain.kt renamed to kttp-api/src/main/kotlin/com/coditory/ktserver/HttpChain.kt

File renamed without changes.

ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpChannel.kt renamed to kttp-api/src/main/kotlin/com/coditory/ktserver/HttpChannel.kt

File renamed without changes.

ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpErrorHandler.kt renamed to kttp-api/src/main/kotlin/com/coditory/ktserver/HttpErrorHandler.kt

File renamed without changes.

ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpExchange.kt renamed to kttp-api/src/main/kotlin/com/coditory/ktserver/HttpExchange.kt

File renamed without changes.

ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpFilter.kt renamed to kttp-api/src/main/kotlin/com/coditory/ktserver/HttpFilter.kt

File renamed without changes.

ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpHandler.kt renamed to kttp-api/src/main/kotlin/com/coditory/ktserver/HttpHandler.kt

File renamed without changes.

ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpRequestMatcher.kt renamed to kttp-api/src/main/kotlin/com/coditory/ktserver/HttpRequestMatcher.kt

File renamed without changes.

0 commit comments

Comments
 (0)