From eeab271eff984252f5d5dfc96bce5f106a0421dd Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Fri, 18 May 2018 21:22:23 +0300 Subject: [PATCH] 182: IDEA-SDK fixed to `182.2371.4` --- buildSrc/build.gradle.kts.182 | 94 ----------------------------------- versions.gradle.kts.182 | 2 +- 2 files changed, 1 insertion(+), 95 deletions(-) delete mode 100644 buildSrc/build.gradle.kts.182 diff --git a/buildSrc/build.gradle.kts.182 b/buildSrc/build.gradle.kts.182 deleted file mode 100644 index 1b0f37aa029..00000000000 --- a/buildSrc/build.gradle.kts.182 +++ /dev/null @@ -1,94 +0,0 @@ - -buildscript { - val buildSrcKotlinVersion: String by extra(findProperty("buildSrc.kotlin.version")?.toString() ?: embeddedKotlinVersion) - val buildSrcKotlinRepo: String? by extra(findProperty("buildSrc.kotlin.repo") as String?) - extra["versions.shadow"] = "2.0.2" - extra["versions.native-platform"] = "0.14" - - repositories { - buildSrcKotlinRepo?.let { - maven(url = it) - } - } - - dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$buildSrcKotlinVersion") - classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:$buildSrcKotlinVersion") - } -} - -logger.info("buildSrcKotlinVersion: " + extra["buildSrcKotlinVersion"]) -logger.info("buildSrc kotlin compiler version: " + org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION) -logger.info("buildSrc stdlib version: " + KotlinVersion.CURRENT) - -apply { - plugin("kotlin") - plugin("kotlin-sam-with-receiver") -} - -plugins { - `kotlin-dsl` - `java-gradle-plugin` -} - -gradlePlugin { - (plugins) { - "pill-configurable" { - id = "pill-configurable" - implementationClass = "org.jetbrains.kotlin.pill.PillConfigurablePlugin" - } - "jps-compatible" { - id = "jps-compatible" - implementationClass = "org.jetbrains.kotlin.pill.JpsCompatiblePlugin" - } - } -} - -fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)?.let { - val v = it.toString() - if (v.isBlank()) true - else v.toBoolean() -} - -rootProject.apply { - from(rootProject.file("../versions.gradle.kts")) -} - -val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null -val intellijUltimateEnabled by extra(project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild) -val intellijSeparateSdks by extra(project.getBooleanProperty("intellijSeparateSdks") ?: false) - -extra["intellijRepo"] = "https://www.jetbrains.com/intellij-repository" -extra["intellijReleaseType"] = "snapshots" // or "snapshots" -extra["versions.androidDxSources"] = "5.0.0_r2" - -extra["customDepsOrg"] = "kotlin.build.custom.deps" - -repositories { - extra["buildSrcKotlinRepo"]?.let { - maven(url = it) - } - maven(url = "https://repo.gradle.org/gradle/libs-releases-local") // for native-platform - jcenter() -} - -dependencies { - compile("net.rubygrapefruit:native-platform:${property("versions.native-platform")}") - compile("net.rubygrapefruit:native-platform-windows-amd64:${property("versions.native-platform")}") - compile("net.rubygrapefruit:native-platform-windows-i386:${property("versions.native-platform")}") - compile("com.jakewharton.dex:dex-method-list:3.0.0") - // TODO: adding the dep to the plugin breaks the build unexpectedly, resolve and uncomment -// compile("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["bootstrap_kotlin_version"]}") - // Shadow plugin is used in many projects of the main build. Once it's no longer used in buildSrc, please move this dependency to the root project - compile("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}") - compile("org.ow2.asm:asm-all:6.0_BETA") -} - -samWithReceiver { - annotation("org.gradle.api.HasImplicitReceiver") -} - -fun Project.`samWithReceiver`(configure: org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverExtension.() -> Unit): Unit = - extensions.configure("samWithReceiver", configure) - -tasks["build"].dependsOn(":prepare-deps:android-dx:build", ":prepare-deps:intellij-sdk:build") diff --git a/versions.gradle.kts.182 b/versions.gradle.kts.182 index e2d51946de3..b4c9a4638c0 100644 --- a/versions.gradle.kts.182 +++ b/versions.gradle.kts.182 @@ -1,5 +1,5 @@ -extra["versions.intellijSdk"] = "182-SNAPSHOT" +extra["versions.intellijSdk"] = "182.2371.4" extra["versions.androidBuildTools"] = "r23.0.1" extra["versions.idea.NodeJS"] = "181.3494.12" //extra["versions.androidStudioRelease"] = "3.1.0.5"