azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dependencies for AS34

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-11-08 10:00:24 +01:00
parent cf9b2e6377
commit e8db36e2f1
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34
+4 -4
View File
@@ -14,16 +14,16 @@ import org.jdom.Element
// Generalized in 183 // Generalized in 183
// BUNCH: 183 // BUNCH: 183
typealias RunConfigurationBaseAny = RunConfigurationBase typealias RunConfigurationBaseAny = RunConfigurationBase<*>
// Generalized in 183 // Generalized in 183
// BUNCH: 183 // BUNCH: 183
typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*> typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*, *>
// Generalized in 183 // Generalized in 183
// BUNCH: 183 // BUNCH: 183
typealias LocatableConfigurationBaseAny = LocatableConfigurationBase typealias LocatableConfigurationBaseAny = LocatableConfigurationBase<Any>
// Generalized in 183 // Generalized in 183
// BUNCH: 183 // BUNCH: 183
typealias ModuleBasedConfigurationElement<T> = ModuleBasedConfiguration<T> typealias ModuleBasedConfigurationElement<T> = ModuleBasedConfiguration<T, Element>
versions.gradle.kts.as34
+6 -5
View File
@@ -1,8 +1,8 @@
extra["versions.intellijSdk"] = "183.2153.8" extra["versions.intellijSdk"] = "183.3975.18"
extra["versions.androidBuildTools"] = "r23.0.1" extra["versions.androidBuildTools"] = "r23.0.1"
extra["versions.idea.NodeJS"] = "181.3494.12" extra["versions.idea.NodeJS"] = "181.3494.12"
extra["versions.androidStudioRelease"] = "3.4.0.1" extra["versions.androidStudioRelease"] = "3.4.0.2"
extra["versions.androidStudioBuild"] = "183.5081642" extra["versions.androidStudioBuild"] = "183.5112304"
val gradleJars = listOf( val gradleJars = listOf(
"gradle-api", "gradle-api",
@@ -37,7 +37,7 @@ when (platform) {
extra["versions.jar.swingx-core"] = "1.6.2-2" extra["versions.jar.swingx-core"] = "1.6.2-2"
extra["versions.jar.kxml2"] = "2.3.0" extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.7" 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.oro"] = "2.0.8"
extra["versions.jar.picocontainer"] = "1.2" extra["versions.jar.picocontainer"] = "1.2"
for (jar in gradleJars) { for (jar in gradleJars) {
@@ -159,7 +159,7 @@ when (platform) {
extra["versions.jar.swingx-core"] = "1.6.2-2" extra["versions.jar.swingx-core"] = "1.6.2-2"
extra["versions.jar.kxml2"] = "2.3.0" extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.7" 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.oro"] = "2.0.8"
extra["versions.jar.picocontainer"] = "1.2" extra["versions.jar.picocontainer"] = "1.2"
for (jar in gradleJars) { for (jar in gradleJars) {
@@ -169,6 +169,7 @@ when (platform) {
extra["ignore.jar.snappy-in-java"] = true extra["ignore.jar.snappy-in-java"] = true
extra["ignore.jar.common"] = true extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true extra["ignore.jar.lombok-ast"] = true
extra["versions.jar.asm-all"] = "7.0-beta"
} }
} }