From c234b406705b5ff8fc5169fc1fc6ca3606392c31 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Wed, 8 Aug 2018 14:26:08 +0300
Subject: [PATCH] Misc: Update AS3.3 version to 182.4928781

---
 .../intellij-sdk/build.gradle.kts.as33        | 37 ++-----------------
 versions.gradle.kts.as33                      |  4 +-
 2 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts.as33 b/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts.as33
index ab78f8b4d9e..559f683f8d0 100644
--- a/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts.as33
+++ b/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts.as33
@@ -65,32 +65,14 @@ repositories {
                 artifact()
             }
         }
-        ivy {
-            artifactPattern("https://dl.bintray.com/kotlin/as/[artifact]-[revision].zip")
-            credentials {
-                username = System.getenv("AS_BINTRAY_USER_NAME")
-                password = System.getenv("AS_BINTRAY_API_KEY")
-            }
-            metadataSources {
-                artifact()
-            }
-        }
     }
     maven { setUrl("$intellijRepo/$intellijReleaseType") }
     maven { setUrl("https://plugins.jetbrains.com/maven") }
-//    github returns broken pipe =(
-//    ivy {
-//        artifactPattern("https://raw.github.com/JetBrains/intellij-community/[revision]/lib/src/[artifact].zip")
-//        metadataSources {
-//            artifact()
-//        }
-//    }
 }
 
 val intellij by configurations.creating
 val intellijUltimate by configurations.creating
 val sources by configurations.creating
-val `asm-shaded-sources` by configurations.creating
 val `jps-standalone` by configurations.creating
 val `jps-build-test` by configurations.creating
 val `intellij-core` by configurations.creating
@@ -114,12 +96,6 @@ dependencies {
         }
     }
     sources("com.jetbrains.intellij.idea:ideaIC:$intellijVersion:sources@jar")
-//    if (platformBaseVersion == "182") {
-//        // There is no asm sources for 182 yet
-//        `asm-shaded-sources`("asmsources:asm-src:181@zip")
-//    } else {
-//        `asm-shaded-sources`("asmsources:asm-src:$platformBaseVersion@zip")
-//    }
     `jps-standalone`("com.jetbrains.intellij.idea:jps-standalone:$intellijVersion")
     `jps-build-test`("com.jetbrains.intellij.idea:jps-build-test:$intellijVersion")
     `intellij-core`("com.jetbrains.intellij.idea:intellij-core:$intellijVersion")
@@ -148,7 +124,7 @@ fun Task.configureExtractFromConfigurationTask(sourceConfig: Configuration,
 
 fun removePathPrefix(path: String): String {
     if (androidStudioRelease == null) return path
-    val slashes = 2 // if (studioOs == "mac") 2 else 1
+    val slashes = if (studioOs == "mac") 2 else 1
     var result = path
     repeat(slashes) {
         result = result.substringAfter('/')
@@ -176,14 +152,7 @@ val unzipIntellijCore by tasks.creating { configureExtractFromConfigurationTask(
 
 val unzipJpsStandalone by tasks.creating { configureExtractFromConfigurationTask(`jps-standalone`) { zipTree(it.singleFile) } }
 
-//val copyAsmShadedSources by tasks.creating(Copy::class.java) {
-//    from(`asm-shaded-sources`)
-//    rename(".zip", ".jar")
-//    destinationDir = File(repoDir, `asm-shaded-sources`.name)
-//}
-
 val copyIntellijSdkSources by tasks.creating(ShadowJar::class.java) {
-//    from(copyAsmShadedSources)
     from(sources)
     baseName = "ideaIC"
     version = intellijVersion
@@ -214,7 +183,7 @@ fun writeIvyXml(moduleName: String, fileName: String, jarFiles: FileCollection,
 }
 
 val prepareIvyXmls by tasks.creating {
-    dependsOn(unzipIntellijCore, unzipJpsStandalone, copyIntellijSdkSources, copyJpsBuildTest/*, copyAsmShadedSources */)
+    dependsOn(unzipIntellijCore, unzipJpsStandalone, copyIntellijSdkSources, copyJpsBuildTest)
 
     val intellijSdkDir = File(repoDir, intellij.name)
     val intellijUltimateSdkDir = File(repoDir, intellijUltimate.name)
@@ -231,7 +200,7 @@ val prepareIvyXmls by tasks.creating {
         outputs.file(File(repoDir, "${intellijUltimate.name}.ivy.xml"))
     }
 
-    val flatDeps = listOf(`intellij-core`, `jps-standalone`, `jps-build-test`, `asm-shaded-sources`)
+    val flatDeps = listOf(`intellij-core`, `jps-standalone`, `jps-build-test`)
     flatDeps.forEach {
         inputs.dir(File(repoDir, it.name))
         outputs.file(File(repoDir, "${it.name}.ivy.xml"))
diff --git a/versions.gradle.kts.as33 b/versions.gradle.kts.as33
index 9637947fcb0..29520750bb5 100644
--- a/versions.gradle.kts.as33
+++ b/versions.gradle.kts.as33
@@ -1,8 +1,8 @@
 extra["versions.intellijSdk"] = "182.2371.4"
 extra["versions.androidBuildTools"] = "r23.0.1"
 extra["versions.idea.NodeJS"] = "181.3494.12"
-extra["versions.androidStudioRelease"] = "3.3.0.3"
-extra["versions.androidStudioBuild"] = "182.4902073"
+extra["versions.androidStudioRelease"] = "3.3.0.4"
+extra["versions.androidStudioBuild"] = "182.4928781"
 
 val gradleJars = listOf(
     "gradle-api",