diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34 index 76daf1f43e5..acdce22db61 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34 +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34 @@ -14,16 +14,16 @@ import org.jdom.Element // Generalized in 183 // BUNCH: 183 -typealias RunConfigurationBaseAny = RunConfigurationBase +typealias RunConfigurationBaseAny = RunConfigurationBase<*> // Generalized in 183 // BUNCH: 183 -typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*> +typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*, *> // Generalized in 183 // BUNCH: 183 -typealias LocatableConfigurationBaseAny = LocatableConfigurationBase +typealias LocatableConfigurationBaseAny = LocatableConfigurationBase // Generalized in 183 // BUNCH: 183 -typealias ModuleBasedConfigurationElement = ModuleBasedConfiguration \ No newline at end of file +typealias ModuleBasedConfigurationElement = ModuleBasedConfiguration \ No newline at end of file diff --git a/versions.gradle.kts.as34 b/versions.gradle.kts.as34 index 266d0e36db1..5be3204d141 100644 --- a/versions.gradle.kts.as34 +++ b/versions.gradle.kts.as34 @@ -1,8 +1,8 @@ -extra["versions.intellijSdk"] = "183.2153.8" +extra["versions.intellijSdk"] = "183.3975.18" extra["versions.androidBuildTools"] = "r23.0.1" extra["versions.idea.NodeJS"] = "181.3494.12" -extra["versions.androidStudioRelease"] = "3.4.0.1" -extra["versions.androidStudioBuild"] = "183.5081642" +extra["versions.androidStudioRelease"] = "3.4.0.2" +extra["versions.androidStudioBuild"] = "183.5112304" val gradleJars = listOf( "gradle-api", @@ -37,7 +37,7 @@ when (platform) { extra["versions.jar.swingx-core"] = "1.6.2-2" extra["versions.jar.kxml2"] = "2.3.0" extra["versions.jar.streamex"] = "0.6.7" - extra["versions.jar.gson"] = "2.8.4" + extra["versions.jar.gson"] = "2.8.5" extra["versions.jar.oro"] = "2.0.8" extra["versions.jar.picocontainer"] = "1.2" for (jar in gradleJars) { @@ -159,7 +159,7 @@ when (platform) { extra["versions.jar.swingx-core"] = "1.6.2-2" extra["versions.jar.kxml2"] = "2.3.0" extra["versions.jar.streamex"] = "0.6.7" - extra["versions.jar.gson"] = "2.8.4" + extra["versions.jar.gson"] = "2.8.5" extra["versions.jar.oro"] = "2.0.8" extra["versions.jar.picocontainer"] = "1.2" for (jar in gradleJars) { @@ -169,6 +169,7 @@ when (platform) { extra["ignore.jar.snappy-in-java"] = true extra["ignore.jar.common"] = true extra["ignore.jar.lombok-ast"] = true + extra["versions.jar.asm-all"] = "7.0-beta" } }