Kotlin 1.8.0 + Ktor 2.2.1

kosi-libs · Dec 29, 2022 · e0d3d6a · e0d3d6a
1 parent 05b0b2b
commit e0d3d6a
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 26 deletions.
diff --git a/doc/antora.yml b/doc/antora.yml
@@ -12,5 +12,5 @@ asciidoc:
   attributes:
     branch: '7.17'
     version: '7.17.0'
-    kotlin: '1.7.20'
+    kotlin: '1.8.0'
     jdk: '1.8'
diff --git a/doc/modules/core/pages/install.adoc b/doc/modules/core/pages/install.adoc
@@ -103,7 +103,9 @@ kotlin {
 [[kotlin-js]]
 == JavaScript (Gradle)
 
-Because _Kodein-DI_ for JavaScript is compiled as a https://github.com/umdjs/umd[UMD module], it can be imported:
+NOTE: Since Kotlin 1.8, legacy backend has been deprecated, thus starting from 7.17.0 Kodein is only available for JS-IR.
+
+Because _Kodein_ for JavaScript is compiled as a https://github.com/umdjs/umd[UMD module], it can be imported:
 
 * In a browser:
 ** as an AMD module (for example with RequireJS) (See index.html in the demo project).

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,19 +1,19 @@
 [versions]
 # Core
-kaverit-version = "2.2.1"
-kotlin-version = "1.7.20"
+kaverit-version = "2.3.0"
+kotlin-version = "1.8.0"
 # Android
 android-appcompat-version = "28.0.0"
 androidx-appcompat-version = "1.5.1"
 androidx-fragment-version = "1.5.4"
 androidx-lifecycle-version = "2.5.1"
 # Compose
-compose-version = "1.2.1"
+compose-version = "1.3.0-rc01" # Not yet compatible with Kotlin 1.8
 # KSP
 kotlinpoet-version = "1.12.0"
 ksp-version = "1.7.20-1.0.8"
 # Ktor
-ktor-version = "2.1.3"
+ktor-version = "2.2.1"
 # JxInject
 javax-inject-version = "1"
 # TornadoFX

diff --git a/kodein-di-conf/build.gradle.kts b/kodein-di-conf/build.gradle.kts
@@ -19,7 +19,7 @@ kodein {
             target.setCompileClasspath()
         }
 
-        add(kodeinTargets.js.js)
+        add(kodeinTargets.js.ir.js)
 
         add(kodeinTargets.native.all)
 

diff --git a/kodein-di/build.gradle.kts b/kodein-di/build.gradle.kts
@@ -16,7 +16,7 @@ kodein {
         add(kodeinTargets.jvm.jvm) {
             target.setCompileClasspath()
         }
-        add(kodeinTargets.js.js)
+        add(kodeinTargets.js.ir.js)
         add(kodeinTargets.native.all)
 
     }

diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
@@ -269,11 +269,16 @@ acorn-import-assertions@^1.7.6:
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
   integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
 
-acorn@^8.4.1, acorn@^8.5.0:
+acorn@^8.5.0:
   version "8.7.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
   integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
+acorn@^8.7.1:
+  version "8.8.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
+  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
+
 ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
@@ -638,10 +643,10 @@ engine.io@~6.2.0:
     engine.io-parser "~5.0.3"
     ws "~8.2.3"
 
-enhanced-resolve@^5.9.3:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
-  integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
+enhanced-resolve@^5.10.0:
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
+  integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -1743,7 +1748,7 @@ void-elements@^2.0.0:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
   integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==
 
-watchpack@^2.3.1:
+watchpack@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
   integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
@@ -1789,21 +1794,21 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@5.73.0:
-  version "5.73.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38"
-  integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==
+webpack@5.74.0:
+  version "5.74.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
+  integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"
     "@webassemblyjs/ast" "1.11.1"
     "@webassemblyjs/wasm-edit" "1.11.1"
     "@webassemblyjs/wasm-parser" "1.11.1"
-    acorn "^8.4.1"
+    acorn "^8.7.1"
     acorn-import-assertions "^1.7.6"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.9.3"
+    enhanced-resolve "^5.10.0"
     es-module-lexer "^0.9.0"
     eslint-scope "5.1.1"
     events "^3.2.0"
@@ -1816,7 +1821,7 @@ [email protected]:
     schema-utils "^3.1.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.1.3"
-    watchpack "^2.3.1"
+    watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
 which@^1.2.1:

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
         maven(url = "https://raw.githubusercontent.com/kosi-libs/kodein-internal-gradle-plugin/mvn-repo")
     }
     dependencies {
-        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:6.22.0")
+        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:6.23.1")
     }
 }
 
@@ -46,6 +46,7 @@ framework("tfx").include(
         ":framework:tornadofx:kodein-di-framework-tornadofx-jvm"
 )
 
-framework("compose").include(
-        ":framework:compose:kodein-di-framework-compose"
-)
+// Compose is not yet compatible with Kotlin 1.8
+//framework("compose").include(
+//        ":framework:compose:kodein-di-framework-compose"
+//)
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
@@ -16,7 +16,7 @@ kodein {
             }
         }
 
-        add(kodeinTargets.js.js)
+        add(kodeinTargets.js.ir.js)
 
         add(kodeinTargets.native.all)
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ kodein { @@
                 }
             }
-            add(kodeinTargets.js.js)
+            add(kodeinTargets.js.ir.js)
             add(kodeinTargets.native.all)
@@ Expand Down @@