mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-01-05 01:50:56 +07:00
[kotlin] Update Kotlin New Project wizard version to Kotlin 2.2.0
KTIJ-34624 (cherry picked from commit c61735be51e47aec00cbd5eea11bca7ff18aa96b) IJ-CR-167101 GitOrigin-RevId: 6600f06c312d2133d0daec29bcf901073d04bf45
This commit is contained in:
committed by
intellij-monorepo-bot
parent
b6444b4359
commit
625e18edd4
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.tools.projectWizard.compatibility.KotlinGradleCompat
|
|||||||
*/
|
*/
|
||||||
internal val DEFAULT_KOTLIN_GRADLE_COMPATIBILITY_DATA = KotlinGradleCompatibilityState(
|
internal val DEFAULT_KOTLIN_GRADLE_COMPATIBILITY_DATA = KotlinGradleCompatibilityState(
|
||||||
kotlinVersions = listOf(
|
kotlinVersions = listOf(
|
||||||
|
"2.2.0",
|
||||||
"2.1.21",
|
"2.1.21",
|
||||||
"2.1.20",
|
"2.1.20",
|
||||||
"2.1.10",
|
"2.1.10",
|
||||||
@@ -47,6 +48,11 @@ internal val DEFAULT_KOTLIN_GRADLE_COMPATIBILITY_DATA = KotlinGradleCompatibilit
|
|||||||
"1.5.0",
|
"1.5.0",
|
||||||
),
|
),
|
||||||
compatibility = listOf(
|
compatibility = listOf(
|
||||||
|
KotlinGradleVersionMapping(
|
||||||
|
kotlin = "2.2.0-2.2.30",
|
||||||
|
gradle = "7.6.3-8.15",
|
||||||
|
maxJvmTarget = 24,
|
||||||
|
),
|
||||||
KotlinGradleVersionMapping(
|
KotlinGradleVersionMapping(
|
||||||
kotlin = "2.1.0-2.1.30",
|
kotlin = "2.1.0-2.1.30",
|
||||||
gradle = "7.6.3-8.15",
|
gradle = "7.6.3-8.15",
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.tools.projectWizard.compatibility.KotlinWizardVersio
|
|||||||
* DO NOT EDIT IT BY HAND, run "Generate Kotlin Wizard Default Data" configuration instead
|
* DO NOT EDIT IT BY HAND, run "Generate Kotlin Wizard Default Data" configuration instead
|
||||||
*/
|
*/
|
||||||
internal val DEFAULT_KOTLIN_WIZARD_VERSIONS = KotlinWizardVersionState(
|
internal val DEFAULT_KOTLIN_WIZARD_VERSIONS = KotlinWizardVersionState(
|
||||||
kotlinPluginVersion = "2.1.21",
|
kotlinPluginVersion = "2.2.0",
|
||||||
kotlinForComposeVersion = "1.7.20",
|
kotlinForComposeVersion = "1.7.20",
|
||||||
composeCompilerExtension = "1.4.3",
|
composeCompilerExtension = "1.4.3",
|
||||||
minGradleFoojayVersion = "7.6",
|
minGradleFoojayVersion = "7.6",
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
{
|
{
|
||||||
"ideVersion": "2023.1 EAP-INF",
|
"ideVersion": "2023.1 EAP-INF",
|
||||||
"kotlinVersions": [
|
"kotlinVersions": [
|
||||||
|
"2.2.0",
|
||||||
"2.1.21",
|
"2.1.21",
|
||||||
"2.1.20",
|
"2.1.20",
|
||||||
"2.1.10",
|
"2.1.10",
|
||||||
@@ -39,6 +40,11 @@
|
|||||||
"1.5.0"
|
"1.5.0"
|
||||||
],
|
],
|
||||||
"compatibility": [
|
"compatibility": [
|
||||||
|
{
|
||||||
|
"kotlin": "2.2.0-2.2.30",
|
||||||
|
"gradle": "7.6.3-8.15",
|
||||||
|
"maxJvmTarget": 24
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"kotlin": "2.1.0-2.1.30",
|
"kotlin": "2.1.0-2.1.30",
|
||||||
"gradle": "7.6.3-8.15",
|
"gradle": "7.6.3-8.15",
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
{
|
{
|
||||||
"ideVersion": "2023.1 EAP-INF",
|
"ideVersion": "2023.1 EAP-INF",
|
||||||
|
|
||||||
"kotlinVersion": "2.1.21",
|
"kotlinVersion": "2.2.0",
|
||||||
"kotlinForComposeVersion": "1.7.20",
|
"kotlinForComposeVersion": "1.7.20",
|
||||||
"composeCompilerExtension": "1.4.3",
|
"composeCompilerExtension": "1.4.3",
|
||||||
|
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ abstract class GradleKotlinNewProjectWizardTestCase : GradleNewProjectWizardTest
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun ModuleInfo.Builder.withKotlinBuildFile(
|
fun ModuleInfo.Builder.withKotlinBuildFile(
|
||||||
kotlinJvmPluginVersion: String? = "2.1.21",
|
kotlinJvmPluginVersion: String? = "2.2.0",
|
||||||
configure: GradleBuildScriptBuilder<*>.() -> Unit = {}
|
configure: GradleBuildScriptBuilder<*>.() -> Unit = {}
|
||||||
) {
|
) {
|
||||||
withBuildFile {
|
withBuildFile {
|
||||||
|
|||||||
Reference in New Issue
Block a user