Skip to content

Commit 8a5477f

Browse files
Merge pull request #121 from hypercube1024/firefly-5.0.3
update kotlin version to 2.3, and support jdk25
2 parents dd360aa + d1d81a4 commit 8a5477f

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
strategy:
2323
matrix:
24-
java: [8, 11, 17, 21]
24+
java: [8, 17, 21, 25]
2525

2626
# Steps represent a sequence of tasks that will be executed as part of the job
2727
steps:

firefly-net/src/main/kotlin/com/fireflysource/net/http/client/impl/Http1ClientResponseHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Http1ClientResponseHandler : HttpParser.ResponseHandler {
3131
return 4096
3232
}
3333

34-
override fun startResponse(version: HttpVersion, status: Int, reason: String): Boolean {
34+
override fun startResponse(version: HttpVersion, status: Int, reason: String?): Boolean {
3535
fun updateResponseLine() {
3636
response.httpVersion = version
3737
response.status = status

pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@
6060
<java.release.version>8</java.release.version>
6161

6262
<!-- Kotlin compiler configuration -->
63-
<kotlin.version>1.9.20</kotlin.version>
64-
<kotlin.coroutine.version>1.8.0</kotlin.coroutine.version>
63+
<kotlin.version>2.3.0</kotlin.version>
64+
<kotlin.coroutine.version>1.10.2</kotlin.coroutine.version>
6565
<kotlin.compiler.incremental>false</kotlin.compiler.incremental>
6666
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
67-
<kotlin.compiler.languageVersion>1.9</kotlin.compiler.languageVersion>
68-
<kotlin.compiler.apiVersion>1.9</kotlin.compiler.apiVersion>
67+
<kotlin.compiler.languageVersion>2.3</kotlin.compiler.languageVersion>
68+
<kotlin.compiler.apiVersion>2.3</kotlin.compiler.apiVersion>
6969
<kotlin.code.style>official</kotlin.code.style>
7070

7171
<!-- Kotlin doc configuration -->
72-
<dokka.version>1.9.20</dokka.version>
72+
<dokka.version>2.1.0</dokka.version>
7373
<dokka.config.noStdlibLink>true</dokka.config.noStdlibLink>
7474
<dokka.config.jdkVersion>8</dokka.config.jdkVersion>
7575

@@ -324,7 +324,7 @@
324324
<plugin>
325325
<groupId>org.jacoco</groupId>
326326
<artifactId>jacoco-maven-plugin</artifactId>
327-
<version>0.8.12</version>
327+
<version>0.8.14</version>
328328
<dependencies>
329329
<dependency>
330330
<groupId>org.apache.maven.reporting</groupId>
@@ -1348,7 +1348,7 @@
13481348
<dependency>
13491349
<groupId>org.mockito</groupId>
13501350
<artifactId>mockito-core</artifactId>
1351-
<version>5.10.0</version>
1351+
<version>5.21.0</version>
13521352
<scope>test</scope>
13531353
</dependency>
13541354
</dependencies>

0 commit comments

Comments
 (0)