diff --git a/buildSrc/gradle.properties.as35 b/buildSrc/gradle.properties.as35 deleted file mode 100644 index a2e24c7566f..00000000000 --- a/buildSrc/gradle.properties.as35 +++ /dev/null @@ -1,8 +0,0 @@ -org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m -Dfile.encoding=UTF-8 - -cacheRedirectorEnabled=true - -#buildSrc.kotlin.repo=https://jcenter.bintray.com -#buildSrc.kotlin.version=1.1.50 - -intellijUltimateEnabled=false diff --git a/buildSrc/gradle.properties.as36 b/buildSrc/gradle.properties.as36 deleted file mode 100644 index a2e24c7566f..00000000000 --- a/buildSrc/gradle.properties.as36 +++ /dev/null @@ -1,8 +0,0 @@ -org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m -Dfile.encoding=UTF-8 - -cacheRedirectorEnabled=true - -#buildSrc.kotlin.repo=https://jcenter.bintray.com -#buildSrc.kotlin.version=1.1.50 - -intellijUltimateEnabled=false diff --git a/buildSrc/gradle.properties.as40 b/buildSrc/gradle.properties.as40 deleted file mode 100644 index a2e24c7566f..00000000000 --- a/buildSrc/gradle.properties.as40 +++ /dev/null @@ -1,8 +0,0 @@ -org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m -Dfile.encoding=UTF-8 - -cacheRedirectorEnabled=true - -#buildSrc.kotlin.repo=https://jcenter.bintray.com -#buildSrc.kotlin.version=1.1.50 - -intellijUltimateEnabled=false diff --git a/buildSrc/prepare-deps/build.gradle.kts b/buildSrc/prepare-deps/build.gradle.kts index c1827c23fb0..85ebaf0a9fb 100644 --- a/buildSrc/prepare-deps/build.gradle.kts +++ b/buildSrc/prepare-deps/build.gradle.kts @@ -24,7 +24,7 @@ val androidStudioRelease = rootProject.findProperty("versions.androidStudioRelea val androidStudioBuild = rootProject.findProperty("versions.androidStudioBuild") as String? val intellijSeparateSdks: Boolean by rootProject.extra val installIntellijCommunity = !intellijUltimateEnabled || intellijSeparateSdks -val installIntellijUltimate = intellijUltimateEnabled +val installIntellijUltimate = intellijUltimateEnabled && androidStudioRelease == null val intellijVersionDelimiterIndex = intellijVersion.indexOfAny(charArrayOf('.', '-')) if (intellijVersionDelimiterIndex == -1) {