Skip to content

Commit

Permalink
Gradle and Kotlin updates
Browse files Browse the repository at this point in the history
- Updated to Gradle 8.3
- Updated Kotlin to 1.9.10
- Adapted samples
  • Loading branch information
YanneckReiss committed Sep 28, 2023
1 parent 83a8240 commit cb87101
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 19 deletions.
14 changes: 7 additions & 7 deletions README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,15 @@ The following section describes the required setup to use the **KConMapper** KSP

> Lookup the matching KSP version from the [official GitHub release page]("https://github.com/google/ksp/releases")
of the KSP repository.
As an example: If you're using Kotlin version `1.8.0`, the latest KSP would be `1.8.0-1.0.8`.
As an example: If you're using Kotlin version `1.9.10`, the latest KSP would be `1.9.10-1.0.13`.

<details open>
<summary>groovy - build.gradle(:module-name)</summary>

```groovy
plugins {
// Depends on your project's Kotlin version
id 'com.google.devtools.ksp' version '1.8.0-1.0.8'
id 'com.google.devtools.ksp' version '1.9.10-1.0.13'
}
```
</details>
Expand All @@ -194,7 +194,7 @@ plugins {
```kt
plugins {
// Depends on your project's Kotlin version
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
id("com.google.devtools.ksp") version "1.9.10-1.0.13"
}
```
</details>
Expand All @@ -212,8 +212,8 @@ repositories {
dependencies {
// ..
implementation 'com.github.yanneckreiss.kconmapper:annotations:1.0.0-alpha06'
ksp 'com.github.yanneckreiss.kconmapper:ksp:1.0.0-alpha06'
implementation 'com.github.yanneckreiss.kconmapper:annotations:1.0.0-alpha07'
ksp 'com.github.yanneckreiss.kconmapper:ksp:1.0.0-alpha07'
}
```
</details>
Expand All @@ -228,8 +228,8 @@ repositories {

dependencies {
// ..
implementation("com.github.yanneckreiss.kconmapper:annotations:1.0.0-alpha06")
ksp("com.github.yanneckreiss.kconmapper:ksp:1.0.0-alpha06")
implementation("com.github.yanneckreiss.kconmapper:annotations:1.0.0-alpha07")
ksp("com.github.yanneckreiss.kconmapper:ksp:1.0.0-alpha07")
}
```
</details>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

allprojects {
version = "1.0.0-alpha06"
version = "1.0.0-alpha07"
group = "com.github.yanneckreiss.kconmapper"

repositories {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
kotlinVersion=1.8.21
kspVersion=1.8.21-1.0.11
kotlinVersion=1.9.10
kspVersion=1.9.10-1.0.13
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ import de.yanneckreiss.kconmapper.sample.generictypeexample.cat.CatCareStation
import de.yanneckreiss.kconmapper.sample.generictypeexample.dog.DogCareStation
import java.time.LocalDateTime

@KConMapper(fromClasses = [CatCareStation::class, DogCareStation::class])
class AnimalCareStation<C : Animal>(
@KConMapper(
toClasses = [CatCareStation::class, DogCareStation::class],
fromClasses = [CatCareStation::class, DogCareStation::class],
)
class AnimalCareStation<out C : Animal>(
val animalOne: C,
val animalTwo: C,
val timestamp: LocalDateTime
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
package de.yanneckreiss.kconmapper.sample.generictypeexample.cat

import com.github.yanneckreiss.kconmapper.annotations.KConMapper
import com.github.yanneckreiss.kconmapper.annotations.KConMapperProperty
import de.yanneckreiss.kconmapper.sample.generictypeexample.AnimalCareStation
import java.time.LocalDateTime

@KConMapper(toClasses = [AnimalCareStation::class])
class CatCareStation(

@KConMapperProperty(aliases = ["animalOne"])
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
package de.yanneckreiss.kconmapper.sample.generictypeexample.dog

import com.github.yanneckreiss.kconmapper.annotations.KConMapper
import com.github.yanneckreiss.kconmapper.annotations.KConMapperProperty
import de.yanneckreiss.kconmapper.sample.generictypeexample.AnimalCareStation
import java.time.LocalDateTime

@KConMapper(fromClasses = [AnimalCareStation::class])
class DogCareStation(

@KConMapperProperty(aliases = ["animalOne"])
Expand Down

0 comments on commit cb87101

Please sign in to comment.