Skip to content

Commit d514420

Browse files
committed
Merge branch 'refs/heads/master' into nextKotlin
# Conflicts: # docs/CHANGELOG.md
2 parents 9cfba9d + e0d126e commit d514420

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

docs/CHANGELOG.md

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,35 @@ But there is no intent to bump the Ktorfit major version for every KSP update.
1212
2.0.1 - 2024-08-08
1313
========================================
1414
### Fixed
15-
- #594 Endpoint with types from other module
16-
- #591 Ktorfit plugin doesn't include correct generate source if build directory changes #591
17-
- #621 RequestConverter causing compile error
15+
- Endpoint with types from other module #594
16+
- Ktorfit plugin doesn't include correct generate source if build directory changes #591
17+
- RequestConverter causing compile error #621
1818
- Build with Ktor 2.3.12
1919

20+
### ktorfit-annotations
21+
- 2.0.1: The annotations are now also avaiable for WasmJs
22+
2023
### compilerPlugin
2124
- Kotlin 2.0.0: 2.0.1-2.0.0 - 2024-08-08
2225
- Kotlin 2.0.10: 2.0.1-2.0.10 - 2024-08-10
2326
- Kotlin 2.0.20-RC: 2.0.1-2.0.20-RC - 2024-08-13
27+
- Kotlin 2.0.20-RC2: 2.0.1-2.0.20-RC2 - 2024-08-13
2428
- Kotlin 2.0.20: 2.0.1-2.0.20 - 2024-08-23
2529

2630
### ktorfit-ksp
2731
- KSP 1.0.24: ktorfit-ksp-2.0.1-1.0.24 - 2024-08-08
2832

33+
### Ktor3
34+
The "normal" dependencies will stay on Ktor 2.x till 3.0 is stable. But here are versions that you can use when want to use Ktor3 and WasmJs
35+
36+
| Project | Version |
37+
|-----------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
38+
| ktorfit-lib-light-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-lib-light-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-lib-light-ktor-3.0.0-beta-2) |
39+
| ktorfit-lib-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-lib-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-lib-ktor-3.0.0-beta-2) |
40+
| ktorfit-converters-flow-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-flow-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-flow-ktor-3.0.0-beta-2) |
41+
| ktorfit-converters-call-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-call-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-call-ktor-3.0.0-beta-2) |
42+
| ktorfit-converters-response-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-response-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-response-ktor-3.0.0-beta-2) |
43+
2944
# [2.0.0]()
3045

3146
ktorfit-ksp-2.0.0-1.0.24 - 2024-08-06

example/AndroidOnlyExample/app/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,16 @@ dependencies {
6565
implementation("de.jensklingenberg.ktorfit:ktorfit-converters-flow:$ktorfit")
6666

6767

68-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.2")
69-
implementation("androidx.activity:activity-compose:1.9.0")
68+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.4")
69+
implementation("androidx.activity:activity-compose:1.9.1")
7070
implementation("androidx.compose.ui:ui:$compose_ui_version")
7171
implementation("androidx.compose.ui:ui-tooling-preview:$compose_ui_version")
7272
implementation("androidx.compose.material:material:1.6.7")
7373
debugImplementation("androidx.compose.ui:ui-tooling:$compose_ui_version")
7474
debugImplementation("androidx.compose.ui:ui-test-manifest:$compose_ui_version")
7575
testImplementation("junit:junit:4.13.2")
7676
androidTestImplementation("androidx.test.ext:junit:1.1.5")
77-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
77+
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
7878
androidTestImplementation("androidx.compose.ui:ui-test-junit4:$compose_ui_version")
7979
}
8080

0 commit comments

Comments
 (0)