Merge pull request #76 from modelix/kotlin-1.8.20

MODELIX-417 Migration to Kotlin 1.8.20

Author: slisson

gradle.properties

@@ -1,6 +1,6 @@
 systemProp.org.gradle.internal.http.socketTimeout=120000
 
-kotlinVersion=1.8.10
+kotlinVersion=1.8.20
 kotlinCoroutinesVersion=1.6.4
 ktorVersion=2.2.4
 kotlinLoggingVersion=3.0.5

kotlin-js-store/yarn.lock

@@ -21,7 +21,7 @@ repositories {
 }
 
 plugins {
-    kotlin("jvm") version "1.8.10"
+    kotlin("jvm") version "1.8.20"
     id("base")
     id("org.modelix.model-api-gen")
 }

model-api-gen-gradle-test/build.gradle.kts

@@ -17,7 +17,7 @@ ktlint {
     outputToConsole.set(true)
     this.filter {
         this.exclude {
-            it.file.toPath().toAbsolutePath().startsWith(buildDir.toPath().toAbsolutePath())
+            it.file.toPath().toAbsolutePath().startsWith(project(":ts-model-api").buildDir.toPath().toAbsolutePath())
         }
     }
 }
@@ -26,10 +26,6 @@ tasks.named("check") {
     dependsOn("ktlintCheck")
 }
 
-tasks.named("sourcesJar") {
-    dependsOn("jsGenerateExternalsIntegrated")
-}
-
 val kotlinLoggingVersion: String by rootProject
 val kotlinxSerializationVersion: String by rootProject
 
@@ -72,8 +68,9 @@ kotlin {
         val jsMain by getting {
             dependencies {
                 implementation(kotlin("stdlib-js"))
-                api(npm("@modelix/ts-model-api", rootDir.resolve("ts-model-api"), generateExternals = true))
+                api(npm("@modelix/ts-model-api", rootDir.resolve("ts-model-api")))
             }
+            kotlin.srcDir(rootDir.resolve("ts-model-api").resolve("build/dukat"))
         }
         val jsTest by getting {
             dependencies {
@@ -83,10 +80,9 @@ kotlin {
     }
 }
 
-tasks.named("runKtlintCheckOverJsMainSourceSet") {
-    dependsOn("jsGenerateExternalsIntegrated")
-}
-
-tasks.named("jsSourcesJar") {
-    dependsOn("jsGenerateExternalsIntegrated")
+listOf("sourcesJar", "runKtlintCheckOverJsMainSourceSet", "jsSourcesJar", "jsPackageJson", "compileKotlinJs", "jsProcessResources").forEach {
+    tasks.named(it) {
+        dependsOn(":ts-model-api:npm_run_build")
+        dependsOn(":ts-model-api:npm_run_generateKotlin")
+    }
 }

model-api/build.gradle.kts

@@ -22,6 +22,7 @@ tasks.named("npm_run_build") {
 
 tasks.named("assemble") {
   dependsOn("npm_run_build")
+  dependsOn("npm_run_generateKotlin")
 }
 
 val updateVersion = tasks.register<NpmTask>("updateVersion") {

ts-model-api/build.gradle.kts

@@ -30,13 +30,14 @@
     "prepublishOnly": "npm run lint && npm run build",
     "test": "shx echo 'Write your own tests'",
     "ts": "tsc",
-    "watch": "tsc --watch"
+    "watch": "tsc --watch",
+    "generateKotlin": "dukat -m \"@modelix/ts-model-api\" -d build/dukat dist/*.d.ts"
   },
-  "dependencies": {},
   "devDependencies": {
     "@reallyland/tsconfig": "^2.0.0",
     "@reallyland/tslint-config": "^1.1.1",
     "@types/node": "^13.9.8",
+    "dukat": "^0.5.8-rc.4-dev.20221020",
     "husky": "^4.2.3",
     "shx": "^0.3.2",
     "tslint": "^6.1.0",