Skip to content

Commit 2836720

Browse files
authored
Update and resolve github issues (#24)
* Update Kotlin * Update Gradle * Update Plugins * Update Libraries * Fix documentation * Extend documentation * Update documentation * Increase version * Make it works * Add new targets
1 parent 3e5ff96 commit 2836720

File tree

7 files changed

+44
-30
lines changed

7 files changed

+44
-30
lines changed

README.md

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ The **Kotlin Object Multiplatform Mapper** provides you a possibility to generat
1212
[![Maven Central](https://img.shields.io/maven-central/v/com.ucasoft.komm/komm-plugins-iterable?label=KOMM-Plugins-Iterable&color=blue)](https://search.maven.org/artifact/com.ucasoft.komm/komm-plugins-iterable)
1313
---
1414
* [Features](#features)
15+
* [Supported targets](#supported-targets)
1516
* [Default plugins](#default-plugins)
1617
* [Usage](#usage)
1718
* [Add](#add-with-gradle)
@@ -52,20 +53,30 @@ The **Kotlin Object Multiplatform Mapper** provides you a possibility to generat
5253
* Specify null substitute to map nullable properties into not-nullable
5354
* Support extension via plugins
5455

56+
## Supported targets
57+
* JVM
58+
* JavaScript
59+
* Linux
60+
* Windows (mingwX64)
61+
* macOS
62+
* iOS
63+
5564
## Default plugins
5665
* Iterable Plugin:
5766
* Support collections mapping with different types of elements
67+
* Exposed Plugin:
68+
* Support mapping from Exposed Table Object (ResultRow)
5869

5970
## Usage
6071
### Add with Gradle
6172

6273
#### JVM Project
6374
```kotlin
6475
plugins {
65-
id("com.google.devtools.ksp") version "2.0.20-1.0.25"
76+
id("com.google.devtools.ksp") version "2.1.0-1.0.29"
6677
}
6778

68-
val kommVersion = "0.20.2"
79+
val kommVersion = "0.22.8"
6980

7081
depensencies {
7182
implementation("com.ucasoft.komm:komm-annotations:$kommVersion")
@@ -75,10 +86,10 @@ depensencies {
7586
#### Multiplatform Project
7687
```kotlin
7788
plugins {
78-
id("com.google.devtools.ksp") version "2.0.20-1.0.25"
89+
id("com.google.devtools.ksp") version "2.1.0-1.0.29"
7990
}
8091

81-
val kommVersion = "0.20.2"
92+
val kommVersion = "0.22.8"
8293

8394
kotlin {
8495
jvm {
@@ -353,10 +364,10 @@ class IntResolver(destination: DestinationObject?): KOMMResolver<DestinationObje
353364
from = [SourceObject::class]
354365
)
355366
data class DestinationObject(
356-
@NullSubatitute(MapDefault(IntResolver::class))
367+
@NullSubstitute(MapDefault(IntResolver::class))
357368
val id: Int
358369
) {
359-
@NullSubatitute(MapDefault(IntResolver::class), "id")
370+
@NullSubstitute(MapDefault(IntResolver::class), "id")
360371
var otherId: Int = 0
361372
}
362373
```
@@ -374,7 +385,7 @@ fun SourceObject.toDestinationObject(): DestinationObject = DestinationObject(
374385
to = [DestinationObject::class]
375386
)
376387
data class SourceObject(
377-
@NullSubatitute(MapDefault(IntResolver::class))
388+
@NullSubstitute(MapDefault(IntResolver::class))
378389
val id: Int?
379390
)
380391
```
@@ -391,11 +402,11 @@ fun SourceObject.toDestinationObject(): DestinationObject = DestinationObject(
391402
from = [FirstSourceObject::class, SecondSourceObject::class]
392403
)
393404
data class DestinationObject(
394-
@NullSubatitute(MapDefault(IntResolver::class), [FirstSourceObject::class])
405+
@NullSubstitute(MapDefault(IntResolver::class), [FirstSourceObject::class])
395406
@MapName("userId", [SecondSourceObject::class])
396407
val id: Int
397408
) {
398-
@NullSubatitute(MapDefault(IntResolver::class), "id", [FirstSourceObject::class])
409+
@NullSubstitute(MapDefault(IntResolver::class), "id", [FirstSourceObject::class])
399410
var otherId: Int = 0
400411
}
401412

@@ -419,11 +430,11 @@ in case, different sources should be configured different:
419430
from = [SecondSourceObject::class]
420431
)
421432
data class DestinationObject(
422-
@NullSubatitute(MapDefault(IntResolver::class), [FirstSourceObject::class])
433+
@NullSubstitute(MapDefault(IntResolver::class), [FirstSourceObject::class])
423434
@MapName("userId", [SecondSourceObject::class])
424435
val id: Int
425436
) {
426-
@NullSubatitute(MapDefault(IntResolver::class), "id", [FirstSourceObject::class])
437+
@NullSubstitute(MapDefault(IntResolver::class), "id", [FirstSourceObject::class])
427438
var otherId: Int = 0
428439
}
429440
```
@@ -448,10 +459,10 @@ fun SecondSourceObject.toDestinationObject(): DestinationObject = DestinationObj
448459
###### JVM Project
449460
```kotlin
450461
plugins {
451-
id("com.google.devtools.ksp") version "2.0.20-1.0.25"
462+
id("com.google.devtools.ksp") version "2.1.0-1.0.29"
452463
}
453464

454-
val kommVersion = "0.20.2"
465+
val kommVersion = "0.22.8"
455466

456467
depensencies {
457468
implementation("com.ucasoft.komm:komm-annotations:$kommVersion")
@@ -462,10 +473,10 @@ depensencies {
462473
###### Multiplatform Project
463474
```kotlin
464475
plugins {
465-
id("com.google.devtools.ksp") version "2.0.20-1.0.25"
476+
id("com.google.devtools.ksp") version "2.1.0-1.0.29"
466477
}
467478

468-
val kommVersion = "0.20.2"
479+
val kommVersion = "0.22.8"
469480

470481
//...
471482

@@ -522,10 +533,10 @@ public fun SourceObject.toDestinationObject(): DestinationObject = DestinationOb
522533
###### JVM Project
523534
```kotlin
524535
plugins {
525-
id("com.google.devtools.ksp") version "2.0.20-1.0.25"
536+
id("com.google.devtools.ksp") version "2.1.0-1.0.29"
526537
}
527538

528-
val kommVersion = "0.20.2"
539+
val kommVersion = "0.22.8"
529540

530541
depensencies {
531542
implementation("com.ucasoft.komm:komm-annotations:$kommVersion")

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ plugins {
66
}
77

88
tasks.wrapper {
9-
gradleVersion = "8.10.2"
9+
gradleVersion = "8.12"
1010
}
1111

1212
allprojects {
1313
group = "com.ucasoft.komm"
1414

15-
version = "0.20.2"
15+
version = "0.22.8"
1616

1717
repositories {
1818
mavenCentral()

gradle/libs.versions.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[versions]
2-
kotlin = "2.0.0"
3-
ksp = "2.0.20-1.0.25"
2+
kotlin = "2.0.21"
3+
ksp = "2.0.21-1.0.28"
44
kotlin-poet = "1.18.1"
55
compile-testing = "1.6.0"
6-
junit = "5.11.1"
6+
junit = "5.11.4"
77
kotest = "5.9.1"
8-
kover = "0.8.3"
9-
mockk = "1.13.12"
10-
classgraph = "4.8.176"
11-
exposed = "0.55.0"
8+
kover = "0.9.1"
9+
mockk = "1.13.16"
10+
classgraph = "4.8.179"
11+
exposed = "0.57.0"
1212

1313
[libraries]
1414
ksp-processor = { group = "com.google.devtools.ksp", name = "symbol-processing-api", version.ref = "ksp" }

gradle/wrapper/gradle-wrapper.jar

79 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

komm-annotations/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ kotlin {
1212
linuxX64()
1313
mingwX64()
1414
macosX64()
15+
macosArm64()
1516
iosX64()
17+
iosArm64()
18+
iosSimulatorArm64()
1619
sourceSets {
1720
val commonMain by getting {
1821
kotlin.srcDir("src/main/kotlin")

settings.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
pluginManagement {
22
resolutionStrategy {
33
plugins {
4-
val kotlinVersion = "2.0.20"
4+
val kotlinVersion = "2.0.21"
55
kotlin("multiplatform") version kotlinVersion apply false
6-
id("com.google.devtools.ksp") version "$kotlinVersion-1.0.25" apply false
6+
id("com.google.devtools.ksp") version "$kotlinVersion-1.0.28" apply false
77
}
88
}
99
}
1010

1111
plugins {
12-
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
12+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
1313
}
1414

1515
rootProject.name = "komm"

0 commit comments

Comments
 (0)