Коммит 6ebe5e24 создал по автору Leonid Stashevsky's avatar Leonid Stashevsky Зафиксировано автором Leonid Stashevsky
Просмотр файлов

KTOR-5543 Disable Js legacy backend

владелец 48138bbd
Скрыть пробелы
Построчно Рядом
build.gradle.kts
Просмотр файла @ 6ebe5e24
......@@ -226,3 +226,22 @@ fun KotlinMultiplatformExtension.configureSourceSets() {
findByName("jvmTest")?.resources?.srcDirs("jvmAndNix/test-resources")
}
}
allprojects {
val jsTest = tasks.findByName("jsTest") ?: return@allprojects
val cleanJsTest = tasks.findByName("cleanJsTest") ?: return@allprojects
val cleanJsIrTest by tasks.creating {
dependsOn(cleanJsTest)
}
val jsIrTest by tasks.creating {
dependsOn(jsTest)
}
}
val jsLegacyTest by tasks.creating {
}
val cleanJsLegacyTest by tasks.creating {
}
buildSrc/src/main/kotlin/JsConfig.kt
Просмотр файла @ 6ebe5e24
......@@ -20,12 +20,12 @@ fun Project.configureJs() {
}
}
configureTestTask()
configureJsTestTasks()
}
private fun Project.configureJsTasks() {
kotlin {
js {
js(IR) {
nodejs {
testTask {
useMocha {
......@@ -64,12 +64,12 @@ private fun Project.configureJsTasks() {
}
}
private fun Project.configureTestTask() {
private fun Project.configureJsTestTasks() {
val shouldRunJsBrowserTest = !hasProperty("teamcity") || hasProperty("enable-js-tests")
if (shouldRunJsBrowserTest) return
val jsLegacyBrowserTest by tasks.getting
jsLegacyBrowserTest.onlyIf { shouldRunJsBrowserTest }
val jsIrBrowserTest by tasks.getting
jsIrBrowserTest.onlyIf { shouldRunJsBrowserTest }
val cleanJsBrowserTest by tasks.getting
val jsBrowserTest by tasks.getting
cleanJsBrowserTest.onlyIf { false }
jsBrowserTest.onlyIf { false }
}
buildSrc/src/main/kotlin/Publication.kt
Просмотр файла @ 6ebe5e24
......@@ -21,7 +21,6 @@ fun isAvailableForPublication(publication: Publication): Boolean {
"androidRelease",
"androidDebug",
"js",
"jsLegacy",
"metadata",
"kotlinMultiplatform"
)
......
buildSrc/src/main/kotlin/TargetsConfig.kt
Просмотр файла @ 6ebe5e24
......@@ -29,7 +29,7 @@ fun Project.configureTargets() {
kotlin {
if (hasJs) {
js {
js(IR) {
nodejs()
browser()
}
......
gradle.properties
Просмотр файла @ 6ebe5e24
......@@ -22,22 +22,19 @@ org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
kotlin.native.ignoreDisabledTargets=true
kotlin.mpp.stability.nowarn=true
kotlin.mpp.enableCompatibilityMetadataVariant=true
kotlin.js.compiler=both
kotlin.mpp.enableCInteropCommonization=true
kotlin.internal.mpp.hierarchicalStructureByDefault=true
kotlin.incremental.js=true
kotlin.incremental.multiplatform=true
kotlin.native.ignoreIncorrectDependencies=true
kotlin.native.binary.memoryModel=experimental
kotlinx.atomicfu.enableJvmIrTransformation=true
kotlinx.atomicfu.enableJsIrTransformation=true
#kotlinx.atomicfu.enableJvmIrTransformation=true
#kotlinx.atomicfu.enableJsIrTransformation=true
kotlin_version=1.8.10
coroutines_version=1.6.4
atomicfu_version=0.18.0
atomicfu_version=0.20.0
slf4j_version=1.7.36
junit_version=4.13.2
logback_version=1.2.11
kotlin-js-store/yarn.lock
Просмотр файла @ 6ebe5e24
......@@ -245,10 +245,10 @@ 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:
version "8.7.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
acorn@^8.7.1:
version "8.8.2"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
agent-base@6:
version "6.0.2"
......@@ -667,7 +667,7 @@ engine.io@~6.2.1:
engine.io-parser "~5.0.3"
ws "~8.2.3"
enhanced-resolve@^5.9.3:
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==
......@@ -1900,7 +1900,7 @@ void-elements@^2.0.0:
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
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==
......@@ -1951,21 +1951,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"
......@@ -1978,7 +1978,7 @@ webpack@5.73.0:
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"
whatwg-url@^5.0.0:
......
ktor-io/js/test/io/ktor/utils/io/VerifyingObjectPool.kt
Просмотр файла @ 6ebe5e24
......@@ -6,7 +6,6 @@ package io.ktor.utils.io
import io.ktor.utils.io.pool.*
// TODO: KT-21487: Support common way to get identity hash code in legacy and IR Kotlin/JS backends.
@Suppress("NOTHING_TO_INLINE")
internal actual inline fun identityHashCode(instance: Any): Int = instance.hashCode()
......
ktor-server/ktor-server-plugins/ktor-server-jte/build.gradle.kts
Просмотр файла @ 6ebe5e24
......@@ -3,7 +3,7 @@
*/
kotlin.sourceSets {
val jteVersion = "2.2.4"
val jteVersion = "2.2.6"
val jvmMain by getting {
dependencies {
api("gg.jte:jte:$jteVersion")
......
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать