Skip to content

Commit cc20719

Browse files
FL-34414: Revert target to 21 for Fleet modules (Fleet runtime is still 21)
GitOrigin-RevId: 860bda10c32d067a43873a404f95c88492651794
1 parent 0e59215 commit cc20719

98 files changed

Lines changed: 308 additions & 129 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

fleet/andel/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
44

55
create_kotlinc_options(
66
name = "custom_andel",
7+
jvm_target = "21",
78
opt_in = ["kotlin.concurrent.atomics.ExperimentalAtomicApi"],
89
x_consistent_data_class_copy_visibility = True,
910
x_context_parameters = True,

fleet/andel/fleet.andel.iml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<module type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="kotlin-language" name="Kotlin">
5-
<configuration version="5" platform="JVM 25" allPlatforms="JVM [25]" useProjectSettings="false">
5+
<configuration version="5" platform="JVM 21" allPlatforms="JVM [21]" useProjectSettings="false">
66
<compilerSettings>
77
<option name="additionalArguments" value="-Xcontext-parameters -Xjvm-default=all -Xlambdas=class -Xconsistent-data-class-copy-visibility -opt-in=kotlin.concurrent.atomics.ExperimentalAtomicApi -Xwasm-kclass-fqn -XXLanguage:+AllowEagerSupertypeAccessibilityChecks -progressive" />
88
</compilerSettings>
99
<compilerArguments>
1010
<stringArguments>
11-
<stringArg name="jvmTarget" arg="25" />
11+
<stringArg name="jvmTarget" arg="21" />
1212
<stringArg name="apiVersion" arg="2.3" />
1313
<stringArg name="languageVersion" arg="2.3" />
1414
</stringArguments>
@@ -22,7 +22,7 @@
2222
</configuration>
2323
</facet>
2424
</component>
25-
<component name="NewModuleRootManager" inherit-compiler-output="true">
25+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_21" inherit-compiler-output="true">
2626
<exclude-output />
2727
<content url="file://$MODULE_DIR$">
2828
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />

fleet/bifurcan/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
44

55
create_kotlinc_options(
66
name = "custom_bifurcan",
7+
jvm_target = "21",
78
opt_in = ["kotlin.concurrent.atomics.ExperimentalAtomicApi"],
89
x_consistent_data_class_copy_visibility = True,
910
x_context_parameters = True,

fleet/bifurcan/fleet.bifurcan.iml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<module type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="kotlin-language" name="Kotlin">
5-
<configuration version="5" platform="JVM 25" allPlatforms="JVM [25]" useProjectSettings="false">
5+
<configuration version="5" platform="JVM 21" allPlatforms="JVM [21]" useProjectSettings="false">
66
<compilerSettings>
77
<option name="additionalArguments" value="-Xcontext-parameters -Xjvm-default=all -Xlambdas=class -Xconsistent-data-class-copy-visibility -opt-in=kotlin.concurrent.atomics.ExperimentalAtomicApi -Xwasm-kclass-fqn -XXLanguage:+AllowEagerSupertypeAccessibilityChecks -progressive" />
88
</compilerSettings>
99
<compilerArguments>
1010
<stringArguments>
11-
<stringArg name="jvmTarget" arg="25" />
11+
<stringArg name="jvmTarget" arg="21" />
1212
<stringArg name="apiVersion" arg="2.3" />
1313
<stringArg name="languageVersion" arg="2.3" />
1414
</stringArguments>
@@ -21,7 +21,7 @@
2121
</configuration>
2222
</facet>
2323
</component>
24-
<component name="NewModuleRootManager" inherit-compiler-output="true">
24+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_21" inherit-compiler-output="true">
2525
<exclude-output />
2626
<content url="file://$MODULE_DIR$">
2727
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />

fleet/build/authentication/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
44

55
create_kotlinc_options(
66
name = "custom_authentication",
7+
jvm_target = "21",
78
opt_in = [
89
"kotlinx.coroutines.ExperimentalCoroutinesApi",
910
"kotlin.ExperimentalStdlibApi",

fleet/build/authentication/fleet.build.authentication.iml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<module type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="kotlin-language" name="Kotlin">
5-
<configuration version="5" platform="JVM 25" allPlatforms="JVM [25]" useProjectSettings="false">
5+
<configuration version="5" platform="JVM 21" allPlatforms="JVM [21]" useProjectSettings="false">
66
<compilerSettings>
77
<option name="additionalArguments" value="-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi -opt-in=kotlin.ExperimentalStdlibApi -Xlambdas=class -Xconsistent-data-class-copy-visibility -Xcontext-parameters -XXLanguage:+AllowEagerSupertypeAccessibilityChecks -progressive" />
88
</compilerSettings>
99
<compilerArguments>
1010
<stringArguments>
11-
<stringArg name="jvmTarget" arg="25" />
11+
<stringArg name="jvmTarget" arg="21" />
1212
<stringArg name="apiVersion" arg="2.3" />
1313
<stringArg name="languageVersion" arg="2.3" />
1414
</stringArguments>
@@ -22,7 +22,7 @@
2222
</configuration>
2323
</facet>
2424
</component>
25-
<component name="NewModuleRootManager" inherit-compiler-output="true">
25+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_21" inherit-compiler-output="true">
2626
<content url="file://$MODULE_DIR$">
2727
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
2828
<sourceFolder url="file://$MODULE_DIR$/srcJvmMain" isTestSource="false" />

fleet/build/bundles/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
44

55
create_kotlinc_options(
66
name = "custom_bundles",
7+
jvm_target = "21",
78
opt_in = [
89
"kotlinx.coroutines.ExperimentalCoroutinesApi",
910
"kotlin.ExperimentalStdlibApi",

fleet/build/bundles/fleet.build.bundles.iml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<module type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="kotlin-language" name="Kotlin">
5-
<configuration version="5" platform="JVM 25" allPlatforms="JVM [25]" useProjectSettings="false">
5+
<configuration version="5" platform="JVM 21" allPlatforms="JVM [21]" useProjectSettings="false">
66
<compilerSettings>
77
<option name="additionalArguments" value="-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi -opt-in=kotlin.ExperimentalStdlibApi -Xlambdas=class -Xconsistent-data-class-copy-visibility -Xcontext-parameters -XXLanguage:+AllowEagerSupertypeAccessibilityChecks -progressive" />
88
</compilerSettings>
99
<compilerArguments>
1010
<stringArguments>
11-
<stringArg name="jvmTarget" arg="25" />
11+
<stringArg name="jvmTarget" arg="21" />
1212
<stringArg name="apiVersion" arg="2.3" />
1313
<stringArg name="languageVersion" arg="2.3" />
1414
</stringArguments>
@@ -22,7 +22,7 @@
2222
</configuration>
2323
</facet>
2424
</component>
25-
<component name="NewModuleRootManager" inherit-compiler-output="true">
25+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_21" inherit-compiler-output="true">
2626
<content url="file://$MODULE_DIR$">
2727
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
2828
<sourceFolder url="file://$MODULE_DIR$/srcJvmMain" isTestSource="false" />

fleet/build/cli/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
1414

1515
create_kotlinc_options(
1616
name = "custom_cli",
17+
jvm_target = "21",
1718
opt_in = [
1819
"kotlinx.coroutines.ExperimentalCoroutinesApi",
1920
"kotlin.ExperimentalStdlibApi",

fleet/build/cli/fleet.build.cli.iml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
<module type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="kotlin-language" name="Kotlin">
5-
<configuration version="5" platform="JVM 25" allPlatforms="JVM [25]" useProjectSettings="false">
5+
<configuration version="5" platform="JVM 21" allPlatforms="JVM [21]" useProjectSettings="false">
66
<compilerSettings>
77
<option name="additionalArguments" value="-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi -opt-in=kotlin.ExperimentalStdlibApi -Xlambdas=class -Xconsistent-data-class-copy-visibility -Xcontext-parameters -XXLanguage:+AllowEagerSupertypeAccessibilityChecks -progressive" />
88
</compilerSettings>
99
<compilerArguments>
1010
<stringArguments>
11-
<stringArg name="jvmTarget" arg="25" />
11+
<stringArg name="jvmTarget" arg="21" />
1212
<stringArg name="apiVersion" arg="2.3" />
1313
<stringArg name="languageVersion" arg="2.3" />
1414
</stringArguments>
1515
</compilerArguments>
1616
</configuration>
1717
</facet>
1818
</component>
19-
<component name="NewModuleRootManager" inherit-compiler-output="true">
19+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_21" inherit-compiler-output="true">
2020
<content url="file://$MODULE_DIR$">
2121
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
2222
<sourceFolder url="file://$MODULE_DIR$/srcJvmMain" isTestSource="false" />

0 commit comments

Comments
 (0)