Skip to content

Commit f818064

Browse files
committed
ktl-1683 fix: change flags -Xuse-fir-extended-checkers, -Xir-only to -Wextra
1 parent e484889 commit f818064

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
@@ -53,7 +53,7 @@ class KotlinEnvironment(
5353
"-opt-in=kotlin.io.encoding.ExperimentalEncodingApi",
5454
"-Xcontext-receivers",
5555
"-Xreport-all-warnings",
56-
"-Xuse-fir-extended-checkers",
56+
"-Wextra",
5757
"-XXLanguage:+ExplicitBackingFields",
5858
)
5959
}
@@ -128,7 +128,6 @@ class KotlinEnvironment(
128128
val messageCollector = MessageCollector.NONE
129129
put(CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector)
130130
put(CommonConfigurationKeys.MODULE_NAME, "web-module")
131-
put(JSConfigurationKeys.TYPED_ARRAYS_ENABLED, true)
132131
put(JSConfigurationKeys.PROPERTY_LAZY_INITIALIZATION, true)
133132

134133
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
@@ -95,8 +95,7 @@ class KotlinToJSTranslator(
9595
val klibPath = (outputDir / "klib").toFile().canonicalPath
9696
val additionalCompilerArgumentsForKLib = listOf(
9797
"-Xreport-all-warnings",
98-
"-Xuse-fir-extended-checkers",
99-
"-Xir-only",
98+
"-Wextra",
10099
"-Xir-produce-klib-dir",
101100
"-libraries=${kotlinEnvironment.JS_LIBRARIES.joinToString(PATH_SEPARATOR)}",
102101
"-ir-output-dir=$klibPath",
@@ -106,8 +105,7 @@ class KotlinToJSTranslator(
106105
.flatMap {
107106
k2JSCompiler.tryCompilation(inputDir, ioFiles, listOf(
108107
"-Xreport-all-warnings",
109-
"-Xuse-fir-extended-checkers",
110-
"-Xir-only",
108+
"-Wextra",
111109
"-Xir-produce-js",
112110
"-Xir-dce",
113111
"-Xinclude=$klibPath",
@@ -157,7 +155,7 @@ class KotlinToJSTranslator(
157155
} ?: emptyList()
158156
val additionalCompilerArgumentsForKLib: List<String> = listOf(
159157
"-Xreport-all-warnings",
160-
"-Xuse-fir-extended-checkers",
158+
"-Wextra",
161159
"-Xwasm",
162160
"-Xir-produce-klib-dir",
163161
"-libraries=${dependencies.joinToString(PATH_SEPARATOR)}",
@@ -169,7 +167,7 @@ class KotlinToJSTranslator(
169167
.flatMap {
170168
k2JSCompiler.tryCompilation(inputDir, ioFiles, listOf(
171169
"-Xreport-all-warnings",
172-
"-Xuse-fir-extended-checkers",
170+
"-Wextra",
173171
"-Xwasm",
174172
"-Xwasm-generate-wat",
175173
"-Xir-produce-js",

0 commit comments

Comments
 (0)