diff --git a/build.gradle.kts b/build.gradle.kts index 7fdbcc9da7c..358cd6005db 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,7 +52,6 @@ pill { excludedDirs( "out", "buildSrc/build", - "buildSrc/prepare-deps/android-dx/build", "buildSrc/prepare-deps/intellij-sdk/build" ) } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index c8979e1aa73..3ec018187ed 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -81,8 +81,6 @@ extra["intellijReleaseType"] = when { else -> "releases" } -extra["versions.androidDxSources"] = "5.0.0_r2" - extra["customDepsOrg"] = "kotlin.build" repositories { diff --git a/buildSrc/src/main/kotlin/localDependencies.kt b/buildSrc/src/main/kotlin/localDependencies.kt index ab23a4af3f7..444fbe67695 100644 --- a/buildSrc/src/main/kotlin/localDependencies.kt +++ b/buildSrc/src/main/kotlin/localDependencies.kt @@ -76,8 +76,6 @@ fun Project.jpsStandalone() = "kotlin.build:jps-standalone:${rootProject.extra[" fun Project.nodeJSPlugin() = "kotlin.build:NodeJS:${rootProject.extra["versions.idea.NodeJS"]}" -fun Project.androidDxJar() = "org.jetbrains.kotlin:android-dx:${rootProject.extra["versions.androidBuildTools"]}" - fun Project.jpsBuildTest() = "com.jetbrains.intellij.idea:jps-build-test:${rootProject.extra["versions.intellijSdk"]}" fun Project.kotlinxCollectionsImmutable() = "org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:${rootProject.extra["versions.kotlinx-collections-immutable"]}" diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 19e9a8649c0..a89d17ab830 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -65,7 +65,6 @@ dependencies { testRuntimeOnly(intellijPluginDep("java")) testRuntime(project(":kotlin-reflect")) - testRuntime(androidDxJar()) testRuntime(toolsJar()) antLauncherJar(commonDep("org.apache.ant", "ant")) diff --git a/compiler/fir/analysis-tests/build.gradle.kts b/compiler/fir/analysis-tests/build.gradle.kts index 867488761da..ce6a74b6be5 100644 --- a/compiler/fir/analysis-tests/build.gradle.kts +++ b/compiler/fir/analysis-tests/build.gradle.kts @@ -32,7 +32,6 @@ dependencies { testCompileOnly(project(":kotlin-reflect-api")) testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(project(":core:descriptors.runtime")) - testRuntimeOnly(androidDxJar()) testRuntimeOnly(project(":compiler:fir:fir2ir:jvm-backend")) testImplementation(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/compiler/tests-common-new/build.gradle.kts b/compiler/tests-common-new/build.gradle.kts index c3164bb369d..d7a5f84cec3 100644 --- a/compiler/tests-common-new/build.gradle.kts +++ b/compiler/tests-common-new/build.gradle.kts @@ -14,7 +14,6 @@ dependencies { testCompileOnly(project(":kotlin-reflect-api")) testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(project(":core:descriptors.runtime")) - testRuntimeOnly(androidDxJar()) testImplementation(projectTests(":generators:test-generator")) diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 74da03d5318..e9309a9b122 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -52,7 +52,6 @@ dependencies { testCompile(project(":kotlin-scripting-compiler-impl")) testCompile(projectTests(":compiler:test-infrastructure-utils")) testCompile(commonDep("junit:junit")) - testCompile(androidDxJar()) { isTransitive = false } testCompile(commonDep("com.android.tools:r8")) testCompileOnly(project(":kotlin-reflect-api")) testCompileOnly(toolsJar()) diff --git a/compiler/tests-compiler-utils/build.gradle.kts b/compiler/tests-compiler-utils/build.gradle.kts index 6cb933b3a15..b4f0990772d 100644 --- a/compiler/tests-compiler-utils/build.gradle.kts +++ b/compiler/tests-compiler-utils/build.gradle.kts @@ -25,7 +25,6 @@ dependencies { testCompile(project(":compiler:fir:entrypoint")) testCompile(projectTests(":compiler:test-infrastructure-utils")) testCompile(project(":kotlin-preloader")) - testCompile(androidDxJar()) { isTransitive = false } testCompile(commonDep("com.android.tools:r8")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/dependencies/android-dx/build.gradle.kts b/dependencies/android-dx/build.gradle.kts deleted file mode 100644 index 644e627a235..00000000000 --- a/dependencies/android-dx/build.gradle.kts +++ /dev/null @@ -1,100 +0,0 @@ -import java.net.URI - -plugins { - base - `maven-publish` - id("com.jfrog.bintray") version "1.8.4" -} - -apply(from = "../../gradle/versions.gradle.kts") - -val androidBuildToolsVersion = extra["versions.androidBuildTools"] as String -val androidDxSourcesVersion = extra["versions.androidDxSources"] as String - -group = "org.jetbrains.kotlin" -version = androidBuildToolsVersion - -repositories { - ivy { - url = URI("https://dl.google.com/android/repository") - - patternLayout { - artifact("[artifact]_[revision](-[classifier]).[ext]") - } - - metadataSources { - artifact() - } - } - - - ivy { - url = URI("https://android.googlesource.com/platform/dalvik/+archive/android-$androidDxSourcesVersion") - - patternLayout { - artifact("[artifact].[ext]") - } - - metadataSources { - artifact() - } - } -} - -val androidBuildTools by configurations.creating -val androidDxSources by configurations.creating - -val androidDxRevision = androidBuildToolsVersion - -dependencies { - androidBuildTools("google:build-tools:$androidBuildToolsVersion:linux@zip") - androidDxSources("google:dx:0@tar.gz") -} - -val unzipDxJar by tasks.registering { - val outputDir = File(buildDir, name) - val outputFile = File(outputDir, "dx.jar") - - dependsOn(androidBuildTools) - inputs.files(androidBuildTools) - outputs.files(outputFile) - - doFirst { - project.copy { - from(zipTree(androidBuildTools.singleFile).files) - include("**/dx.jar") - into(outputDir) - } - } -} - -val untarDxSources by tasks.registering { - val dxSourcesTargetDir = File(buildDir, name) - dependsOn(androidDxSources) - inputs.files(androidDxSources) - outputs.dir(dxSourcesTargetDir) - doFirst { - project.copy { - from(tarTree(androidDxSources.singleFile)) - include("src/**") - includeEmptyDirs = false - into(dxSourcesTargetDir) - } - } -} - -val prepareDxSourcesJar by tasks.registering(Jar::class) { - dependsOn(untarDxSources) - from(untarDxSources) - - archiveClassifier.set("sources") -} - -val dxArtifact = artifacts.add("default", unzipDxJar.outputs.files.singleFile) { - builtBy(unzipDxJar) -} - -artifacts.add("archives", dxArtifact) -artifacts.add("archives", prepareDxSourcesJar) - -apply(from="../publishing.gradle.kts") diff --git a/dependencies/android-dx/settings.gradle b/dependencies/android-dx/settings.gradle deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/gradle/versions.properties b/gradle/versions.properties index ca6dc95ec97..4d501d53c02 100644 --- a/gradle/versions.properties +++ b/gradle/versions.properties @@ -1,5 +1,4 @@ versions.intellijSdk=202.7660.26 -versions.androidBuildTools=r23.0.1 versions.idea.NodeJS=193.6494.7 versions.jar.asm-all=8.0.1 versions.jar.guava=29.0-jre diff --git a/gradle/versions.properties.201 b/gradle/versions.properties.201 index bd6471bb797..eaa5a3ee09e 100644 --- a/gradle/versions.properties.201 +++ b/gradle/versions.properties.201 @@ -1,5 +1,4 @@ versions.intellijSdk=201.7223.91 -versions.androidBuildTools=r23.0.1 versions.idea.NodeJS=193.6494.7 versions.jar.asm-all=7.0.1 versions.jar.guava=28.2-jre diff --git a/gradle/versions.properties.203 b/gradle/versions.properties.203 index 42e072d2d78..92025f080f8 100644 --- a/gradle/versions.properties.203 +++ b/gradle/versions.properties.203 @@ -1,5 +1,4 @@ versions.intellijSdk=203-SNAPSHOT -versions.androidBuildTools=r23.0.1 versions.idea.NodeJS=193.6494.7 versions.jar.asm-all=8.0.1 versions.jar.guava=29.0-jre diff --git a/gradle/versions.properties.as41 b/gradle/versions.properties.as41 index b0d438049d8..fbbe449bfc1 100644 --- a/gradle/versions.properties.as41 +++ b/gradle/versions.properties.as41 @@ -1,5 +1,4 @@ versions.intellijSdk=201.7223.91 -versions.androidBuildTools=r23.0.1 versions.idea.NodeJS=193.6494.7 versions.androidStudioRelease=4.1.0.18 versions.androidStudioBuild=201.6823847 diff --git a/gradle/versions.properties.as42 b/gradle/versions.properties.as42 index 31a6cad549b..7983c2a0f03 100644 --- a/gradle/versions.properties.as42 +++ b/gradle/versions.properties.as42 @@ -1,5 +1,4 @@ versions.intellijSdk=202.6397.94 -versions.androidBuildTools=r23.0.1 versions.idea.NodeJS=193.6494.7 versions.androidStudioRelease=4.2.0.16 versions.androidStudioBuild=202.6939830 diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index ac0aa2f8a32..695c128ab4c 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -17,8 +17,6 @@ dependencies { compile(project(":idea:ide-common")) compile(project(":idea:idea-gradle")) - compile(androidDxJar()) - compileOnly(project(":kotlin-android-extensions-runtime")) compileOnly(intellijDep()) compileOnly(intellijPluginDep("android"))