From e23b287ef8d4b107b356be9250b78c4afa961437 Mon Sep 17 00:00:00 2001 From: "Dmitriy.Panov" Date: Thu, 23 Apr 2020 13:18:26 +0300 Subject: [PATCH] IJI-268 android tools-base vcs mapping removed; androidToolsLibs gradle project removed GitOrigin-RevId: 66c0157456991a1bc39123e582a1b76e2d243acf --- .idea/vcs.xml | 1 - .../androidToolsLibs/build.gradle | 97 ------------------- .../androidToolsLibs/deployer/build.gradle | 18 ---- .../androidToolsLibs/flags/build.gradle | 9 -- .../androidToolsLibs/gradle.properties | 2 - .../instant-run-annotations/build.gradle | 4 - .../instant-run-client/build.gradle | 12 --- .../instant-run-common/build.gradle | 8 -- .../layoutInspector/build.gradle | 13 --- .../layoutlib-api/build.gradle | 8 -- .../perf-logger-tests/build.gradle | 11 --- .../perflib-tests/build.gradle | 14 --- .../androidToolsLibs/perflib/build.gradle | 8 -- .../sdk-common-tests/build.gradle | 16 --- .../androidToolsLibs/sdk-common/build.gradle | 19 ---- .../sdklib-tests/build.gradle | 9 -- .../androidToolsLibs/settings.gradle | 12 --- .../androidToolsLibs/usb-devices/build.gradle | 3 - 18 files changed, 264 deletions(-) delete mode 100644 build/dependencies/androidToolsLibs/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/deployer/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/flags/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/gradle.properties delete mode 100644 build/dependencies/androidToolsLibs/instant-run-annotations/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/instant-run-client/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/instant-run-common/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/layoutInspector/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/layoutlib-api/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/perf-logger-tests/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/perflib-tests/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/perflib/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/sdk-common-tests/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/sdk-common/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/sdklib-tests/build.gradle delete mode 100644 build/dependencies/androidToolsLibs/settings.gradle delete mode 100644 build/dependencies/androidToolsLibs/usb-devices/build.gradle diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 46da50ef6ead..74f885f44fc4 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -48,6 +48,5 @@ - \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/build.gradle b/build/dependencies/androidToolsLibs/build.gradle deleted file mode 100644 index 637a05ef202c..000000000000 --- a/build/dependencies/androidToolsLibs/build.gradle +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.31' - id "com.jfrog.bintray" version "1.8.4" -} - -allprojects { - repositories { - maven { url 'https://cache-redirector.jetbrains.com/maven-central' } - maven { url 'https://cache-redirector.jetbrains.com/dl.google.com/dl/android/maven2' } - maven { url 'https://cache-redirector.jetbrains.com/intellij-third-party-dependencies' } - } -} - -project.ext.tools = new File("../../../android/tools-base").canonicalPath -project.ext.libs = new File('../../../android/android/lib').canonicalPath - -subprojects { - apply plugin: 'java' - apply plugin: 'kotlin' - apply plugin: 'maven-publish' - apply plugin: 'com.jfrog.bintray' - - project.buildDir = 'out' - compileKotlin { - kotlinOptions.jvmTarget = "1.8" - } - - sourceSets { - main.java.srcDir "$tools/$project.name/src/main/java" - if (project.name == 'usb-devices') { - main.kotlin.srcDirs += "$tools/$project.name/src" - } -// test.java.srcDir "$tools/$project.name/src/test/java" - } - - task sourceJar(type: Jar) { - from sourceSets.main.java - from sourceSets.main.kotlin - } - - publishing { - publications { - MyPublication(MavenPublication) { - from components.java - groupId 'org.jetbrains.intellij.deps.android.tools' - artifactId "$project.name" - version rootProject.ext.projectVersion - artifact sourceJar { - classifier 'sources' - } - pom.withXml { - asNode().children().last() + { - resolveStrategy = DELEGATE_FIRST - name "$project.name" - url 'https://developer.android.com/studio' - scm { - url 'https://android.googlesource.com/platform/tools/base' - connection 'git://android.googlesource.com/platform/tools/base.git' - } - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - developers { - developer { - name 'The Android Open Source Project' - } - } - } - } - } - } - bintray { - user = System.getenv('BINTRAY_USER') - key = System.getenv('BINTRAY_KEY') - - publish = true - - pkg { - repo = 'intellij-third-party-dependencies' - name = "android-tools-base-$project.name" - userOrg = 'jetbrains' - - version { - name = rootProject.ext.projectVersion - } - } - - publications = ['MyPublication'] - } - } -} - diff --git a/build/dependencies/androidToolsLibs/deployer/build.gradle b/build/dependencies/androidToolsLibs/deployer/build.gradle deleted file mode 100644 index d3d0c9f6f2b1..000000000000 --- a/build/dependencies/androidToolsLibs/deployer/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -sourceSets { - main.java.srcDir "$tools/deploy/deployer/src/main/java" -} - -dependencies { - compile 'com.google.guava:guava:25.1-jre' - compile 'com.android.tools:annotations:26.3.0' - compile 'com.android.tools.ddms:ddmlib:26.3.0' - compile 'com.android.tools.apkparser:binary-resources:26.3.0' - compile 'com.google.protobuf:protobuf-java:3.5.1' - - compile files(org.gradle.internal.jvm.Jvm.current().toolsJar) - compile files("$libs/libdeploy_java_proto.jar") - compile files("$libs/libjava_version.jar") - compile files("$libs/d8-master.jar") -} \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/flags/build.gradle b/build/dependencies/androidToolsLibs/flags/build.gradle deleted file mode 100644 index 32c9a48e4fe6..000000000000 --- a/build/dependencies/androidToolsLibs/flags/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -sourceSets { - main.java.srcDirs += "$tools/flags/src/test/java" -} -dependencies { - compile 'com.android.tools:annotations:26.3.0' - compile 'junit:junit:4.12' - compile 'com.google.truth:truth:0.34' -} diff --git a/build/dependencies/androidToolsLibs/gradle.properties b/build/dependencies/androidToolsLibs/gradle.properties deleted file mode 100644 index 9b3a63bb127a..000000000000 --- a/build/dependencies/androidToolsLibs/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -projectVersion=26.3.0 -kotlin_version=1.3.31 \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/instant-run-annotations/build.gradle b/build/dependencies/androidToolsLibs/instant-run-annotations/build.gradle deleted file mode 100644 index f8d2771b1797..000000000000 --- a/build/dependencies/androidToolsLibs/instant-run-annotations/build.gradle +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -sourceSets { - main.java.srcDir "$tools/instant-run/instant-run-annotations/src/main/java" -} \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/instant-run-client/build.gradle b/build/dependencies/androidToolsLibs/instant-run-client/build.gradle deleted file mode 100644 index b5f5d324dad9..000000000000 --- a/build/dependencies/androidToolsLibs/instant-run-client/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -sourceSets { - main.java.srcDir "$tools/instant-run/instant-run-client/src/main/java" -} - -dependencies { - compile project(':instant-run-common') - compile 'com.google.guava:guava:25.1-jre' - compile 'com.android.tools:annotations:26.3.0' - compile 'com.android.tools:common:26.3.0' - compile 'com.android.tools.ddms:ddmlib:26.3.0' -} \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/instant-run-common/build.gradle b/build/dependencies/androidToolsLibs/instant-run-common/build.gradle deleted file mode 100644 index 127a46db1cee..000000000000 --- a/build/dependencies/androidToolsLibs/instant-run-common/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -sourceSets { - main.java.srcDir "$tools/instant-run/instant-run-common/src/main/java" -} - -dependencies { - compile 'com.android.tools:annotations:26.3.0' -} \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/layoutInspector/build.gradle b/build/dependencies/androidToolsLibs/layoutInspector/build.gradle deleted file mode 100644 index f6b5009cf05a..000000000000 --- a/build/dependencies/androidToolsLibs/layoutInspector/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -sourceSets { - main.java.srcDir "$tools/$project.name/src" -} - -dependencies { - compile 'com.android.tools:annotations:26.3.0' - compile 'com.android.tools:common:26.3.0' - compile 'com.android.tools.ddms:ddmlib:26.3.0' - - compile 'com.google.code.gson:gson:2.8.5' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/layoutlib-api/build.gradle b/build/dependencies/androidToolsLibs/layoutlib-api/build.gradle deleted file mode 100644 index 18f01a25e809..000000000000 --- a/build/dependencies/androidToolsLibs/layoutlib-api/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -dependencies { - compile "com.android.tools:common:26.3.0" - compile 'com.android.tools:annotations:26.3.0' - - compile "net.sf.kxml:kxml2:2.3.0" - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/perf-logger-tests/build.gradle b/build/dependencies/androidToolsLibs/perf-logger-tests/build.gradle deleted file mode 100644 index 2d3c859bbeae..000000000000 --- a/build/dependencies/androidToolsLibs/perf-logger-tests/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -sourceSets { - main.java.srcDir "$tools/perf-logger/src/test/java" -} - -dependencies { - compile 'com.android.tools:annotations:26.3.0' - compile 'com.google.code.gson:gson:2.8.5' - compile 'com.android.tools:annotations:26.3.0' - compile 'com.android.tools:testutils:26.3.0' -} \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/perflib-tests/build.gradle b/build/dependencies/androidToolsLibs/perflib-tests/build.gradle deleted file mode 100644 index 9b42e54ae42b..000000000000 --- a/build/dependencies/androidToolsLibs/perflib-tests/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -sourceSets { - main.java.srcDir "$tools/perflib/src/test/java" -} - -dependencies { - compile 'com.android.tools:annotations:26.3.0' - compile 'com.android.tools:common:26.3.0' - compile 'com.android.tools:testutils:26.3.0' - compile 'org.jetbrains.intellij.deps.android.tools:perflib:26.3.0' - compile 'com.android.tools.ddms:ddmlib:26.3.0' - compile 'com.google.guava:guava:25.1-jre' - compile 'org.jetbrains.intellij.deps:trove4j:1.0.20200330' -} \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/perflib/build.gradle b/build/dependencies/androidToolsLibs/perflib/build.gradle deleted file mode 100644 index 924b059b718e..000000000000 --- a/build/dependencies/androidToolsLibs/perflib/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -dependencies { - compile 'com.android.tools:annotations:26.3.0' - compile 'com.android.tools:common:26.3.0' - compile 'com.android.tools.ddms:ddmlib:26.3.0' - compile 'com.google.guava:guava:25.1-jre' - compile 'org.jetbrains.intellij.deps:trove4j:1.0.20200330' -} \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/sdk-common-tests/build.gradle b/build/dependencies/androidToolsLibs/sdk-common-tests/build.gradle deleted file mode 100644 index bfa4de55b845..000000000000 --- a/build/dependencies/androidToolsLibs/sdk-common-tests/build.gradle +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -sourceSets { - main.java.srcDir "$tools/sdk-common/src/test/java" -} - -dependencies { - compile 'org.jetbrains.intellij.deps.android.tools:sdk-common:26.3.0' - compile 'com.android.tools:testutils:26.3.0' - compile 'nl.jqno.equalsverifier:equalsverifier:2.5.1' - - compile "com.android.tools.build:builder-model:3.3.0" - compile "com.android.tools.build:builder-test-api:3.3.0" - compile "com.android.tools:common:26.3.0" - compile "com.android.tools:sdklib:26.3.0" - compile 'com.android.tools.ddms:ddmlib:26.3.0' -} \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/sdk-common/build.gradle b/build/dependencies/androidToolsLibs/sdk-common/build.gradle deleted file mode 100644 index 60919d9d75c2..000000000000 --- a/build/dependencies/androidToolsLibs/sdk-common/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -dependencies { - compile "com.android.tools.build:builder-model:3.3.0" - compile "com.android.tools.build:builder-test-api:3.3.0" - compile "com.android.tools:common:26.3.0" - compile "com.android.tools:sdklib:26.3.0" - compile 'com.android.tools:annotations:26.3.0' - compile 'com.android.tools.ddms:ddmlib:26.3.0' - - compile 'com.google.guava:guava:25.1-jre' - compile "net.sf.kxml:kxml2:2.3.0" - compile "org.bouncycastle:bcpkix-jdk15on:1.61" - compile "javax.inject:javax.inject:1" - compile files(org.gradle.internal.jvm.Jvm.current().toolsJar) - compile files("$libs/aia-manifest-proto-1.0-jarjar.jar") - - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" -} \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/sdklib-tests/build.gradle b/build/dependencies/androidToolsLibs/sdklib-tests/build.gradle deleted file mode 100644 index 1348dd666494..000000000000 --- a/build/dependencies/androidToolsLibs/sdklib-tests/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -sourceSets { - main.java.srcDir "$tools/sdklib/src/test/java" -} - -dependencies { - compile 'com.android.tools:testutils:26.3.0' - compile "com.android.tools:sdklib:26.3.0" -} \ No newline at end of file diff --git a/build/dependencies/androidToolsLibs/settings.gradle b/build/dependencies/androidToolsLibs/settings.gradle deleted file mode 100644 index 4ebcce9b188a..000000000000 --- a/build/dependencies/androidToolsLibs/settings.gradle +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -rootProject.name = 'androidToolsLibs' - -include 'deployer' -include 'flags' -include 'instant-run-annotations' -include 'instant-run-common' -include 'instant-run-client' -include 'layoutInspector' -include 'perf-logger-tests' -include 'perflib' -include 'usb-devices' diff --git a/build/dependencies/androidToolsLibs/usb-devices/build.gradle b/build/dependencies/androidToolsLibs/usb-devices/build.gradle deleted file mode 100644 index 029c626d5f09..000000000000 --- a/build/dependencies/androidToolsLibs/usb-devices/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} \ No newline at end of file