From 37d131acd7ffcc9a79b37549ef4af98c5cff55c6 Mon Sep 17 00:00:00 2001 From: Andrei Kuznetsov Date: Sun, 14 Jun 2020 16:27:34 +0300 Subject: [PATCH] [merge-as-4.0] Fix project structure, licenses and so on to make sure that generated installer is valid GitOrigin-RevId: 54c122cb3c74e4338e761df6433edee9fd524676 --- .idea/libraries/aia_proto.xml | 5 ++-- .idea/libraries/freemarker.xml | 12 ---------- .idea/libraries/layoutinspector_proto.xml | 4 ++-- .idea/libraries/live_sql_proto.xml | 5 ++-- ...llij_deps_android_tools_base_templates.xml | 4 ++-- .idea/libraries/perfetto_proto.xml | 4 ++-- .idea/libraries/studio_analytics_proto.xml | 8 +++---- .idea/libraries/studio_grpc.xml | 4 ++-- .idea/libraries/studio_proto.xml | 4 ++-- .idea/libraries/transport_proto.xml | 4 ++-- .idea/modules.xml | 1 + .../intellij/build/BaseIdeaProperties.groovy | 2 +- .../build/CommunityLibraryLicenses.groovy | 24 +++++++++++++++---- .../build/CommunityRepositoryModules.groovy | 6 +++-- 14 files changed, 46 insertions(+), 41 deletions(-) delete mode 100644 .idea/libraries/freemarker.xml diff --git a/.idea/libraries/aia_proto.xml b/.idea/libraries/aia_proto.xml index e101a4890ad2..e2273f4e53fc 100644 --- a/.idea/libraries/aia_proto.xml +++ b/.idea/libraries/aia_proto.xml @@ -1,7 +1,8 @@ - + + - + diff --git a/.idea/libraries/freemarker.xml b/.idea/libraries/freemarker.xml deleted file mode 100644 index 639dc46f606e..000000000000 --- a/.idea/libraries/freemarker.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/layoutinspector_proto.xml b/.idea/libraries/layoutinspector_proto.xml index c69e5a2db999..1397d51e359f 100644 --- a/.idea/libraries/layoutinspector_proto.xml +++ b/.idea/libraries/layoutinspector_proto.xml @@ -1,8 +1,8 @@ - + - + diff --git a/.idea/libraries/live_sql_proto.xml b/.idea/libraries/live_sql_proto.xml index d4a28cc3fb31..9496fec1d2e7 100644 --- a/.idea/libraries/live_sql_proto.xml +++ b/.idea/libraries/live_sql_proto.xml @@ -1,7 +1,8 @@ - + + - + diff --git a/.idea/libraries/org_jetbrains_intellij_deps_android_tools_base_templates.xml b/.idea/libraries/org_jetbrains_intellij_deps_android_tools_base_templates.xml index b54c3339ed61..97466a5e0a28 100644 --- a/.idea/libraries/org_jetbrains_intellij_deps_android_tools_base_templates.xml +++ b/.idea/libraries/org_jetbrains_intellij_deps_android_tools_base_templates.xml @@ -1,8 +1,8 @@ - + - + diff --git a/.idea/libraries/perfetto_proto.xml b/.idea/libraries/perfetto_proto.xml index 765ebbacd112..8b0800de95d4 100644 --- a/.idea/libraries/perfetto_proto.xml +++ b/.idea/libraries/perfetto_proto.xml @@ -1,8 +1,8 @@ - + - + diff --git a/.idea/libraries/studio_analytics_proto.xml b/.idea/libraries/studio_analytics_proto.xml index 9ac1c3670f6c..c265a681a463 100644 --- a/.idea/libraries/studio_analytics_proto.xml +++ b/.idea/libraries/studio_analytics_proto.xml @@ -1,12 +1,10 @@ - + - + - - - + \ No newline at end of file diff --git a/.idea/libraries/studio_grpc.xml b/.idea/libraries/studio_grpc.xml index 23aa7b64b0e0..fa9b2c0683a4 100644 --- a/.idea/libraries/studio_grpc.xml +++ b/.idea/libraries/studio_grpc.xml @@ -1,8 +1,8 @@ - + - + diff --git a/.idea/libraries/studio_proto.xml b/.idea/libraries/studio_proto.xml index 41c7ddf00350..a418ac0dcc0b 100644 --- a/.idea/libraries/studio_proto.xml +++ b/.idea/libraries/studio_proto.xml @@ -1,8 +1,8 @@ - + - + diff --git a/.idea/libraries/transport_proto.xml b/.idea/libraries/transport_proto.xml index dae22f48bf50..2dab592bbb7e 100644 --- a/.idea/libraries/transport_proto.xml +++ b/.idea/libraries/transport_proto.xml @@ -1,8 +1,8 @@ - + - + diff --git a/.idea/modules.xml b/.idea/modules.xml index abb7173d23a0..0744c157b26f 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -600,6 +600,7 @@ + diff --git a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy index f335100da222..1f1c34f4467b 100644 --- a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy +++ b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy @@ -101,7 +101,7 @@ abstract class BaseIdeaProperties extends JetBrainsProductProperties { "plugins/xpath/lib/rt/xslt-rt.jar" : "1.6", "plugins/xslt-debugger/lib/xslt-debugger-rt.jar" : "1.6", "plugins/xslt-debugger/lib/rt/xslt-debugger-impl-rt.jar" : "1.8", - "plugins/android/lib/layoutlib-jre11-26.6.0.3.jar" : "9", + "plugins/android/lib/layoutlib-jre11-27.0.0.0.jar" : "9", "plugins/android/lib/android-rt.jar" : "1.8", ] 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 f43f6306334b..f6207d142784 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy @@ -14,6 +14,7 @@ class CommunityLibraryLicenses { public static final List LICENSES_LIST = [ new LibraryLicense(name: "AAPT Protos", libraryName: "aapt-proto", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Amazon Ion Java", libraryName: "ion", license: "Apache 2.0", url: "https://github.com/amzn/ion-java"), + new LibraryLicense(name: "Android AIA Protos", libraryName: "aia-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", @@ -30,6 +31,12 @@ class CommunityLibraryLicenses { 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/"), + new LibraryLicense(name: "Android Archive Patcher (explainer)", libraryName: "explainer-27.0.0.0.jar", license: "Apache 2.0", + url: "http://source.android.com/"), + new LibraryLicense(name: "Android Archive Patcher (generator)", libraryName: "generator-27.0.0.0.jar", license: "Apache 2.0", + url: "http://source.android.com/"), + new LibraryLicense(name: "Android Archive Patcher (shared)", libraryName: "shared-27.0.0.0.jar", 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: "precompiled-builder-model", license: "Apache 2.0", @@ -38,6 +45,8 @@ class CommunityLibraryLicenses { url: "http://source.android.com/"), new LibraryLicense(name: "Android Chunkio", libraryName: "precompiled-chunkio", license: "Apache 2.0", url: "http://source.android.com/"), + new LibraryLicense(name: "Android Chunkio Processor", libraryName: "precompiled-chunkio-processor", license: "Apache 2.0", + 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", @@ -78,6 +87,8 @@ class CommunityLibraryLicenses { license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android ninepatch Library", libraryName: "precompiled-ninepatch", license: "Apache 2.0", url: "http://source.android.com/"), + new LibraryLicense(name: "Android Perf-Logger Library", libraryName: "precompiled-perf-logger", + license: "Apache 2.0", url: "http://source.android.com/"), 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: "precompiled-pixelprobe", @@ -98,9 +109,11 @@ class CommunityLibraryLicenses { 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: "Android Wizard Template", libraryName: "precompiled-intellij.android.wizardTemplate.impl", + new LibraryLicense(name: "Android Wizard Template", libraryName: "precompiled-wizardTemplate.impl", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Wizard Template Plugin", libraryName: "precompiled-intellij.android.wizardTemplate.plugin", + new LibraryLicense(name: "Android Wizard Template Plugin", libraryName: "precompiled-wizardTemplate.plugin", + license: "Apache 2.0", url: "http://source.android.com/"), + new LibraryLicense(name: "Android Zipflinger", libraryName: "precompiled-zipflinger", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "ANTLR 4 Runtime", libraryName: "antlr4-runtime", license: "BSD", url: "http://www.antlr.org", licenseUrl: "http://www.antlr.org/license.html"), @@ -288,9 +301,9 @@ class CommunityLibraryLicenses { licenseUrl: "https://github.com/unitsofmeasurement/indriya/blob/master/LICENSE"), new LibraryLicense(name: "ini4j (JetBrains's fork)", libraryName: "ini4j", license: "Apache 2.0", url: "https://github.com/JetBrains/intellij-deps-ini4j"), - new LibraryLicense(name: "Instant run protos", libraryName: "deploy-java-proto", + 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: "deploy-java-version", + new LibraryLicense(name: "Instant run version", libraryName: "libjava_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/", @@ -428,6 +441,7 @@ class CommunityLibraryLicenses { url: "https://github.com/ktorio/ktor"), new LibraryLicense(name: "kXML2", libraryName: "kxml2", license: "BSD", url: "http://sourceforge.net/projects/kxml/"), new LibraryLicense(name: "Layout Inspector Protos", libraryName: "layoutinspector-proto", license: "Apache 2.0", url: "http://source.android.com/"), + new LibraryLicense(name: "Live SQL Protos", libraryName: "live-sql-proto", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Log4j", libraryName: "Log4J", license: "Apache 2.0", url: "http://logging.apache.org/log4j/1.2/index.html", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"), new LibraryLicense(name: "lz4-java", libraryName: "lz4-java", license: "Apache 2.0", @@ -525,7 +539,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: "R8 DEX shrinker", libraryName: "r8", 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", 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 8cd1d0b42e4c..8e970dda7d53 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy @@ -288,8 +288,8 @@ class CommunityRepositoryModules { withModule("intellij.android.sdkUpdates", "android.jar") withModule("intellij.android.wizard", "android.jar") withModule("intellij.android.wizard.model", "android.jar") - withModuleLibrary("precompiled-plugin", "android.sdktools.wizardTemplate.plugin", "") - withModuleLibrary("precompiled-impl", "android.sdktools.wizardTemplate.impl", "") + withModuleLibrary("precompiled-wizardTemplate.plugin", "android.sdktools.wizardTemplate.plugin", "") + withModuleLibrary("precompiled-wizardTemplate.impl", "android.sdktools.wizardTemplate.impl", "") withModule("intellij.android.profilersAndroid", "android.jar") withModule("intellij.android.deploy", "android.jar") withModule("intellij.android.kotlin.idea", "android-kotlin.jar") @@ -357,6 +357,8 @@ class CommunityRepositoryModules { withModule("intellij.android.jps", "jps/android-jps-plugin.jar", null) + withProjectLibrary("kxml2") //todo[nik] move to module libraries + withProjectLibrary("asm-tools") withResourceFromModule("intellij.android.core", "lib/commons-compress-1.8.1.jar", "lib") withResourceFromModule("intellij.android.core", "lib/javawriter-2.2.1.jar", "lib")