IJI-268 android tools-base vcs mapping removed; androidToolsLibs gradle project removed

GitOrigin-RevId: 66c0157456991a1bc39123e582a1b76e2d243acf
2026-09-27 10:03:11 +07:00 · 2020-04-23 11:45:51 +00:00
parent a676407354
commit e23b287ef8
18 changed files with 0 additions and 264 deletions
@@ -48,6 +48,5 @@
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
    <mapping directory="$PROJECT_DIR$/android" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/android/tools-base" vcs="Git" />
  </component>
 </project>
@@ -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']
-    }
-  }
-}
-
@@ -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")
-}
@@ -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'
-}
@@ -1,2 +0,0 @@
-projectVersion=26.3.0
-kotlin_version=1.3.31
@@ -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"
-}
@@ -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'
-}
@@ -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'
-}
@@ -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"
-}
@@ -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"
-}
@@ -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'
-}
@@ -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'
-}
@@ -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'
-}
@@ -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'
-}
@@ -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"
-}
@@ -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"
-}
@@ -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'
@@ -1,3 +0,0 @@
-dependencies {
-  compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-}