Skip to content

Commit

Permalink
Feature/kotlin 2.0 (#13)
Browse files Browse the repository at this point in the history
* Update to Kotlin 2.0

* Update libraries

* Update README

* Extend gitignore

* Fix after rebase

* Update library

* Update Kotlin

* Update Gradle

* Update Libraries

* Increase version

* Update Readme
  • Loading branch information
Scogun authored Sep 29, 2024
1 parent 8d1bbd3 commit 3e5ff96
Show file tree
Hide file tree
Showing 14 changed files with 34 additions and 28 deletions.
2 changes: 2 additions & 0 deletions .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@

# Ignore Gradle build output directory
build

.kotlin
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ The **Kotlin Object Multiplatform Mapper** provides you a possibility to generat
#### JVM Project
```kotlin
plugins {
id("com.google.devtools.ksp") version "1.9.25-1.0.20"
id("com.google.devtools.ksp") version "2.0.20-1.0.25"
}

val kommVersion = "0.10.3"
val kommVersion = "0.20.2"

depensencies {
implementation("com.ucasoft.komm:komm-annotations:$kommVersion")
Expand All @@ -75,10 +75,10 @@ depensencies {
#### Multiplatform Project
```kotlin
plugins {
id("com.google.devtools.ksp") version "1.9.25-1.0.20"
id("com.google.devtools.ksp") version "2.0.20-1.0.25"
}

val kommVersion = "0.10.3"
val kommVersion = "0.20.2"

kotlin {
jvm {
Expand Down Expand Up @@ -448,10 +448,10 @@ fun SecondSourceObject.toDestinationObject(): DestinationObject = DestinationObj
###### JVM Project
```kotlin
plugins {
id("com.google.devtools.ksp") version "1.9.25-1.0.20"
id("com.google.devtools.ksp") version "2.0.20-1.0.25"
}

val kommVersion = "0.10.3"
val kommVersion = "0.20.2"

depensencies {
implementation("com.ucasoft.komm:komm-annotations:$kommVersion")
Expand All @@ -462,10 +462,10 @@ depensencies {
###### Multiplatform Project
```kotlin
plugins {
id("com.google.devtools.ksp") version "1.9.25-1.0.20"
id("com.google.devtools.ksp") version "2.0.20-1.0.25"
}

val kommVersion = "0.10.3"
val kommVersion = "0.20.2"

//...

Expand Down Expand Up @@ -522,10 +522,10 @@ public fun SourceObject.toDestinationObject(): DestinationObject = DestinationOb
###### JVM Project
```kotlin
plugins {
id("com.google.devtools.ksp") version "1.9.25-1.0.20"
id("com.google.devtools.ksp") version "2.0.20-1.0.25"
}

val kommVersion = "0.10.3"
val kommVersion = "0.20.2"

depensencies {
implementation("com.ucasoft.komm:komm-annotations:$kommVersion")
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ plugins {
}

tasks.wrapper {
gradleVersion = "8.9"
gradleVersion = "8.10.2"
}

allprojects {
group = "com.ucasoft.komm"

version = "0.10.3"
version = "0.20.2"

repositories {
mavenCentral()
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
kotlin = "1.9.25"
ksp = "1.9.25-1.0.20"
kotlin = "2.0.0"
ksp = "2.0.20-1.0.25"
kotlin-poet = "1.18.1"
compile-testing = "1.6.0"
junit = "5.10.3"
junit = "5.11.1"
kotest = "5.9.1"
kover = "0.8.3"
mockk = "1.13.12"
classgraph = "4.8.174"
exposed = "0.52.0"
classgraph = "4.8.176"
exposed = "0.55.0"

[libraries]
ksp-processor = { group = "com.google.devtools.ksp", name = "symbol-processing-api", version.ref = "ksp" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
5 changes: 2 additions & 3 deletions komm-annotations/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ plugins {
}

kotlin {
jvm {
jvmToolchain(8)
}
jvmToolchain(8)
jvm()
js {
nodejs()
}
Expand Down
2 changes: 1 addition & 1 deletion komm-plugins-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ plugins {
}

kotlin {
jvmToolchain(8)
jvm {
jvmToolchain(8)
withJava()
}
sourceSets {
Expand Down
2 changes: 1 addition & 1 deletion komm-plugins-exposed/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ plugins {
}

kotlin {
jvmToolchain(8)
jvm {
jvmToolchain(8)
tasks.withType<Test> {
useJUnitPlatform()
reports {
Expand Down
2 changes: 1 addition & 1 deletion komm-plugins-iterable/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ plugins {
}

kotlin {
jvmToolchain(8)
jvm {
jvmToolchain(8)
tasks.withType<Test> {
useJUnitPlatform()
reports {
Expand Down
2 changes: 1 addition & 1 deletion komm-processor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ plugins {
}

kotlin {
jvmToolchain(8)
jvm {
jvmToolchain(8)
tasks.withType<Test> {
useJUnitPlatform()
reports {
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pluginManagement {
resolutionStrategy {
plugins {
val kotlinVersion = "1.9.25"
val kotlinVersion = "2.0.20"
kotlin("multiplatform") version kotlinVersion apply false
id("com.google.devtools.ksp") version "$kotlinVersion-1.0.20" apply false
id("com.google.devtools.ksp") version "$kotlinVersion-1.0.25" apply false
}
}
}
Expand Down

0 comments on commit 3e5ff96

Please sign in to comment.