From 426a9a870e1b02833b9b512c613d40aa4aa7f9d8 Mon Sep 17 00:00:00 2001 From: Andrei Kuznetsov Date: Fri, 20 Sep 2019 20:14:05 +0300 Subject: [PATCH 01/25] Merging AOSP/Android Studio 3.5 sources into intellij GitOrigin-RevId: 78e41cacaec9f4dfbf1939d2348910547d5135cc --- .../platform-impl/src/com/intellij/ide/SystemHealthMonitor.java | 2 +- .../com/intellij/openapi/wm/impl/IdeFocusManagerHeadless.java | 2 +- .../src/com/intellij/ui/picker/MacColorPipette.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java b/platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java index 4f113e3ede2b..4e6d61b5680a 100644 --- a/platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java +++ b/platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java @@ -32,7 +32,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -final class SystemHealthMonitor extends PreloadingActivity { +public final class SystemHealthMonitor extends PreloadingActivity { // FIXME-ank: made public for tests private static final Logger LOG = Logger.getInstance(SystemHealthMonitor.class); private static final NotificationGroup GROUP = new NotificationGroup("System Health", NotificationDisplayType.STICKY_BALLOON, true); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFocusManagerHeadless.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFocusManagerHeadless.java index 3fe363a974f2..759e9ef88555 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFocusManagerHeadless.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFocusManagerHeadless.java @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; -public final class IdeFocusManagerHeadless extends IdeFocusManager { +public class IdeFocusManagerHeadless extends IdeFocusManager { // FIXME-ank: reverted final public static final IdeFocusManagerHeadless INSTANCE = new IdeFocusManagerHeadless(); @Override diff --git a/platform/platform-impl/src/com/intellij/ui/picker/MacColorPipette.java b/platform/platform-impl/src/com/intellij/ui/picker/MacColorPipette.java index 7f49ba357368..bd0498a1a14d 100644 --- a/platform/platform-impl/src/com/intellij/ui/picker/MacColorPipette.java +++ b/platform/platform-impl/src/com/intellij/ui/picker/MacColorPipette.java @@ -183,7 +183,7 @@ public class MacColorPipette extends ColorPipetteBase { } @Nullable - static BufferedImage captureScreen(@Nullable Window belowWindow, @NotNull Rectangle rect) { + public static BufferedImage captureScreen(@Nullable Window belowWindow, @NotNull Rectangle rect) { // FIXME-ank: made public ID pool = Foundation.invoke("NSAutoreleasePool", "new"); try { ID windowId = belowWindow != null ? MacUtil.findWindowFromJavaWindow(belowWindow) : null; From 5cae85b0aacac9972eb3b7c08efcd5f5b4148ca0 Mon Sep 17 00:00:00 2001 From: Andrei Kuznetsov Date: Thu, 3 Oct 2019 22:34:22 +0300 Subject: [PATCH 02/25] Fix compilation in Android plugin after rebase to newer master (merging AndroidStudio 3.5) GitOrigin-RevId: f966a11c817e51ab15e53198255cd40f75e693b8 --- .../com/intellij/build/output/BuildOutputInstantReader.java | 5 +++++ .../output/MavenBuildToolLogTestUtils.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/lang-api/src/com/intellij/build/output/BuildOutputInstantReader.java b/platform/lang-api/src/com/intellij/build/output/BuildOutputInstantReader.java index c84b7c677803..e3a320539df4 100644 --- a/platform/lang-api/src/com/intellij/build/output/BuildOutputInstantReader.java +++ b/platform/lang-api/src/com/intellij/build/output/BuildOutputInstantReader.java @@ -17,4 +17,9 @@ public interface BuildOutputInstantReader { void pushBack(); void pushBack(int numberOfLines); + + // FIXME-ank: this method should be removed + default String getCurrentLine(){ + return null; + } } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/externalSystemIntegration/output/MavenBuildToolLogTestUtils.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/externalSystemIntegration/output/MavenBuildToolLogTestUtils.java index 83ed72d45316..daac1d0693a4 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/externalSystemIntegration/output/MavenBuildToolLogTestUtils.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/externalSystemIntegration/output/MavenBuildToolLogTestUtils.java @@ -371,7 +371,7 @@ public abstract class MavenBuildToolLogTestUtils extends UsefulTestCase { throw new UnsupportedOperationException(); } - private String getCurrentLine() { + public String getCurrentLine() { // FIXME-ank: made public (should be private) if (myPosition >= myLines.size() || myPosition < 0) { return null; } From 531483edd2e5eb03492b6dc969c86922ee46061a Mon Sep 17 00:00:00 2001 From: Andrei Kuznetsov Date: Mon, 7 Oct 2019 13:34:22 +0300 Subject: [PATCH 03/25] Replace 'download' task with 'sync' for better incremental builds. Update deps versions for android-plugin 3.5. GitOrigin-RevId: 720c115f75e3dd9b444d5d8ae38d45a9e2d06c19 --- build/dependencies/setupAndroidSdk.gradle | 157 ++++++---------------- 1 file changed, 41 insertions(+), 116 deletions(-) diff --git a/build/dependencies/setupAndroidSdk.gradle b/build/dependencies/setupAndroidSdk.gradle index 67cf69d1fbe6..6922b44c0aa7 100644 --- a/build/dependencies/setupAndroidSdk.gradle +++ b/build/dependencies/setupAndroidSdk.gradle @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2019 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,122 +14,47 @@ * limitations under the License. */ -buildscript { - repositories { - maven { url "https://cache-redirector.jetbrains.com/plugins.gradle.org" } - } - dependencies { - classpath "de.undercouch:gradle-download-task:3.4.2" - } -} -apply plugin: "de.undercouch.download" - -import de.undercouch.gradle.tasks.download.Download - -def currentOs = org.gradle.internal.os.OperatingSystem.current() - -task downloadGradleDistribution(type: Download) { - src "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-4.10.1-bin.zip" - dest "$buildDir/android-sdk/tools/external/gradle/gradle-4.10.1-bin.zip" - onlyIf { !dest.exists() } -} - -ext.saveVersion = { Download task -> - def filename = task.dest.name.substring(0, task.dest.name.lastIndexOf('.')) - new File(task.dest.parentFile, filename).text = task.src.toString() -} - -ext.cleanUp = { Copy task -> - task.destinationDir.deleteDir() -} - -ext.isStale = { Download task -> - def filename = task.dest.name.substring(0, task.dest.name.lastIndexOf('.')) - def file = new File(task.dest.parentFile, filename) - return !file.exists() || file.text != task.src.toString() -} - -task downloadGradleDistribution2(type: Download) { - src "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-2.4-bin.zip" - dest "$buildDir/android-sdk/tools/external/gradle/gradle-2.4-bin.zip" - onlyIf { !dest.exists() } -} - -task downloadOfflineRepo(type: Download) { - src "https://cache-redirector.jetbrains.com/intellij-third-party-dependencies/android-sdk-offline-repo/3.3.2/android-sdk-offline-repo.zip" - dest "$buildDir/android-sdk/offline_repo_repo.zip" - onlyIf { - isStale(it) || !dest.exists() && isEmpty(setupOfflineRepo.destinationDir) - } - doLast { - saveVersion(it) - cleanUp(setupOfflineRepo) - } -} - -task downloadKotlinPlugin(type: Download) { - src "https://cache-redirector.jetbrains.com/intellij-third-party-dependencies/android-sdk-kotlin-plugin/1.3.21-release-IJ2019.1/android-sdk-kotlin-plugin.zip" - dest "$buildDir/android-sdk/kotlin-plugin.zip" - onlyIf { - isStale(it) || !dest.exists() && isEmpty(setupKotlinPluginForAndroid.destinationDir) - } - doLast { - saveVersion(it) - cleanUp(setupKotlinPluginForAndroid) - } -} - -task setupKotlinPluginForAndroid(dependsOn: downloadKotlinPlugin, type: Copy) { - from zipTree(downloadKotlinPlugin.outputs.files.singleFile) - into "$buildDir/android-sdk/prebuilts/tools/common/kotlin-plugin" - onlyIf { - isStale(downloadKotlinPlugin) || isEmpty(destinationDir) - } -} - -task setupOfflineRepo(dependsOn: downloadOfflineRepo, type: Copy) { - from zipTree(downloadOfflineRepo.outputs.files.singleFile) - into "$buildDir/android-sdk/prebuilts/tools/common/m2/repository" - onlyIf { - isStale(downloadOfflineRepo) || isEmpty(destinationDir) - } -} - -task downloadAndroidSdk(type: Download) { - def osFamily = currentOs.familyName - src "https://cache-redirector.jetbrains.com/intellij-third-party-dependencies/android-sdk/${osFamily}.3.3.3/android-sdk.tar.gz" - dest "$buildDir/android-sdk/${osFamily}.tar.gz" - onlyIf { - isStale(it) || !dest.exists() && isEmpty(untarAndroidSdk.destinationDir) && !currentOs.isMacOsX() - } - doLast { - saveVersion(it) - cleanUp(untarAndroidSdk) - } -} - -task untarAndroidSdk(dependsOn: downloadAndroidSdk, type: Copy) { - from tarTree(downloadAndroidSdk.outputs.files.singleFile) - into "$buildDir/android-sdk/prebuilts/studio/sdk" - onlyIf { - isStale(downloadAndroidSdk) || !currentOs.isMacOsX() && isEmpty(destinationDir) - } - outputs.dir("$buildDir/android-sdk/prebuilts/tools/common") - doLast { - file("$buildDir/android-sdk/prebuilts/tools/common/offline-m2").mkdirs() - } -} - -task setupAndroidSdk(dependsOn: [untarAndroidSdk, downloadGradleDistribution, - downloadGradleDistribution2, setupOfflineRepo, - setupKotlinPluginForAndroid]) { - doLast { - [downloadAndroidSdk, downloadOfflineRepo, downloadKotlinPlugin].each { - it.outputs.files.singleFile.delete() +repositories { + maven { url 'https://cache-redirector.jetbrains.com/jetbrains.bintray.com/intellij-third-party-dependencies/' } + ivy { + // TODO: re-publish android-sdk:android-sdk using maven layout and remove Ivy repository + url 'https://cache-redirector.jetbrains.com/jetbrains.bintray.com/intellij-third-party-dependencies/' + patternLayout { + artifact "[module]/[revision]/[artifact].[ext]" } } } -static def isEmpty(File dir) { - dir.list() == null || dir.list().length == 0 -} \ No newline at end of file +configurations { + androidOfflineRepo + androidSdk +} + +def currentOs = org.gradle.internal.os.OperatingSystem.current() +def osFamily = currentOs.familyName + +dependencies { + androidOfflineRepo "org.jetbrains.intellij.deps.android.tools:android-sdk-offline-repo:26.5.0@zip" + androidSdk "android-sdk:android-sdk:${osFamily}.3.3.3:@tar.gz" +} + +/* First we setup an offline-repo. This will remove all the alien files from .../android-sdk. + Later we will create an overlay with Android SDK and KotlinPlugin artifacts */ +task syncOfflineRepo(dependsOn: configurations.androidOfflineRepo, type: Sync) { + from zipTree(configurations.androidOfflineRepo.singleFile) + into "${project.buildDir}/android-sdk" +} + +task syncKotlinPluginForAndroid(dependsOn: [setupKotlinPlugin, syncOfflineRepo], type: Sync) { + from "$buildDir/kotlin" + into "$buildDir/android-sdk/prebuilts/tools/common/kotlin-plugin" +} + +task syncAndroidSdk(dependsOn: [configurations.androidSdk, syncOfflineRepo], type: Sync) { + from tarTree(resources.gzip(configurations.androidSdk.singleFile)) + into "$buildDir/android-sdk/prebuilts/studio/sdk" +} + +task setupAndroidSdk(dependsOn: [syncOfflineRepo, syncKotlinPluginForAndroid, syncAndroidSdk]) { + // This is entry point: invoke this task to setup android sdk and all the artifacts required to run android-plugin unit tests +} From 13cc5f4bec6a3753d7ca7390c4df8c6beea390e5 Mon Sep 17 00:00:00 2001 From: Andrei Kuznetsov Date: Mon, 7 Oct 2019 23:33:11 +0300 Subject: [PATCH 04/25] Fix dependencies for android-plugin unit tests (merging Android Studio 3.5) GitOrigin-RevId: de36ccad51c0c44b66424b4d6570888c51e5ea93 --- .../main/groovy/OfflineMavenRepository.groovy | 57 +++++++++++++++++++ build/dependencies/setupAndroidSdk.gradle | 29 +++++++++- 2 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 build/dependencies/buildSrc/src/main/groovy/OfflineMavenRepository.groovy diff --git a/build/dependencies/buildSrc/src/main/groovy/OfflineMavenRepository.groovy b/build/dependencies/buildSrc/src/main/groovy/OfflineMavenRepository.groovy new file mode 100644 index 000000000000..99a54ba3f205 --- /dev/null +++ b/build/dependencies/buildSrc/src/main/groovy/OfflineMavenRepository.groovy @@ -0,0 +1,57 @@ +// 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. +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.OutputDirectory +import org.gradle.api.tasks.TaskAction +import org.gradle.api.DefaultTask +import org.gradle.util.GFileUtils +import org.gradle.api.artifacts.Configuration +import org.gradle.api.artifacts.component.ModuleComponentIdentifier +import org.gradle.maven.MavenModule +import org.gradle.maven.MavenPomArtifact + +class OfflineMavenRepository extends DefaultTask { + @Input + String configurationName = 'compile' + + @OutputDirectory + File repoDir = new File(project.buildDir, 'offline-repo') + + @TaskAction + void build() { + Configuration configuration = project.configurations.getByName(configurationName) + copyJars(configuration) + copyPoms(configuration) + } + + private void copyJars(Configuration configuration) { + configuration.resolvedConfiguration.resolvedArtifacts.each { artifact -> + def moduleVersionId = artifact.moduleVersion.id + File moduleDir = new File(repoDir, "${moduleVersionId.group.replace('.','/')}/${moduleVersionId.name}/${moduleVersionId.version}") + GFileUtils.mkdirs(moduleDir) + + File target = new File(moduleDir, artifact.file.name) + println "Copy: $artifact.file -> $target" + GFileUtils.copyFile(artifact.file, target) + } + } + + private void copyPoms(Configuration configuration) { + def componentIds = configuration.incoming.resolutionResult.allDependencies.collect { it.selected.id } + + def result = project.dependencies.createArtifactResolutionQuery() + .forComponents(componentIds) + .withArtifacts(MavenModule, MavenPomArtifact) + .execute() + + for(component in result.resolvedComponents) { + def componentId = component.id + + if(componentId instanceof ModuleComponentIdentifier) { + File moduleDir = new File(repoDir, "${componentId.group.replace('.','/')}/${componentId.module}/${componentId.version}") + GFileUtils.mkdirs(moduleDir) + File pomFile = component.getArtifacts(MavenPomArtifact)[0].file + GFileUtils.copyFile(pomFile, new File(moduleDir, pomFile.name)) + } + } + } +} \ No newline at end of file diff --git a/build/dependencies/setupAndroidSdk.gradle b/build/dependencies/setupAndroidSdk.gradle index 6922b44c0aa7..d01a019693b7 100644 --- a/build/dependencies/setupAndroidSdk.gradle +++ b/build/dependencies/setupAndroidSdk.gradle @@ -15,6 +15,7 @@ */ repositories { + maven { url 'https://cache-redirector.jetbrains.com/repo.maven.apache.org/maven2/' } maven { url 'https://cache-redirector.jetbrains.com/jetbrains.bintray.com/intellij-third-party-dependencies/' } ivy { // TODO: re-publish android-sdk:android-sdk using maven layout and remove Ivy repository @@ -28,14 +29,32 @@ repositories { configurations { androidOfflineRepo androidSdk + kotlinDeps } def currentOs = org.gradle.internal.os.OperatingSystem.current() def osFamily = currentOs.familyName dependencies { - androidOfflineRepo "org.jetbrains.intellij.deps.android.tools:android-sdk-offline-repo:26.5.0@zip" + ext.kotlin_version = "1.3.50" + androidOfflineRepo "org.jetbrains.intellij.deps.android.tools:android-sdk-offline-repo:26.5.0.1@zip" androidSdk "android-sdk:android-sdk:${osFamily}.3.3.3:@tar.gz" + kotlinDeps "org.jetbrains.kotlin:kotlin-android-extensions:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-android-extensions-runtime:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-annotation-processing-gradle:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-build-common:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-compiler-runner:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-gradle-plugin-api:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-gradle-plugin-model:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-scripting-common:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-scripting-jvm:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-test:${kotlin_version}" + kotlinDeps "org.jetbrains.kotlin:kotlin-test-common:${kotlin_version}" } /* First we setup an offline-repo. This will remove all the alien files from .../android-sdk. @@ -55,6 +74,12 @@ task syncAndroidSdk(dependsOn: [configurations.androidSdk, syncOfflineRepo], typ into "$buildDir/android-sdk/prebuilts/studio/sdk" } -task setupAndroidSdk(dependsOn: [syncOfflineRepo, syncKotlinPluginForAndroid, syncAndroidSdk]) { +task updateKotlinLibs(dependsOn: [configurations.kotlinDeps, syncOfflineRepo], type: OfflineMavenRepository) { + outputs.upToDateWhen { false } + configurationName = "kotlinDeps" + repoDir = file("$buildDir/android-sdk/prebuilts/tools/common/m2/repository") +} + +task setupAndroidSdk(dependsOn: [syncOfflineRepo, syncKotlinPluginForAndroid, syncAndroidSdk, updateKotlinLibs]) { // This is entry point: invoke this task to setup android sdk and all the artifacts required to run android-plugin unit tests } From e9b6cd3391239d0f21d79be08137df05b8786c59 Mon Sep 17 00:00:00 2001 From: Andrei Kuznetsov Date: Wed, 9 Oct 2019 14:27:31 +0300 Subject: [PATCH 05/25] Better incremental build strategy for syncOfflineRepo task (merging Android Studio 3.5) syncOfflineRepo of type Sync is never up-to-date because additional files will be copied to .../android-sdk (e.g. kotlin plugin). Use 'Copy' task + marker version file instead. GitOrigin-RevId: 21e44e2ba6f84acf12b2f9268a7d8e2de6148583 --- build/dependencies/setupAndroidSdk.gradle | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build/dependencies/setupAndroidSdk.gradle b/build/dependencies/setupAndroidSdk.gradle index d01a019693b7..3448c619a78e 100644 --- a/build/dependencies/setupAndroidSdk.gradle +++ b/build/dependencies/setupAndroidSdk.gradle @@ -35,9 +35,11 @@ configurations { def currentOs = org.gradle.internal.os.OperatingSystem.current() def osFamily = currentOs.familyName +ext.kotlin_version = "1.3.50" +ext.android_m2_version = "26.5.0.1" + dependencies { - ext.kotlin_version = "1.3.50" - androidOfflineRepo "org.jetbrains.intellij.deps.android.tools:android-sdk-offline-repo:26.5.0.1@zip" + androidOfflineRepo "org.jetbrains.intellij.deps.android.tools:android-sdk-offline-repo:${android_m2_version}@zip" androidSdk "android-sdk:android-sdk:${osFamily}.3.3.3:@tar.gz" kotlinDeps "org.jetbrains.kotlin:kotlin-android-extensions:${kotlin_version}" kotlinDeps "org.jetbrains.kotlin:kotlin-android-extensions-runtime:${kotlin_version}" @@ -59,9 +61,12 @@ dependencies { /* First we setup an offline-repo. This will remove all the alien files from .../android-sdk. Later we will create an overlay with Android SDK and KotlinPlugin artifacts */ -task syncOfflineRepo(dependsOn: configurations.androidOfflineRepo, type: Sync) { +task syncOfflineRepo(dependsOn: configurations.androidOfflineRepo, type: Copy) { + outputs.upToDateWhen { file("${project.buildDir}/android-sdk/${android_m2_version}.version").exists() } + doFirst { file("${project.buildDir}/android-sdk").deleteDir() } from zipTree(configurations.androidOfflineRepo.singleFile) into "${project.buildDir}/android-sdk" + doLast { file("${project.buildDir}/android-sdk/${android_m2_version}.version").write(android_m2_version) } } task syncKotlinPluginForAndroid(dependsOn: [setupKotlinPlugin, syncOfflineRepo], type: Sync) { From c5d379f943bb3426d11b2a34f403d7074e155a57 Mon Sep 17 00:00:00 2001 From: Andrei Kuznetsov Date: Fri, 11 Oct 2019 19:10:44 +0300 Subject: [PATCH 06/25] Update android-plugin artifacts layout in IC build scripts (Merging Android Studio 3.5) GitOrigin-RevId: 53a890b5f1440575ee635f7b58310bae27537109 --- .../build/CommunityRepositoryModules.groovy | 106 +++++++++++------- 1 file changed, 65 insertions(+), 41 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy index 816e2a6590d4..f866ed9d26f7 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy @@ -261,84 +261,108 @@ class CommunityRepositoryModules { withModule("intellij.android.core", "android.jar", null) withModule("intellij.android.adb", "android.jar") + withModule("intellij.android.databinding", "android.jar") withModule("intellij.android.debuggers", "android.jar") withModule("intellij.android.lang", "android.jar") + withModule("intellij.android.lang-databinding", "android.jar") withModule("intellij.android.plugin", "android.jar") withModule("intellij.android.artwork") withModule("intellij.android.observable", "android.jar") withModule("intellij.android.observable.ui", "android.jar") + withModuleLibrary("precompiled-flags", "android.sdktools.flags", "") + withModule("intellij.android.property-editor", "android.jar") + withModule("intellij.android.layout-inspector", "android.jar") + withModule("intellij.android.transport", "android.jar") withModule("intellij.android.designer", "android.jar") + withModule("intellij.android.naveditor", "android.jar") withModule("intellij.android.sdkUpdates", "android.jar") withModule("intellij.android.wizard", "android.jar") withModule("intellij.android.wizard.model", "android.jar") withModule("intellij.android.profilersAndroid", "android.jar") withModule("intellij.android.deploy", "android.jar") - withModule("intellij.android.perfdHost", "android-profilers.jar") + // TODO-ank: intellij.android.kotlin.* are currently pre-built libraries (should be project modules) + withModule("intellij.android.transportDatabase", "android-profilers.jar") withModule("intellij.android.profilers", "android-profilers.jar") withModule("intellij.android.profilers.ui", "android-profilers.jar") withModule("intellij.android.profilers.atrace", "android-profilers.jar") - withModule("intellij.android.nativeSymbolizer", "android.jar") + withModule("intellij.android.native-symbolizer", "android.jar") withModule("intellij.android.apkanalyzer", "android.jar") withModule("intellij.android.projectSystem", "android.jar") withModule("intellij.android.projectSystem.gradle", "android.jar") - withModule("intellij.android.layoutInspector", "android.jar") + withModule("intellij.android.resources-aar", "android.jar") + withModule("intellij.android.android-layout-inspector", "android.jar") + /* do not put into IJ android plugin: assistant, connection-assistant, whats-new-assistant */ withModule("intellij.android.adt.ui", "adt-ui.jar") withModule("intellij.android.adt.ui.model", "adt-ui.jar") - withModule("intellij.android.layoutlib", "layoutlib-loader.jar") + withModuleLibrary("precompiled-repository", "android.sdktools.repository", "") + + withModuleLibrary("precompiled-db-baseLibrary", "android.sdktools.db-baseLibrary", "") + withModuleLibrary("precompiled-db-baseLibrarySupport", "android.sdktools.db-baseLibrarySupport", "") + withModuleLibrary("precompiled-db-compilerCommon", "android.sdktools.db-compilerCommon", "") + withModuleLibrary("precompiled-db-compiler", "android.sdktools.db-compiler", "") + + withModuleLibrary("precompiled-sdklib", "android.sdktools.sdklib", "") + withModuleLibrary("precompiled-sdk-common", "android.sdktools.sdk-common", "") + withModuleLibrary("precompiled-layoutlib-api", "android.sdktools.layoutlib-api", "") + withModule("intellij.android.layoutlib-loader", "layoutlib-loader.jar") + withModuleLibrary("layoutlib", "intellij.android.layoutlib", "") + withModuleLibrary("precompiled-manifest-merger", "android.sdktools.manifest-merger", "") + withModuleLibrary("precompiled-chunkio", "android.sdktools.chunkio", "") + withModuleLibrary("precompiled-pixelprobe", "android.sdktools.pixelprobe", "") + withModuleLibrary("precompiled-binary-resources", "android.sdktools.binary-resources", "") + withModuleLibrary("precompiled-analyzer", "android.sdktools.analyzer", "") + withModuleLibrary("precompiled-ddmlib", "android.sdktools.ddmlib", "") + withModuleLibrary("precompiled-dvlib", "android.sdktools.dvlib", "") + withModuleLibrary("precompiled-deployer", "android.sdktools.deployer", "") + withModuleLibrary("precompiled-tracer", "android.sdktools.tracer", "") + withModuleLibrary("precompiled-draw9patch", "android.sdktools.draw9patch", "") + withModuleLibrary("precompiled-lint-api", "android.sdktools.lint-api", "") + withModuleLibrary("precompiled-lint-checks", "android.sdktools.lint-checks", "") + withModuleLibrary("precompiled-ninepatch", "android.sdktools.ninepatch", "") + withModuleLibrary("precompiled-perflib", "android.sdktools.perflib", "") + withModuleLibrary("precompiled-builder-model", "android.sdktools.builder-model", "") + withModuleLibrary("precompiled-builder-test-api", "android.sdktools.builder-test-api", "") + withModuleLibrary("precompiled-android-annotations", "android.sdktools.android-annotations", "") + withModuleLibrary("precompiled-layoutinspector", "android.sdktools.layoutinspector", "") + withModuleLibrary("precompiled-java-lib-model", "android.sdktools.java-lib-model", "") + withModuleLibrary("precompiled-java-lib-model-builder", "android.sdktools.java-lib-model-builder", "") + withModuleLibrary("precompiled-usb-devices", "android.sdktools.usb-devices", "") withModule("intellij.android.jps", "jps/android-jps-plugin.jar", null) withProjectLibrary("freemarker") //todo[nik] move to module libraries withProjectLibrary("kxml2") //todo[nik] move to module libraries - withResourceFromModule("intellij.android.core","lib/asm-5.0.3.jar", "lib") - withResourceFromModule("intellij.android.core","lib/asm-analysis-5.0.3.jar", "lib") - withResourceFromModule("intellij.android.core","lib/asm-tree-5.0.3.jar", "lib") - withResourceFromModule("intellij.android.core","lib/commons-compress-1.8.1.jar", "lib") - withResourceFromModule("intellij.android.core","lib/javawriter-2.2.1.jar", "lib") - withResourceFromModule("intellij.android.core","lib/android-extensions-ide.jar", "lib") - withResourceFromModule("intellij.android.core","lib/android-kotlin.jar", "lib") + withResourceFromModule("intellij.android.core", "lib/asm-5.0.3.jar", "lib") + withResourceFromModule("intellij.android.core", "lib/asm-analysis-5.0.3.jar", "lib") + withResourceFromModule("intellij.android.core", "lib/asm-tree-5.0.3.jar", "lib") + withResourceFromModule("intellij.android.core", "lib/commons-compress-1.8.1.jar", "lib") + withResourceFromModule("intellij.android.core", "lib/javawriter-2.2.1.jar", "lib") + withProjectLibrary("intellij.android.kotlin.idea", "") - withResourceFromModule("intellij.android.core","lib/androidWidgets", "lib/androidWidgets") - withResourceFromModule("intellij.android.artwork","resources/device-art-resources", "lib/device-art-resources") - withResourceFromModule("intellij.android.core","lib/sampleData", "lib/sampleData") + withResourceFromModule("intellij.android.core", "lib/androidWidgets", "lib/androidWidgets") + withResourceFromModule("intellij.android.artwork", "resources/device-art-resources", "lib/device-art-resources") + withResourceFromModule("intellij.android.core", "lib/sampleData", "lib/sampleData") withResourceFromModule("intellij.android.adt.ui", "lib/libwebp/linux", "lib/libwebp/linux") withResourceFromModule("intellij.android.adt.ui", "lib/libwebp/mac", "lib/libwebp/mac") withResourceFromModule("intellij.android.adt.ui", "lib/libwebp/win", "lib/libwebp/win") withResourceArchive("../android/annotations", "lib/androidAnnotations.jar") // here go some differences from original Android Studio layout - withProjectLibrary("layoutlib", "jdk8") - withResource("../android/lib/jdk11/layoutlib.jar", "lib/jdk11") + withResource("../tools-base/layoutlib","lib/layoutlib") // todo replace this with runtime downloading + withResource("../tools-base/templates", "lib/templates") - withResourceFromModule("android.sdktools.layoutlib-resources", ".", "lib/layoutlib") // todo replace this with runtime downloading - withResourceFromModule("android.sdktools.sdklib", "../templates", "lib/templates") withProjectLibrary("studio-profiler-grpc-1.0-jarjar") - withProjectLibrary("com.android.tools.analytics-library:crash") - withProjectLibrary("com.android.tools.analytics-library:protos") - withProjectLibrary("com.android.tools.analytics-library:shared") - withProjectLibrary("com.android.tools.analytics-library:tracker") - withProjectLibrary("com.android.tools:annotations") - withProjectLibrary("com.android.tools.apkparser:apkanalyzer") - withProjectLibrary("com.android.tools.apkparser:binary-resources") - withProjectLibrary("com.android.tools.layoutlib:layoutlib-api") - withProjectLibrary("com.android.tools.lint:lint-api") - withProjectLibrary("com.android.tools.lint:lint-checks") - withProjectLibrary("com.android.tools:sdk-common") - withProjectLibrary("com.android.tools:dvlib") - withProjectLibrary("com.android.tools:sdklib") - withProjectLibrary("com.android.tools:common") - withProjectLibrary("com.android.tools:repository") - withProjectLibrary("com.android.tools:ninepatch") - withProjectLibrary("com.android.tools.ddms:ddmlib") - withProjectLibrary("com.android.tools.build:manifest-merger") - withProjectLibrary("com.android.tools.build:builder-model") - withProjectLibrary("com.android.tools.build:builder-test-api") - withProjectLibrary("com.android.tools.pixelprobe:pixelprobe") + // Profiler downloader will download all the other profiler libraries: profilers-transform.jar, perfa_okhttp.dex, perfa, perfd, simpleperf + // Profiler downloader will also download instant run installers: /resources/installer + // Profiler downloader will also download instant run transport: /resources/transport - withProjectLibrary("org.jetbrains.intellij.deps.android.tools:perflib") - withProjectLibrary("org.jetbrains.intellij.deps.android.tools:layoutInspector") + withModuleLibrary("precompiled-common", "android.sdktools.common", "") + withModuleLibrary("precompiled-analytics-crash", "android.sdktools.analytics-crash", "") + withModuleLibrary("precompiled-analytics-shared", "android.sdktools.analytics-shared", "") + withModuleLibrary("precompiled-analytics-tracker", "android.sdktools.analytics-tracker", "") + // FIXME-ank: add "analytics-publisher"? additionalModulesToJars.entrySet().each { withModule(it.key, it.value) From bd28c0a57eafce8ba72677ee8683e7bb1680d4b1 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Mon, 14 Oct 2019 12:47:50 +0300 Subject: [PATCH 07/25] android licenses GitOrigin-RevId: e1050f4901a6c7689c4718463974dffb051733d4 --- .../build/CommunityLibraryLicenses.groovy | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy index c1f2b467aeca..233528ff496b 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy @@ -26,39 +26,39 @@ class CommunityLibraryLicenses { url: "http://source.android.com/"), new LibraryLicense(name: "Android Analytics", attachedTo: "intellij.android.core", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Analytics Crash", libraryName: "com.android.tools.analytics-library:crash", + new LibraryLicense(name: "Android Analytics Crash", libraryName: "precompiled-analytics-crash", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Analytics Protos", libraryName: "com.android.tools.analytics-library:protos", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Analytics Shared", libraryName: "com.android.tools.analytics-library:shared", + new LibraryLicense(name: "Android Analytics Shared", libraryName: "precompiled-analytics-shared", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Analytics Testing", libraryName: "com.android.tools.analytics-library:testing", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Analytics Tracker", libraryName: "com.android.tools.analytics-library:tracker", + new LibraryLicense(name: "Android Analytics Tracker", libraryName: "precompiled-analytics-tracker", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Annotations", libraryName: "com.android.tools:annotations", license: "Apache 2.0", + new LibraryLicense(name: "Android Annotations", libraryName: "precompiled-android-annotations", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Apk Analyzer", libraryName: "com.android.tools.apkparser:apkanalyzer", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Apk Binary Resources", libraryName: "com.android.tools.apkparser:binary-resources", license: "Apache 2.0", + new LibraryLicense(name: "Android Apk Binary Resources", libraryName: "precompiled-binary-resources", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Baksmali", libraryName: "baksmali", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Builder", attachedTo: "intellij.android.core", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Builder Model", libraryName: "com.android.tools.build:builder-model", license: "Apache 2.0", + new LibraryLicense(name: "Android Builder Model", libraryName: "precompiled-builder-model", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Builder Test Api", libraryName: "com.android.tools.build:builder-test-api", license: "Apache 2.0", + new LibraryLicense(name: "Android Builder Test Api", libraryName: "precompiled-builder-test-api", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Common Library", libraryName: "com.android.tools:common", license: "Apache 2.0", + new LibraryLicense(name: "Android Common Library", libraryName: "precompiled-common", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Ddm Library", libraryName: "com.android.tools.ddms:ddmlib", license: "Apache 2.0", + new LibraryLicense(name: "Android Ddm Library", libraryName: "precompiled-ddmlib", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Deployer Library", libraryName: "org.jetbrains.intellij.deps.android.tools:deployer", + new LibraryLicense(name: "Android Deployer Library", libraryName: "precompiled-deployer", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android DEX library", libraryName: "dexlib2", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android draw9patch library", libraryName: "com.android.tools:draw9patch", license: "Apache 2.0", + new LibraryLicense(name: "Android draw9patch library", libraryName: "precompiled-draw9patch", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android dvlib library", libraryName: "com.android.tools:dvlib", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Flags", libraryName: "org.jetbrains.intellij.deps.android.tools:flags", license: "Apache 2.0", + new LibraryLicense(name: "Android dvlib library", libraryName: "precompiled-dvlib", license: "Apache 2.0", url: "http://source.android.com/"), + new LibraryLicense(name: "Android Flags", libraryName: "precompiled-flags", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Gradle model", attachedTo: "intellij.android.core", version: "0.4-SNAPSHOT", license: "Apache 2.0", url: "https://android.googlesource.com/platform/tools/build/+/master/gradle-model/"), @@ -68,44 +68,44 @@ class CommunityLibraryLicenses { url: "http://source.android.com/"), new LibraryLicense(name: "Android Instant Run Common", libraryName: "org.jetbrains.intellij.deps.android.tools:instant-run-common", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Java Lib Model", libraryName: "com.android.java.tools.build:java-lib-model", license: "Apache 2.0", + new LibraryLicense(name: "Android Java Lib Model", libraryName: "precompiled-java-lib-model", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Java Lib Model Builder", libraryName: "com.android.java.tools.build:java-lib-model-builder", + new LibraryLicense(name: "Android Java Lib Model Builder", libraryName: "precompiled-java-lib-model-builder", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Kotlin Integration", libraryName: "com.android.tools.layoutlib:layoutlib-api", license: "Apache 2.0", + new LibraryLicense(name: "Android Kotlin Integration", libraryName: "precompiled-layoutlib-api", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Layout Api Library", libraryName: "android-kotlin.jar", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Layout Inspector", libraryName: "org.jetbrains.intellij.deps.android.tools:layoutInspector", + new LibraryLicense(name: "Android Layout Inspector", libraryName: "precompiled-layoutinspector", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Layout Library", libraryName: "layoutlib", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android libwebp library", libraryName: "libwebp.jar", license: "Apache 2.0", url: "https://github.com/webmproject/libwebp"), - new LibraryLicense(name: "Android Lint Api", libraryName: "com.android.tools.lint:lint-api", license: "Apache 2.0", + new LibraryLicense(name: "Android Lint Api", libraryName: "precompiled-lint-api", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Lint Checks", libraryName: "com.android.tools.lint:lint-checks", license: "Apache 2.0", + new LibraryLicense(name: "Android Lint Checks", libraryName: "precompiled-lint-checks", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Manifest Merger", libraryName: "com.android.tools.build:manifest-merger", + new LibraryLicense(name: "Android Manifest Merger", libraryName: "precompiled-manifest-merger", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android ninepatch Library", libraryName: "com.android.tools:ninepatch", + new LibraryLicense(name: "Android ninepatch Library", libraryName: "precompiled-ninepatch", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Perflib Library", libraryName: "org.jetbrains.intellij.deps.android.tools:perflib", + new LibraryLicense(name: "Android Perflib Library", libraryName: "precompiled-perflib", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Pixelprobe Library", libraryName: "com.android.tools.pixelprobe:pixelprobe", + new LibraryLicense(name: "Android Pixelprobe Library", libraryName: "precompiled-pixelprobe", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Profiler", libraryName: "studio-profiler-grpc-1.0-jarjar", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Repository", libraryName: "com.android.tools:repository", license: "Apache 2.0", + new LibraryLicense(name: "Android Repository", libraryName: "precompiled-repository", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Sdk Common", libraryName: "com.android.tools:sdk-common", license: "Apache 2.0", + new LibraryLicense(name: "Android Sdk Common", libraryName: "precompiled-sdk-common", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Sdk Lib", libraryName: "com.android.tools:sdklib", license: "Apache 2.0", + new LibraryLicense(name: "Android Sdk Lib", libraryName: "precompiled-sdklib", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android SDK Tools", attachedTo: "intellij.android.core", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android SDK Tools JPS", libraryName: "android-sdk-tools-jps", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android USB Devices", libraryName: "org.jetbrains.intellij.deps.android.tools:usb-devices", + new LibraryLicense(name: "Android USB Devices", libraryName: "precompiled-usb-devices", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "ANTLR 4 Runtime", libraryName: "antlr4-runtime-4.1.jar", license: "BSD", url: "http://www.antlr.org", licenseUrl: "http://www.antlr.org/license.html"), From 995ac8afe353536c231ed110b5295d487a2c77d4 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Mon, 14 Oct 2019 16:32:32 +0300 Subject: [PATCH 08/25] missed android licenses GitOrigin-RevId: d9341c2018fadf13c0892342408ded99b53b385f --- .../build/CommunityLibraryLicenses.groovy | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy index 233528ff496b..afebdd123cb5 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy @@ -14,7 +14,7 @@ import static org.jetbrains.intellij.build.LibraryLicense.jetbrainsLibrary class CommunityLibraryLicenses { @SuppressWarnings("SpellCheckingInspection") public static final List LICENSES_LIST = [ - new LibraryLicense(name: "AAPT Protos", libraryName: "aapt-proto-jarjar", license: "Apache 2.0", url: "http://source.android.com/"), + new LibraryLicense(name: "AAPT Protos", libraryName: "aapt-proto", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Aether", license: "Eclipse Public License 1.0", url: "http://www.eclipse.org/aether/", libraryName: 'org.eclipse.aether:aether-api', licenseUrl: "http://www.eclipse.org/legal/epl-v10.html", additionalLibraryNames: ['org.eclipse.aether:aether-impl', 'org.eclipse.aether:aether-connector-basic', @@ -22,13 +22,13 @@ class CommunityLibraryLicenses { new LibraryLicense(name: "Amazon Ion Java", libraryName: "ion", license: "Apache 2.0", url: "https://github.com/amzn/ion-java"), - new LibraryLicense(name: "Android Aia Manifest Proto", libraryName: "aia-manifest-proto-1.0-jarjar.jar", license: "Apache 2.0", + new LibraryLicense(name: "Android Aia Manifest Proto", libraryName: "aia-manifest-proto", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Analytics", attachedTo: "intellij.android.core", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Analytics Crash", libraryName: "precompiled-analytics-crash", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Analytics Protos", libraryName: "com.android.tools.analytics-library:protos", + new LibraryLicense(name: "Android Analytics Protos", libraryName: "analytics-proto", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Analytics Shared", libraryName: "precompiled-analytics-shared", license: "Apache 2.0", url: "http://source.android.com/"), @@ -38,7 +38,7 @@ class CommunityLibraryLicenses { license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Annotations", libraryName: "precompiled-android-annotations", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Apk Analyzer", libraryName: "com.android.tools.apkparser:apkanalyzer", license: "Apache 2.0", + new LibraryLicense(name: "Android Apk Analyzer", libraryName: "precompiled-analyzer", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Apk Binary Resources", libraryName: "precompiled-binary-resources", license: "Apache 2.0", url: "http://source.android.com/"), @@ -64,10 +64,6 @@ class CommunityLibraryLicenses { url: "https://android.googlesource.com/platform/tools/build/+/master/gradle-model/"), new LibraryLicense(name: "Android IDE Extensions", libraryName: "android-extensions-ide.jar", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Instant Run Client", libraryName: "org.jetbrains.intellij.deps.android.tools:instant-run-client", license: "Apache 2.0", - url: "http://source.android.com/"), - new LibraryLicense(name: "Android Instant Run Common", libraryName: "org.jetbrains.intellij.deps.android.tools:instant-run-common", license: "Apache 2.0", - url: "http://source.android.com/"), new LibraryLicense(name: "Android Java Lib Model", libraryName: "precompiled-java-lib-model", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Java Lib Model Builder", libraryName: "precompiled-java-lib-model-builder", @@ -105,6 +101,8 @@ class CommunityLibraryLicenses { url: "http://source.android.com/"), new LibraryLicense(name: "Android SDK Tools JPS", libraryName: "android-sdk-tools-jps", license: "Apache 2.0", url: "http://source.android.com/"), + new LibraryLicense(name: "Android STracer", libraryName: "precompiled-tracer", license: "Apache 2.0", + url: "http://source.android.com/"), new LibraryLicense(name: "Android USB Devices", libraryName: "precompiled-usb-devices", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "ANTLR 4 Runtime", libraryName: "antlr4-runtime-4.1.jar", license: "BSD", @@ -246,6 +244,8 @@ class CommunityLibraryLicenses { licenseUrl: "http://ant.apache.org/license.html"), new LibraryLicense(name: "Hamcrest", libraryName: "hamcrest", license: "BSD", url: "http://hamcrest.org/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause"), + new LibraryLicense(name: "HDR Histogram", libraryName: "HdrHistogram", license: "CC0 1.0 Universal", + licenseUrl: "https://creativecommons.org/publicdomain/zero/1.0/"), new LibraryLicense(name: "hppc", libraryName: "com.carrotsearch:hppc:0.7.2", license: "Apache 2.0", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt"), @@ -265,7 +265,7 @@ class CommunityLibraryLicenses { url: "https://github.com/JetBrains/intellij-deps-ini4j"), new LibraryLicense(name: "Instant App Api", libraryName: "instantapps-api-1.5", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Instant run protos", libraryName: "libdeploy_java_proto.jar", + new LibraryLicense(name: "Instant run protos", libraryName: "deploy-java-proto", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Instant run version", libraryName: "libjava_version.jar", license: "Apache 2.0", url: "http://source.android.com/"), @@ -375,6 +375,7 @@ class CommunityLibraryLicenses { new LibraryLicense(name: "JUnit", libraryName: "JUnit4", license: "CPL 1.0", url: "http://junit.org/"), new LibraryLicense(name: "jzlib", libraryName: "jzlib", license: "BSD", url: "http://www.jcraft.com/jzlib/", licenseUrl: "http://www.jcraft.com/jzlib/LICENSE.txt"), + new LibraryLicense(name: "Kotlin Gradle Plugin Model", libraryName: "kotlin-gradle-plugin-model", license: "Apache 2.0"), new LibraryLicense(name: "kotlinx.html", libraryName: "org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.11", license: "Apache 2.0", licenseUrl: "https://github.com/Kotlin/kotlinx.html/blob/master/LICENSE", @@ -449,7 +450,7 @@ class CommunityLibraryLicenses { new LibraryLicense(name: "netty-handler-proxy", libraryName: "netty-handler-proxy", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"), - new LibraryLicense(libraryName: "nosyncbuilder-jarjar", license: "Apache 2.0", url: "http://source.android.com/"), + new LibraryLicense(libraryName: "nosyncbuilder", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Objenesis", libraryName: "Objenesis", license: "Apache 2.0", url: "http://objenesis.org/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt"), new LibraryLicense(name: "Okio", libraryName: "okio", license: "Apache 2.0", @@ -483,6 +484,7 @@ class CommunityLibraryLicenses { url: "http://pycodestyle.readthedocs.io/"), new LibraryLicense(name: "qdox-java-parser", libraryName: "qdox-java-parser", license: "Apache 2.0", url: "https://github.com/paul-hammant/qdox", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"), + new LibraryLicense(name: "R8 DEX shrinker", libraryName: "r8-master", license: "BSD"), new LibraryLicense(name: "Relax NG Object Model", libraryName: "rngom-20051226-patched.jar", license: "MIT", url: "https://github.com/kohsuke/rngom", licenseUrl: "http://www.opensource.org/licenses/mit-license.php"), new LibraryLicense(name: "Rhino JavaScript Engine", libraryName: "rhino", license: "MPL 1.1", From 97e678a2e02b7d61fd268723cabacb1041ff38b0 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 15 Oct 2019 15:12:25 +0300 Subject: [PATCH 09/25] android modules renamed to conform to Idea naming policy GitOrigin-RevId: fb530505fa956a1b066e825e39bbbcae260bbd3f --- .../intellij/build/CommunityRepositoryModules.groovy | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy index f866ed9d26f7..5dd30b81ba0a 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy @@ -264,13 +264,12 @@ class CommunityRepositoryModules { withModule("intellij.android.databinding", "android.jar") withModule("intellij.android.debuggers", "android.jar") withModule("intellij.android.lang", "android.jar") - withModule("intellij.android.lang-databinding", "android.jar") withModule("intellij.android.plugin", "android.jar") withModule("intellij.android.artwork") withModule("intellij.android.observable", "android.jar") withModule("intellij.android.observable.ui", "android.jar") withModuleLibrary("precompiled-flags", "android.sdktools.flags", "") - withModule("intellij.android.property-editor", "android.jar") + withModule("intellij.android.propertyEditor", "android.jar") withModule("intellij.android.layout-inspector", "android.jar") withModule("intellij.android.transport", "android.jar") withModule("intellij.android.designer", "android.jar") @@ -285,12 +284,12 @@ class CommunityRepositoryModules { withModule("intellij.android.profilers", "android-profilers.jar") withModule("intellij.android.profilers.ui", "android-profilers.jar") withModule("intellij.android.profilers.atrace", "android-profilers.jar") - withModule("intellij.android.native-symbolizer", "android.jar") + withModule("intellij.android.nativeSymbolizer", "android.jar") withModule("intellij.android.apkanalyzer", "android.jar") withModule("intellij.android.projectSystem", "android.jar") withModule("intellij.android.projectSystem.gradle", "android.jar") - withModule("intellij.android.resources-aar", "android.jar") - withModule("intellij.android.android-layout-inspector", "android.jar") + withModule("intellij.android.resourcesAar", "android.jar") + withModule("intellij.android.androidLayoutInspector", "android.jar") /* do not put into IJ android plugin: assistant, connection-assistant, whats-new-assistant */ withModule("intellij.android.adt.ui", "adt-ui.jar") withModule("intellij.android.adt.ui.model", "adt-ui.jar") @@ -304,7 +303,7 @@ class CommunityRepositoryModules { withModuleLibrary("precompiled-sdklib", "android.sdktools.sdklib", "") withModuleLibrary("precompiled-sdk-common", "android.sdktools.sdk-common", "") withModuleLibrary("precompiled-layoutlib-api", "android.sdktools.layoutlib-api", "") - withModule("intellij.android.layoutlib-loader", "layoutlib-loader.jar") + withModule("intellij.android.layoutlibLoader", "layoutlib-loader.jar") withModuleLibrary("layoutlib", "intellij.android.layoutlib", "") withModuleLibrary("precompiled-manifest-merger", "android.sdktools.manifest-merger", "") withModuleLibrary("precompiled-chunkio", "android.sdktools.chunkio", "") From eb9174a49c4475063e36ec126219c51913999d17 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 15 Oct 2019 17:24:34 +0300 Subject: [PATCH 10/25] android modules renamed to conform to Idea naming policy GitOrigin-RevId: cb5e703cbd9af7b84a1edc6359e0f73c69d4f055 --- .../intellij/build/CommunityRepositoryModules.groovy | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy index 5dd30b81ba0a..f8b5cb806e85 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy @@ -270,7 +270,7 @@ class CommunityRepositoryModules { withModule("intellij.android.observable.ui", "android.jar") withModuleLibrary("precompiled-flags", "android.sdktools.flags", "") withModule("intellij.android.propertyEditor", "android.jar") - withModule("intellij.android.layout-inspector", "android.jar") + withModule("intellij.android.layoutInspector", "android.jar") withModule("intellij.android.transport", "android.jar") withModule("intellij.android.designer", "android.jar") withModule("intellij.android.naveditor", "android.jar") @@ -295,10 +295,10 @@ class CommunityRepositoryModules { withModule("intellij.android.adt.ui.model", "adt-ui.jar") withModuleLibrary("precompiled-repository", "android.sdktools.repository", "") - withModuleLibrary("precompiled-db-baseLibrary", "android.sdktools.db-baseLibrary", "") - withModuleLibrary("precompiled-db-baseLibrarySupport", "android.sdktools.db-baseLibrarySupport", "") - withModuleLibrary("precompiled-db-compilerCommon", "android.sdktools.db-compilerCommon", "") - withModuleLibrary("precompiled-db-compiler", "android.sdktools.db-compiler", "") +// withModuleLibrary("precompiled-db-baseLibrary", "android.sdktools.db-baseLibrary", "") +// withModuleLibrary("precompiled-db-baseLibrarySupport", "android.sdktools.db-baseLibrarySupport", "") +// withModuleLibrary("precompiled-db-compilerCommon", "android.sdktools.db-compilerCommon", "") +// withModuleLibrary("precompiled-db-compiler", "android.sdktools.db-compiler", "") withModuleLibrary("precompiled-sdklib", "android.sdktools.sdklib", "") withModuleLibrary("precompiled-sdk-common", "android.sdktools.sdk-common", "") @@ -306,7 +306,6 @@ class CommunityRepositoryModules { withModule("intellij.android.layoutlibLoader", "layoutlib-loader.jar") withModuleLibrary("layoutlib", "intellij.android.layoutlib", "") withModuleLibrary("precompiled-manifest-merger", "android.sdktools.manifest-merger", "") - withModuleLibrary("precompiled-chunkio", "android.sdktools.chunkio", "") withModuleLibrary("precompiled-pixelprobe", "android.sdktools.pixelprobe", "") withModuleLibrary("precompiled-binary-resources", "android.sdktools.binary-resources", "") withModuleLibrary("precompiled-analyzer", "android.sdktools.analyzer", "") From 04dedf25476e0aabda4a01ced590848ceace9e9e Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 16 Oct 2019 11:53:55 +0300 Subject: [PATCH 11/25] added missing deploy libraries GitOrigin-RevId: 842b4a7437f7c6854c18c3f90146264d28b5ac36 --- .../jetbrains/intellij/build/CommunityLibraryLicenses.groovy | 2 +- .../jetbrains/intellij/build/CommunityRepositoryModules.groovy | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy index afebdd123cb5..617dfe1ad4de 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy @@ -267,7 +267,7 @@ class CommunityLibraryLicenses { license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Instant run protos", libraryName: "deploy-java-proto", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Instant run version", libraryName: "libjava_version.jar", + new LibraryLicense(name: "Instant run version", libraryName: "deploy-java-version", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "ISO RELAX", libraryName: "isorelax", license: "MIT License", url: "http://sourceforge.net/projects/iso-relax/", diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy index f8b5cb806e85..1b6b7712bad8 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy @@ -312,6 +312,9 @@ class CommunityRepositoryModules { withModuleLibrary("precompiled-ddmlib", "android.sdktools.ddmlib", "") withModuleLibrary("precompiled-dvlib", "android.sdktools.dvlib", "") withModuleLibrary("precompiled-deployer", "android.sdktools.deployer", "") + withModuleLibrary("deploy-java-proto", "android.sdktools.deployer", "") + withModuleLibrary("deploy-java-version", "android.sdktools.deployer", "") + withModuleLibrary("r8-master", "android.sdktools.deployer", "") withModuleLibrary("precompiled-tracer", "android.sdktools.tracer", "") withModuleLibrary("precompiled-draw9patch", "android.sdktools.draw9patch", "") withModuleLibrary("precompiled-lint-api", "android.sdktools.lint-api", "") From 207fe2960625e03f668f0fd90b1d5b1e7c69c0da Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 16 Oct 2019 12:17:54 +0300 Subject: [PATCH 12/25] android data binding libraries restored GitOrigin-RevId: 0b750bfc125b5478961237a0d5fae4776a80f6ee --- .../intellij/build/CommunityLibraryLicenses.groovy | 9 ++++++++- .../intellij/build/CommunityRepositoryModules.groovy | 8 ++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy index 617dfe1ad4de..f2c56f7ed7d5 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy @@ -50,6 +50,14 @@ class CommunityLibraryLicenses { url: "http://source.android.com/"), new LibraryLicense(name: "Android Common Library", libraryName: "precompiled-common", license: "Apache 2.0", url: "http://source.android.com/"), + new LibraryLicense(name: "Android Data Binding Base Library", libraryName: "precompiled-db-baseLibrary", license: "Apache 2.0", + url: "http://source.android.com/"), + new LibraryLicense(name: "Android Data Binding Base Library Support", libraryName: "precompiled-db-baseLibrarySupport", + license: "Apache 2.0", url: "http://source.android.com/"), + new LibraryLicense(name: "Android Data Binding Compiler", libraryName: "precompiled-db-compiler", license: "Apache 2.0", + url: "http://source.android.com/"), + new LibraryLicense(name: "Android Data Binding Compiler Common", libraryName: "precompiled-db-compilerCommon", license: "Apache 2.0", + url: "http://source.android.com/"), new LibraryLicense(name: "Android Ddm Library", libraryName: "precompiled-ddmlib", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Deployer Library", libraryName: "precompiled-deployer", @@ -184,7 +192,6 @@ class CommunityLibraryLicenses { new LibraryLicense(name: "Dart VM Service drivers", attachedTo: "intellij.dart", license: "BSD", licenseUrl: "https://github.com/dart-lang/vm_service_drivers/blob/master/LICENSE", url: "https://github.com/dart-lang/vm_service_drivers"), - new LibraryLicense(name: "data-binding", libraryName: "data-binding.jar", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "dbus-java", libraryName: "dbus-java", license: "LGPL", url: "https://mvnrepository.com/artifact/com.github.hypfvieh/dbus-java"), new LibraryLicense(name: "debugger-memory-agent", libraryName: "debugger-memory-agent", license: "Apache 2.0", url: "https://github.com/JetBrains/debugger-memory-agent", diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy index 1b6b7712bad8..33ae07f5b22c 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy @@ -295,10 +295,10 @@ class CommunityRepositoryModules { withModule("intellij.android.adt.ui.model", "adt-ui.jar") withModuleLibrary("precompiled-repository", "android.sdktools.repository", "") -// withModuleLibrary("precompiled-db-baseLibrary", "android.sdktools.db-baseLibrary", "") -// withModuleLibrary("precompiled-db-baseLibrarySupport", "android.sdktools.db-baseLibrarySupport", "") -// withModuleLibrary("precompiled-db-compilerCommon", "android.sdktools.db-compilerCommon", "") -// withModuleLibrary("precompiled-db-compiler", "android.sdktools.db-compiler", "") + withModuleLibrary("precompiled-db-baseLibrary", "android.sdktools.db-baseLibrary", "") + withModuleLibrary("precompiled-db-baseLibrarySupport", "android.sdktools.db-baseLibrarySupport", "") + withModuleLibrary("precompiled-db-compilerCommon", "android.sdktools.db-compilerCommon", "") + withModuleLibrary("precompiled-db-compiler", "android.sdktools.db-compiler", "") withModuleLibrary("precompiled-sdklib", "android.sdktools.sdklib", "") withModuleLibrary("precompiled-sdk-common", "android.sdktools.sdk-common", "") From 53c9fece66d28ccdb04b793b1bf5154f71bfe0b6 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 16 Oct 2019 12:28:44 +0300 Subject: [PATCH 13/25] missed & stale android licenses GitOrigin-RevId: 8c646868dcc3ea37607e63bddedb4c63f1e6b017 --- .../intellij/build/CommunityLibraryLicenses.groovy | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy index f2c56f7ed7d5..99ed66c48e14 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy @@ -32,8 +32,6 @@ class CommunityLibraryLicenses { license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Analytics Shared", libraryName: "precompiled-analytics-shared", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Analytics Testing", libraryName: "com.android.tools.analytics-library:testing", - license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Analytics Tracker", libraryName: "precompiled-analytics-tracker", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Annotations", libraryName: "precompiled-android-annotations", license: "Apache 2.0", @@ -70,15 +68,13 @@ class CommunityLibraryLicenses { url: "http://source.android.com/"), new LibraryLicense(name: "Android Gradle model", attachedTo: "intellij.android.core", version: "0.4-SNAPSHOT", license: "Apache 2.0", url: "https://android.googlesource.com/platform/tools/build/+/master/gradle-model/"), - new LibraryLicense(name: "Android IDE Extensions", libraryName: "android-extensions-ide.jar", license: "Apache 2.0", - url: "http://source.android.com/"), new LibraryLicense(name: "Android Java Lib Model", libraryName: "precompiled-java-lib-model", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Java Lib Model Builder", libraryName: "precompiled-java-lib-model-builder", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Kotlin Integration", libraryName: "precompiled-layoutlib-api", license: "Apache 2.0", + new LibraryLicense(name: "Android Kotlin Integration", libraryName: "intellij.android.kotlin.idea", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Layout Api Library", libraryName: "android-kotlin.jar", license: "Apache 2.0", + new LibraryLicense(name: "Android Layout Api Library", libraryName: "precompiled-layoutlib-api", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android Layout Inspector", libraryName: "precompiled-layoutinspector", license: "Apache 2.0", url: "http://source.android.com/"), @@ -186,7 +182,6 @@ class CommunityLibraryLicenses { url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html"), new LibraryLicense(name: "Cucumber-Java", libraryName: "cucumber-java", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html"), - new LibraryLicense(name: "D8", libraryName: "d8-master.jar", license: "BSD"), new LibraryLicense(name: "Dart Analysis Server", attachedTo: "intellij.dart", license: "Eclipse Public License v1.0", licenseUrl: "http://www.eclipse.org/legal/epl-v10.html", url: "https://github.com/dart-lang/eclipse3"), new LibraryLicense(name: "Dart VM Service drivers", attachedTo: "intellij.dart", license: "BSD", From 083b07d4758d4a56455d46f864003e6c84efb40f Mon Sep 17 00:00:00 2001 From: Andrei Kuznetsov Date: Fri, 18 Oct 2019 16:38:06 +0300 Subject: [PATCH 14/25] Remove redundant module 'community/build/dependencies/buildSrc' GitOrigin-RevId: a7a25446822b232a381eeed745db157e3d31d396 --- .../main/groovy/OfflineMavenRepository.groovy | 57 ------------------- build/dependencies/setupAndroidSdk.gradle | 49 ++++++++++++++++ 2 files changed, 49 insertions(+), 57 deletions(-) delete mode 100644 build/dependencies/buildSrc/src/main/groovy/OfflineMavenRepository.groovy diff --git a/build/dependencies/buildSrc/src/main/groovy/OfflineMavenRepository.groovy b/build/dependencies/buildSrc/src/main/groovy/OfflineMavenRepository.groovy deleted file mode 100644 index 99a54ba3f205..000000000000 --- a/build/dependencies/buildSrc/src/main/groovy/OfflineMavenRepository.groovy +++ /dev/null @@ -1,57 +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. -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.OutputDirectory -import org.gradle.api.tasks.TaskAction -import org.gradle.api.DefaultTask -import org.gradle.util.GFileUtils -import org.gradle.api.artifacts.Configuration -import org.gradle.api.artifacts.component.ModuleComponentIdentifier -import org.gradle.maven.MavenModule -import org.gradle.maven.MavenPomArtifact - -class OfflineMavenRepository extends DefaultTask { - @Input - String configurationName = 'compile' - - @OutputDirectory - File repoDir = new File(project.buildDir, 'offline-repo') - - @TaskAction - void build() { - Configuration configuration = project.configurations.getByName(configurationName) - copyJars(configuration) - copyPoms(configuration) - } - - private void copyJars(Configuration configuration) { - configuration.resolvedConfiguration.resolvedArtifacts.each { artifact -> - def moduleVersionId = artifact.moduleVersion.id - File moduleDir = new File(repoDir, "${moduleVersionId.group.replace('.','/')}/${moduleVersionId.name}/${moduleVersionId.version}") - GFileUtils.mkdirs(moduleDir) - - File target = new File(moduleDir, artifact.file.name) - println "Copy: $artifact.file -> $target" - GFileUtils.copyFile(artifact.file, target) - } - } - - private void copyPoms(Configuration configuration) { - def componentIds = configuration.incoming.resolutionResult.allDependencies.collect { it.selected.id } - - def result = project.dependencies.createArtifactResolutionQuery() - .forComponents(componentIds) - .withArtifacts(MavenModule, MavenPomArtifact) - .execute() - - for(component in result.resolvedComponents) { - def componentId = component.id - - if(componentId instanceof ModuleComponentIdentifier) { - File moduleDir = new File(repoDir, "${componentId.group.replace('.','/')}/${componentId.module}/${componentId.version}") - GFileUtils.mkdirs(moduleDir) - File pomFile = component.getArtifacts(MavenPomArtifact)[0].file - GFileUtils.copyFile(pomFile, new File(moduleDir, pomFile.name)) - } - } - } -} \ No newline at end of file diff --git a/build/dependencies/setupAndroidSdk.gradle b/build/dependencies/setupAndroidSdk.gradle index 3448c619a78e..b8680f2384b9 100644 --- a/build/dependencies/setupAndroidSdk.gradle +++ b/build/dependencies/setupAndroidSdk.gradle @@ -14,6 +14,8 @@ * limitations under the License. */ +import org.gradle.util.GFileUtils + repositories { maven { url 'https://cache-redirector.jetbrains.com/repo.maven.apache.org/maven2/' } maven { url 'https://cache-redirector.jetbrains.com/jetbrains.bintray.com/intellij-third-party-dependencies/' } @@ -88,3 +90,50 @@ task updateKotlinLibs(dependsOn: [configurations.kotlinDeps, syncOfflineRepo], t task setupAndroidSdk(dependsOn: [syncOfflineRepo, syncKotlinPluginForAndroid, syncAndroidSdk, updateKotlinLibs]) { // This is entry point: invoke this task to setup android sdk and all the artifacts required to run android-plugin unit tests } + +class OfflineMavenRepository extends DefaultTask { + @Input + String configurationName = 'compile' + + @OutputDirectory + File repoDir = new File(project.buildDir, 'offline-repo') + + @TaskAction + void build() { + Configuration configuration = project.configurations.getByName(configurationName) + copyJars(configuration) + copyPoms(configuration) + } + + private void copyJars(Configuration configuration) { + configuration.resolvedConfiguration.resolvedArtifacts.each { artifact -> + def moduleVersionId = artifact.moduleVersion.id + File moduleDir = new File(repoDir, "${moduleVersionId.group.replace('.','/')}/${moduleVersionId.name}/${moduleVersionId.version}") + GFileUtils.mkdirs(moduleDir) + + File target = new File(moduleDir, artifact.file.name) + println "Copy: $artifact.file -> $target" + GFileUtils.copyFile(artifact.file, target) + } + } + + private void copyPoms(Configuration configuration) { + def componentIds = configuration.incoming.resolutionResult.allDependencies.collect { it.selected.id } + + def result = project.dependencies.createArtifactResolutionQuery() + .forComponents(componentIds) + .withArtifacts(MavenModule, MavenPomArtifact) + .execute() + + for(component in result.resolvedComponents) { + def componentId = component.id + + if(componentId instanceof ModuleComponentIdentifier) { + File moduleDir = new File(repoDir, "${componentId.group.replace('.','/')}/${componentId.module}/${componentId.version}") + GFileUtils.mkdirs(moduleDir) + File pomFile = component.getArtifacts(MavenPomArtifact)[0].file + GFileUtils.copyFile(pomFile, new File(moduleDir, pomFile.name)) + } + } + } +} From 5229f3dcdfd6a724d5cf510ae77a045ea2888d34 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Fri, 18 Oct 2019 18:12:52 +0300 Subject: [PATCH 15/25] merging aosp 3.5: community project fixed GitOrigin-RevId: 36b33017d06df4b7dee18e0a85c5aea05cba11fa --- .idea/jarRepositories.xml | 46 +++++++++++++++- .idea/libraries/HdrHistogram.xml | 12 ++++ .idea/libraries/aapt_proto.xml | 10 ++++ .idea/libraries/aapt_proto_jarjar.xml | 9 --- ..._library_crash.xml => analytics_proto.xml} | 8 +-- .idea/libraries/baksmali.xml | 6 +- ...android_tools_analytics_library_protos.xml | 12 ---- ...android_tools_analytics_library_shared.xml | 12 ---- ...ndroid_tools_analytics_library_testing.xml | 12 ---- ...ndroid_tools_analytics_library_tracker.xml | 12 ---- .../com_android_tools_annotations.xml | 12 ---- ...om_android_tools_apkparser_apkanalyzer.xml | 12 ---- ...droid_tools_apkparser_binary_resources.xml | 12 ---- .../com_android_tools_build_builder_model.xml | 12 ---- ...m_android_tools_build_builder_test_api.xml | 12 ---- ...om_android_tools_build_manifest_merger.xml | 12 ---- .idea/libraries/com_android_tools_common.xml | 12 ---- .../com_android_tools_ddms_ddmlib.xml | 12 ---- .idea/libraries/com_android_tools_dvlib.xml | 12 ---- ..._android_tools_layoutlib_layoutlib_api.xml | 12 ---- .../com_android_tools_lint_lint_api.xml | 12 ---- .../com_android_tools_lint_lint_checks.xml | 12 ---- .../libraries/com_android_tools_ninepatch.xml | 12 ---- ...om_android_tools_pixelprobe_pixelprobe.xml | 12 ---- .../com_android_tools_repository.xml | 12 ---- .../com_android_tools_sdk_common.xml | 12 ---- .idea/libraries/com_android_tools_sdklib.xml | 12 ---- .../libraries/com_android_tools_testutils.xml | 12 ---- .idea/libraries/dexlib2.xml | 12 +++- .idea/libraries/freemarker.xml | 9 ++- ...va_guava_testlib.xml => guava_testlib.xml} | 8 +-- .../intellij_android_kotlin_idea.xml | 11 ++++ .idea/libraries/jimfs.xml | 9 ++- .../libraries/kotlin_gradle_plugin_model.xml | 12 ++++ .idea/libraries/kotlin_plugin.xml | 29 ++++++++++ .idea/libraries/layoutlib.xml | 9 --- ...id_tools_perflib.xml => nosyncbuilder.xml} | 8 +-- ...lij_deps_android_tools_layoutInspector.xml | 12 ---- ...j_deps_android_tools_perf_logger_tests.xml | 12 ---- .../studio_profiler_grpc_1_0_jarjar.xml | 5 +- .idea/libraries/truth.xml | 14 ++++- .idea/modules.xml | 55 +++++++++++++++++-- 42 files changed, 219 insertions(+), 341 deletions(-) create mode 100644 .idea/libraries/HdrHistogram.xml create mode 100644 .idea/libraries/aapt_proto.xml delete mode 100644 .idea/libraries/aapt_proto_jarjar.xml rename .idea/libraries/{com_android_tools_analytics_library_crash.xml => analytics_proto.xml} (57%) delete mode 100644 .idea/libraries/com_android_tools_analytics_library_protos.xml delete mode 100644 .idea/libraries/com_android_tools_analytics_library_shared.xml delete mode 100644 .idea/libraries/com_android_tools_analytics_library_testing.xml delete mode 100644 .idea/libraries/com_android_tools_analytics_library_tracker.xml delete mode 100644 .idea/libraries/com_android_tools_annotations.xml delete mode 100644 .idea/libraries/com_android_tools_apkparser_apkanalyzer.xml delete mode 100644 .idea/libraries/com_android_tools_apkparser_binary_resources.xml delete mode 100644 .idea/libraries/com_android_tools_build_builder_model.xml delete mode 100644 .idea/libraries/com_android_tools_build_builder_test_api.xml delete mode 100644 .idea/libraries/com_android_tools_build_manifest_merger.xml delete mode 100644 .idea/libraries/com_android_tools_common.xml delete mode 100644 .idea/libraries/com_android_tools_ddms_ddmlib.xml delete mode 100644 .idea/libraries/com_android_tools_dvlib.xml delete mode 100644 .idea/libraries/com_android_tools_layoutlib_layoutlib_api.xml delete mode 100644 .idea/libraries/com_android_tools_lint_lint_api.xml delete mode 100644 .idea/libraries/com_android_tools_lint_lint_checks.xml delete mode 100644 .idea/libraries/com_android_tools_ninepatch.xml delete mode 100644 .idea/libraries/com_android_tools_pixelprobe_pixelprobe.xml delete mode 100644 .idea/libraries/com_android_tools_repository.xml delete mode 100644 .idea/libraries/com_android_tools_sdk_common.xml delete mode 100644 .idea/libraries/com_android_tools_sdklib.xml delete mode 100644 .idea/libraries/com_android_tools_testutils.xml rename .idea/libraries/{com_google_guava_guava_testlib.xml => guava_testlib.xml} (61%) create mode 100644 .idea/libraries/intellij_android_kotlin_idea.xml create mode 100644 .idea/libraries/kotlin_gradle_plugin_model.xml create mode 100644 .idea/libraries/kotlin_plugin.xml delete mode 100644 .idea/libraries/layoutlib.xml rename .idea/libraries/{org_jetbrains_intellij_deps_android_tools_perflib.xml => nosyncbuilder.xml} (54%) delete mode 100644 .idea/libraries/org_jetbrains_intellij_deps_android_tools_layoutInspector.xml delete mode 100644 .idea/libraries/org_jetbrains_intellij_deps_android_tools_perf_logger_tests.xml diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index d916068688eb..a83f1982b3ed 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -46,15 +46,55 @@