Skip to content

Commit ec2e5cc

Browse files
jaguilillajaguililla
committed
Update dependencies
1 parent 990b2ac commit ec2e5cc

5 files changed

Lines changed: 63 additions & 62 deletions

File tree

‎build.gradle.kts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ plugins {
1010

1111
val os = getProperty("os.name").lowercase()
1212

13-
val hexagonVersion = "3.7.4"
14-
val hexagonExtraVersion = "3.6.0"
13+
val hexagonVersion = "4.1.0"
1514
val vertxVersion = "4.5.13"
1615
val slf4jVersion = "2.0.17"
1716

@@ -34,20 +33,21 @@ if (current() !in setOf(VERSION_17, VERSION_18, VERSION_19, VERSION_20, VERSION_
3433
error("This build must be run with JDK 17+. Current: ${current()}")
3534

3635
dependencies {
37-
"implementation"("com.hexagonkt:http_server_netty:$hexagonVersion")
38-
"implementation"("com.hexagonkt:serialization_jackson_json:$hexagonVersion")
39-
"implementation"("com.hexagonkt:serialization_jackson_yaml:$hexagonVersion")
40-
"implementation"("com.hexagonkt:serialization_jackson_toml:$hexagonVersion")
41-
"implementation"("com.hexagonkt:templates_pebble:$hexagonVersion")
42-
"implementation"("com.hexagonkt:web:$hexagonVersion")
43-
"implementation"("com.hexagonkt.extra:args:$hexagonExtraVersion")
36+
"implementation"("com.hexagontk:helpers:$hexagonVersion")
37+
"implementation"("com.hexagontk.http:http_server_netty:$hexagonVersion")
38+
"implementation"("com.hexagontk.serialization:serialization_jackson_json:$hexagonVersion")
39+
"implementation"("com.hexagontk.serialization:serialization_jackson_yaml:$hexagonVersion")
40+
"implementation"("com.hexagontk.serialization:serialization_jackson_toml:$hexagonVersion")
41+
"implementation"("com.hexagontk.templates:templates_pebble:$hexagonVersion")
42+
"implementation"("com.hexagontk.http:web:$hexagonVersion")
43+
"implementation"("com.hexagontk.extra:shell:$hexagonVersion")
4444

4545
"implementation"("io.vertx:vertx-json-schema:$vertxVersion")
4646
"implementation"("org.slf4j:log4j-over-slf4j:$slf4jVersion")
4747
"implementation"("org.slf4j:jcl-over-slf4j:$slf4jVersion")
4848
"implementation"("org.slf4j:slf4j-jdk14:$slf4jVersion")
4949

50-
"testImplementation"("com.hexagonkt:http_client_jetty:$hexagonVersion")
50+
"testImplementation"("com.hexagontk.http:http_client_jetty:$hexagonVersion")
5151
}
5252

5353
tasks.named("classes") { dependsOn("addResources") }

‎src/main/kotlin/Cli.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package co.codecv
22

3-
import com.hexagonkt.args.*
4-
import com.hexagonkt.args.Property.Companion.HELP
5-
import com.hexagonkt.args.Property.Companion.VERSION
6-
import com.hexagonkt.core.require
3+
import com.hexagontk.shell.*
4+
import com.hexagontk.shell.Property.Companion.HELP
5+
import com.hexagontk.shell.Property.Companion.VERSION
6+
import com.hexagontk.core.require
77

88
internal fun createProgram(buildProperties: Map<String, String>): Program {
99
val urlParamDescription = "URL for the CV file to use. If no schema, 'file' is assumed"

‎src/main/kotlin/Cv.kt‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
package co.codecv
22

3-
import com.hexagonkt.args.Command
4-
import com.hexagonkt.core.*
5-
import com.hexagonkt.core.OsKind.*
6-
import com.hexagonkt.core.logging.logger
7-
import com.hexagonkt.core.media.mediaTypeOfOrNull
8-
import com.hexagonkt.core.text.wordsToCamel
9-
import com.hexagonkt.http.handlers.HttpContext
10-
import com.hexagonkt.http.model.ContentType
11-
import com.hexagonkt.http.model.Header
12-
import com.hexagonkt.http.server.HttpServer
13-
import com.hexagonkt.http.server.HttpServerSettings
14-
import com.hexagonkt.http.server.callbacks.UrlCallback
15-
import com.hexagonkt.http.server.netty.NettyServerAdapter
16-
import com.hexagonkt.http.server.serve
17-
import com.hexagonkt.serialization.SerializationManager
18-
import com.hexagonkt.serialization.jackson.json.Json
19-
import com.hexagonkt.serialization.jackson.toml.Toml
20-
import com.hexagonkt.serialization.jackson.yaml.Yaml
21-
import com.hexagonkt.serialization.parseMap
22-
import com.hexagonkt.serialization.serialize
23-
import com.hexagonkt.templates.TemplateManager
24-
import com.hexagonkt.templates.pebble.PebbleAdapter
25-
import com.hexagonkt.web.callContext
26-
import com.hexagonkt.web.template
3+
import com.hexagontk.shell.Command
4+
import com.hexagontk.core.*
5+
import com.hexagontk.helpers.properties
6+
import com.hexagontk.core.OsKind.*
7+
import com.hexagontk.core.media.mediaTypeOfOrNull
8+
import com.hexagontk.helpers.exec
9+
import com.hexagontk.helpers.text.wordsToCamel
10+
import com.hexagontk.http.handlers.HttpContext
11+
import com.hexagontk.http.model.ContentType
12+
import com.hexagontk.http.model.Header
13+
import com.hexagontk.http.server.HttpServer
14+
import com.hexagontk.http.server.HttpServerSettings
15+
import com.hexagontk.http.server.callbacks.UrlCallback
16+
import com.hexagontk.http.server.netty.NettyHttpServer
17+
import com.hexagontk.http.server.serve
18+
import com.hexagontk.serialization.SerializationManager
19+
import com.hexagontk.serialization.jackson.json.Json
20+
import com.hexagontk.serialization.jackson.toml.Toml
21+
import com.hexagontk.serialization.jackson.yaml.Yaml
22+
import com.hexagontk.serialization.parseMap
23+
import com.hexagontk.serialization.serialize
24+
import com.hexagontk.templates.TemplateManager
25+
import com.hexagontk.templates.pebble.Pebble
26+
import com.hexagontk.web.callContext
27+
import com.hexagontk.web.template
2728
import io.vertx.core.json.JsonObject
2829
import io.vertx.json.schema.Draft.DRAFT7
2930
import io.vertx.json.schema.JsonSchema
@@ -58,7 +59,7 @@ const val templateOptShortName: Char = 't'
5859
const val formatOptShortName: Char = 'f'
5960

6061
private val browseCommand: List<String> by lazy {
61-
when (Jvm.osKind) {
62+
when (Platform.osKind) {
6263
WINDOWS -> listOf("start")
6364
MACOS -> listOf("open")
6465
LINUX, UNIX -> listOf("xdg-open")
@@ -73,7 +74,7 @@ fun main(vararg args: String) {
7374
val project = buildProperties.require("project")
7475
val loggingConfiguration = urlOf("classpath:logging.properties")
7576

76-
System.setProperty("hexagonkt_logging_logger_name", project)
77+
System.setProperty("hexagontk_logging_logger_name", project)
7778
LogManager.getLogManager().readConfiguration(loggingConfiguration.openStream())
7879
SerializationManager.formats = linkedSetOf(Yaml, Json, Toml)
7980

@@ -95,7 +96,7 @@ private fun exit(exception: Exception) {
9596
logger.error(exception) { exception.message }
9697
val code = (exception as? CodedException)?.code ?: 500
9798

98-
if (Jvm.systemFlag(preventExitFlag))
99+
if (Platform.systemFlag(preventExitFlag))
99100
System.setProperty(exitCodeProperty, code.toString())
100101
else
101102
exitProcess(code)
@@ -140,14 +141,14 @@ private fun validate(command: Command) {
140141
}
141142

142143
private fun serve(command: Command) {
143-
TemplateManager.adapters = mapOf(Regex(".*") to PebbleAdapter(false, 1 * 1024 * 1024))
144+
TemplateManager.adapters = mapOf(Regex(".*") to Pebble(false, 1 * 1024 * 1024))
144145

145146
val address = addressParameter(command)
146147
val url = urlParameter(command)
147148
val urlString = url.toString()
148149
val serverSettings = HttpServerSettings(address, zip = true)
149150
val scriptSources = "https://unpkg.com/rapidoc/ 'unsafe-inline'"
150-
val adapter = NettyServerAdapter(executorThreads = 4, soBacklog = 1024)
151+
val adapter = NettyHttpServer(executorThreads = 4, soBacklog = 1024)
151152

152153
server = serve(adapter, serverSettings) {
153154
after("*") { addHeaders(scriptSources) }

‎src/test/kotlin/CvTest.kt‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package co.codecv
22

3-
import com.hexagonkt.core.urlOf
4-
import com.hexagonkt.http.client.HttpClient
5-
import com.hexagonkt.http.client.HttpClientSettings
6-
import com.hexagonkt.http.client.jetty.JettyClientAdapter
7-
import com.hexagonkt.http.model.BAD_REQUEST_400
8-
import com.hexagonkt.http.model.HttpResponsePort
9-
import com.hexagonkt.http.model.HttpStatus
10-
import com.hexagonkt.http.model.OK_200
3+
import com.hexagontk.http.client.HttpClient
4+
import com.hexagontk.http.client.HttpClientSettings
5+
import com.hexagontk.http.client.jetty.JettyHttpClient
6+
import com.hexagontk.http.model.BAD_REQUEST_400
7+
import com.hexagontk.http.model.HttpResponsePort
8+
import com.hexagontk.http.model.OK_200
119
import org.junit.jupiter.api.AfterEach
1210
import org.junit.jupiter.api.BeforeEach
1311
import org.junit.jupiter.api.Test
@@ -16,6 +14,7 @@ import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
1614
import java.io.File
1715
import java.lang.System.getProperty
1816
import java.lang.System.setProperty
17+
import java.net.URI
1918
import kotlin.test.assertEquals
2019

2120
@TestInstance(PER_CLASS)
@@ -103,9 +102,9 @@ internal class CvTest {
103102
checkExitCode(404)
104103

105104
main("serve", "file:src/test/resources/incorrect.cv.yml")
106-
val baseUrl = urlOf("http://localhost:${server.runtimePort}")
107-
val settings = HttpClientSettings(baseUrl = baseUrl)
108-
val http = HttpClient(JettyClientAdapter(), settings)
105+
val baseUri = URI("http://localhost:${server.runtimePort}")
106+
val settings = HttpClientSettings(baseUri = baseUri)
107+
val http = HttpClient(JettyHttpClient(), settings)
109108
http.start()
110109
assertEquals(BAD_REQUEST_400, http.get("/cv").status)
111110
server.stop()
@@ -124,9 +123,9 @@ internal class CvTest {
124123
}
125124

126125
private fun testHttp(port: Int) {
127-
val baseUrl = urlOf("http://localhost:$port")
128-
val settings = HttpClientSettings(baseUrl = baseUrl)
129-
val http = HttpClient(JettyClientAdapter(), settings)
126+
val baseUri = URI("http://localhost:$port")
127+
val settings = HttpClientSettings(baseUri = baseUri)
128+
val http = HttpClient(JettyHttpClient(), settings)
130129

131130
http.start()
132131
http.get("/openapi.json").checkResponse()
@@ -153,7 +152,7 @@ internal class CvTest {
153152
setProperty(exitCodeProperty, "")
154153
}
155154

156-
private fun HttpResponsePort.checkResponse(expectedStatus: HttpStatus = OK_200) {
155+
private fun HttpResponsePort.checkResponse(expectedStatus: Int = OK_200) {
157156
assertEquals(expectedStatus, status)
158157
}
159158
}

‎src/test/kotlin/slides/Slides.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package co.codecv.slides
22

3-
import com.hexagonkt.http.server.HttpServerSettings
4-
import com.hexagonkt.http.server.callbacks.FileCallback
5-
import com.hexagonkt.http.server.netty.serve
3+
import com.hexagontk.http.server.HttpServerSettings
4+
import com.hexagontk.http.server.callbacks.FileCallback
5+
import com.hexagontk.http.server.netty.NettyHttpServer
6+
import com.hexagontk.http.server.serve
67
import java.io.File
78

89
fun main() {
9-
serve(HttpServerSettings(bindPort = 9999)) {
10+
serve(NettyHttpServer(), HttpServerSettings(bindPort = 9999)) {
1011
get("/*", FileCallback(File("src/test/resources")))
1112
}
1213
}

0 commit comments

Comments
 (0)