Skip to content

Commit 4cd3b86

Browse files
krutilovdkrasnoff
authored andcommitted
ktl-1683 fix: change flags -Xuse-fir-extended-checkers, -Xir-only to -Wextra
1 parent 540c4f9 commit 4cd3b86

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

common/src/main/kotlin/component/KotlinEnvironment.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class KotlinEnvironment(
5252
"-opt-in=kotlin.io.encoding.ExperimentalEncodingApi",
5353
"-Xcontext-receivers",
5454
"-Xreport-all-warnings",
55-
"-Xuse-fir-extended-checkers",
55+
"-Wextra",
5656
"-XXLanguage:+ExplicitBackingFields",
5757
)
5858
}
@@ -127,7 +127,6 @@ class KotlinEnvironment(
127127
val messageCollector = MessageCollector.NONE
128128
put(CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector)
129129
put(CommonConfigurationKeys.MODULE_NAME, "web-module")
130-
put(JSConfigurationKeys.TYPED_ARRAYS_ENABLED, true)
131130
put(JSConfigurationKeys.PROPERTY_LAZY_INITIALIZATION, true)
132131

133132
languageVersionSettings = arguments.toLanguageVersionSettings(messageCollector)

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
kotlin = "2.1.0-Beta1"
2+
kotlin = "2.1.0-Beta2"
33
kotlinIdeVersion = "1.9.20-506"
44
kotlinIdeVersionWithSuffix = "231-1.9.20-506-IJ8109.175"
55
spring-boot = "2.7.10"

src/main/kotlin/com/compiler/server/compiler/components/CliUtils.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ fun <T> CLICompiler<*>.tryCompilation(inputDirectory: Path, inputFiles: List<Pat
7575
STRONG_WARNING, WARNING -> ProjectSeveriry.WARNING
7676
INFO, LOGGING, OUTPUT -> return ""
7777
}
78-
7978
val textInterval = location?.let {
8079
TextInterval(
8180
start = TextInterval.TextPosition(minusOne(location.line), minusOne(location.column)),

src/main/kotlin/com/compiler/server/compiler/components/KotlinToJSTranslator.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ class KotlinToJSTranslator(
9696
val klibPath = (outputDir / "klib").toFile().canonicalPath
9797
val additionalCompilerArgumentsForKLib = listOf(
9898
"-Xreport-all-warnings",
99-
"-Xuse-fir-extended-checkers",
100-
"-Xir-only",
99+
"-Wextra",
101100
"-Xir-produce-klib-dir",
102101
"-libraries=${kotlinEnvironment.JS_LIBRARIES.joinToString(PATH_SEPARATOR)}",
103102
"-ir-output-dir=$klibPath",
@@ -107,8 +106,7 @@ class KotlinToJSTranslator(
107106
.flatMap {
108107
k2JSCompiler.tryCompilation(inputDir, ioFiles, listOf(
109108
"-Xreport-all-warnings",
110-
"-Xuse-fir-extended-checkers",
111-
"-Xir-only",
109+
"-Wextra",
112110
"-Xir-produce-js",
113111
"-Xir-dce",
114112
"-Xinclude=$klibPath",
@@ -159,7 +157,7 @@ class KotlinToJSTranslator(
159157
} ?: emptyList()
160158
val additionalCompilerArgumentsForKLib: List<String> = listOf(
161159
"-Xreport-all-warnings",
162-
"-Xuse-fir-extended-checkers",
160+
"-Wextra",
163161
"-Xwasm",
164162
"-Xir-produce-klib-dir",
165163
"-libraries=${dependencies.joinToString(PATH_SEPARATOR)}",
@@ -171,7 +169,7 @@ class KotlinToJSTranslator(
171169
.flatMap {
172170
k2JSCompiler.tryCompilation(inputDir, ioFiles, mutableListOf(
173171
"-Xreport-all-warnings",
174-
"-Xuse-fir-extended-checkers",
172+
"-Wextra",
175173
"-Xwasm",
176174
"-Xir-produce-js",
177175
"-Xir-dce",

0 commit comments

Comments
 (0)