MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into merging-aosp-35

Browse Source 
# Conflicts:
#	community/android/android/src/com/android/tools/idea/lang/databinding/model/PsiModelMethod.java

GitOrigin-RevId: 7dafe6a7e3ab030a21025492a5c4f7133652531a
This commit is contained in:
Andrei Kuznetsov
2019-11-07 02:40:58 +00:00
committed by intellij-monorepo-bot
parent bd8880b483 9fb329ce26
commit 276aed9786
52 changed files with 494 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/jarRepositories.xml
Generated
+43 -3
View File
@@ -46,15 +46,55 @@
<option name="name" value="a93311a0-6b4a-43ad-94e7-90f6ea1986ee" />
<option name="url" value="https://cache-redirector.jetbrains.com/jetbrains.bintray.com/markdown" />
</remote-repository>
<remote-repository>
<option name="id" value="e585af2a-f558-424b-a8e6-3a1365d5b046" />
<option name="name" value="e585af2a-f558-424b-a8e6-3a1365d5b046" />
<option name="url" value="https://cache-redirector.jetbrains.com/jetbrains.bintray.com/markdown" />
</remote-repository>
<remote-repository>
<option name="id" value="7f849d18-5038-490f-a93d-226871e8f98c" />
<option name="name" value="7f849d18-5038-490f-a93d-226871e8f98c" />
<option name="url" value="https://cache-redirector.jetbrains.com/www.myget.org/F/rd-snapshots/maven" />
</remote-repository>
<remote-repository>
<option name="id" value="e585af2a-f558-424b-a8e6-3a1365d5b046" />
<option name="name" value="e585af2a-f558-424b-a8e6-3a1365d5b046" />
<option name="url" value="https://cache-redirector.jetbrains.com/jetbrains.bintray.com/markdown" />
<option name="id" value="maven4" />
<option name="name" value="maven4" />
<option name="url" value="https://repo.labs.intellij.net/jet-sign" />
</remote-repository>
<remote-repository>
<option name="id" value="maven5" />
<option name="name" value="maven5" />
<option name="url" value="https://cache-redirector.jetbrains.com/repo.maven.apache.org/maven2/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven3" />
<option name="name" value="maven3" />
<option name="url" value="https://cache-redirector.jetbrains.com/plugins.jetbrains.com/maven" />
</remote-repository>
<remote-repository>
<option name="id" value="maven8" />
<option name="name" value="maven8" />
<option name="url" value="https://cache-redirector.jetbrains.com/jetbrains.bintray.com/test-discovery" />
</remote-repository>
<remote-repository>
<option name="id" value="maven" />
<option name="name" value="maven" />
<option name="url" value="https://repo.labs.intellij.net/java" />
</remote-repository>
<remote-repository>
<option name="id" value="maven9" />
<option name="name" value="maven9" />
<option name="url" value="https://cache-redirector.jetbrains.com/jcenter.bintray.com" />
</remote-repository>
<remote-repository>
<option name="id" value="maven6" />
<option name="name" value="maven6" />
<option name="url" value="https://cache-redirector.jetbrains.com/jetbrains.bintray.com/intellij-third-party-dependencies/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven10" />
<option name="name" value="maven10" />
<option name="url" value="https://www.jetbrains.com/intellij-repository/releases" />
</remote-repository>
<remote-repository>
<option name="id" value="36870030-7a21-4052-b93a-010aa4c33366" />
.idea/libraries/HdrHistogram.xml
Generated
+12
View File
@@ -0,0 +1,12 @@
<component name="libraryTable">
<library name="HdrHistogram" type="repository">
<properties include-transitive-deps="false" maven-id="org.hdrhistogram:HdrHistogram:2.1.4" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/hdrhistogram/HdrHistogram/2.1.4/HdrHistogram-2.1.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/hdrhistogram/HdrHistogram/2.1.4/HdrHistogram-2.1.4-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/aapt_proto.xml
Generated
+10
View File
@@ -0,0 +1,10 @@
<component name="libraryTable">
<library name="aapt-proto" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.build:aapt2-proto:0.3.1" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/build/aapt2-proto/0.3.1/aapt2-proto-0.3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/aapt_proto_jarjar.xml
Generated
-9
View File
@@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="aapt-proto-jarjar">
<CLASSES>
<root url="jar://$PROJECT_DIR$/android/android/lib/aapt-proto-jarjar.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/com_android_tools_analytics_library_crash.xml → .idea/libraries/analytics_proto.xml
Generated
+4 -4
View File
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="com.android.tools.analytics-library:crash" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.analytics-library:crash:26.3.0" />
<library name="analytics-proto" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.analytics-library:protos:26.5.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/crash/26.3.0/crash-26.3.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/protos/26.5.0/protos-26.5.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/crash/26.3.0/crash-26.3.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/protos/26.5.0/protos-26.5.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/baksmali.xml
Generated
+3 -3
View File
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="baksmali">
<library name="baksmali" type="repository">
<properties include-transitive-deps="false" maven-id="org.smali:baksmali:2.2.4" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/android/android/lib/baksmali-2.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/android/android/lib/util-2.2.1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/smali/baksmali/2.2.4/baksmali-2.2.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/libraries/com_android_tools_analytics_library_protos.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.analytics-library:protos" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.analytics-library:protos:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/protos/26.3.0/protos-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/protos/26.3.0/protos-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_analytics_library_shared.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.analytics-library:shared" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.analytics-library:shared:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/shared/26.3.0/shared-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/shared/26.3.0/shared-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_analytics_library_testing.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.analytics-library:testing" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.analytics-library:testing:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/testing/26.3.0/testing-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/testing/26.3.0/testing-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_analytics_library_tracker.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.analytics-library:tracker" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.analytics-library:tracker:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/tracker/26.3.0/tracker-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/tracker/26.3.0/tracker-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_annotations.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools:annotations" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools:annotations:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/annotations/26.3.0/annotations-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/annotations/26.3.0/annotations-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_apkparser_apkanalyzer.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.apkparser:apkanalyzer" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.apkparser:apkanalyzer:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/apkparser/apkanalyzer/26.3.0/apkanalyzer-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/apkparser/apkanalyzer/26.3.0/apkanalyzer-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_apkparser_binary_resources.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.apkparser:binary-resources" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.apkparser:binary-resources:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/apkparser/binary-resources/26.3.0/binary-resources-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/apkparser/binary-resources/26.3.0/binary-resources-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_build_builder_model.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.build:builder-model" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.build:builder-model:3.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/build/builder-model/3.3.0/builder-model-3.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/build/builder-model/3.3.0/builder-model-3.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_build_builder_test_api.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.build:builder-test-api" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.build:builder-test-api:3.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/build/builder-test-api/3.3.0/builder-test-api-3.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/build/builder-test-api/3.3.0/builder-test-api-3.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_build_manifest_merger.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.build:manifest-merger" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.build:manifest-merger:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/build/manifest-merger/26.3.0/manifest-merger-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/build/manifest-merger/26.3.0/manifest-merger-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_common.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools:common" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools:common:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/common/26.3.0/common-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/common/26.3.0/common-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_ddms_ddmlib.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.ddms:ddmlib" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.ddms:ddmlib:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/ddms/ddmlib/26.3.0/ddmlib-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/ddms/ddmlib/26.3.0/ddmlib-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_dvlib.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools:dvlib" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools:dvlib:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/dvlib/26.3.0/dvlib-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/dvlib/26.3.0/dvlib-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_layoutlib_layoutlib_api.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.layoutlib:layoutlib-api" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools:layoutlib-api:26.3.0-sp1" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/layoutlib-api/26.3.0-sp1/layoutlib-api-26.3.0-sp1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/layoutlib-api/26.3.0-sp1/layoutlib-api-26.3.0-sp1-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_lint_lint_api.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.lint:lint-api" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.lint:lint-api:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/lint/lint-api/26.3.0/lint-api-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/lint/lint-api/26.3.0/lint-api-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_lint_lint_checks.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.lint:lint-checks" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.lint:lint-checks:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/lint/lint-checks/26.3.0/lint-checks-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/lint/lint-checks/26.3.0/lint-checks-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_ninepatch.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools:ninepatch" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools:ninepatch:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/ninepatch/26.3.0/ninepatch-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/ninepatch/26.3.0/ninepatch-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_pixelprobe_pixelprobe.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools.pixelprobe:pixelprobe" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.pixelprobe:pixelprobe:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/pixelprobe/pixelprobe/26.3.0/pixelprobe-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/pixelprobe/pixelprobe/26.3.0/pixelprobe-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_repository.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools:repository" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools:repository:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/repository/26.3.0/repository-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/repository/26.3.0/repository-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_sdk_common.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools:sdk-common" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools:sdk-common:26.3.0-sp1" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/sdk-common/26.3.0-sp1/sdk-common-26.3.0-sp1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/sdk-common/26.3.0-sp1/sdk-common-26.3.0-sp1-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_sdklib.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools:sdklib" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools:sdklib:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/sdklib/26.3.0/sdklib-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/sdklib/26.3.0/sdklib-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_android_tools_testutils.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="com.android.tools:testutils" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools:testutils:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/testutils/26.3.0/testutils-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/testutils/26.3.0/testutils-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/dexlib2.xml
Generated
+10 -2
View File
@@ -1,7 +1,15 @@
<component name="libraryTable">
<library name="dexlib2">
<library name="dexlib2" type="repository">
<properties maven-id="org.smali:dexlib2:2.2.4">
<exclude>
<dependency maven-id="com.beust:jcommander" />
<dependency maven-id="com.google.code.findbugs:jsr305" />
<dependency maven-id="com.google.guava:guava" />
</exclude>
</properties>
<CLASSES>
<root url="jar://$PROJECT_DIR$/android/android/lib/dexlib2-2.2.1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/smali/dexlib2/2.2.4/dexlib2-2.2.4.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/smali/util/2.2.4/util-2.2.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/libraries/freemarker.xml
Generated
+6 -3
View File
@@ -1,9 +1,12 @@
<component name="libraryTable">
<library name="freemarker">
<library name="freemarker" type="repository">
<properties include-transitive-deps="false" maven-id="org.freemarker:freemarker:2.3.20" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/android/android/lib/freemarker-2.3.20.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.20/freemarker-2.3.20.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.20/freemarker-2.3.20-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/com_google_guava_guava_testlib.xml → .idea/libraries/guava_testlib.xml
Generated
+4 -4
View File
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="com.google.guava:guava-testlib" type="repository">
<properties include-transitive-deps="false" maven-id="com.google.guava:guava-testlib:21.0" />
<library name="guava-testlib" type="repository">
<properties include-transitive-deps="false" maven-id="com.google.guava:guava-testlib:25.1-jre" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava-testlib/21.0/guava-testlib-21.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava-testlib/25.1-jre/guava-testlib-25.1-jre.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava-testlib/21.0/guava-testlib-21.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava-testlib/25.1-jre/guava-testlib-25.1-jre-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/intellij_android_kotlin_idea.xml
Generated
+11
View File
@@ -0,0 +1,11 @@
<component name="libraryTable">
<library name="intellij.android.kotlin.idea">
<CLASSES>
<root url="jar://$PROJECT_DIR$/android/android/lib/intellij.android.kotlin.idea.jar!/" />
<root url="jar://$PROJECT_DIR$/android/android/lib/intellij.android.kotlin.output.parser.jar!/" />
<root url="jar://$PROJECT_DIR$/android/android/lib/intellij.android.kotlin.extensions.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/jimfs.xml
Generated
+6 -3
View File
@@ -1,9 +1,12 @@
<component name="libraryTable">
<library name="jimfs">
<library name="jimfs" type="repository">
<properties include-transitive-deps="false" maven-id="com.google.jimfs:jimfs:1.1" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/android/android/lib/jimfs-1.1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/jimfs/jimfs/1.1/jimfs-1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/kotlin_gradle_plugin_model.xml
Generated
+12
View File
@@ -0,0 +1,12 @@
<component name="libraryTable">
<library name="kotlin-gradle-plugin-model" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.3.50" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.3.50/kotlin-gradle-plugin-model-1.3.50.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.3.50/kotlin-gradle-plugin-model-1.3.50-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/kotlin_plugin.xml
Generated
+29
View File
@@ -0,0 +1,29 @@
<component name="libraryTable">
<library name="kotlin-plugin">
<!-- FIXME-ank: now we have two KotlinPlugins. Delete this one (kotlin-plugin) and leave KotlinPlugin in place -->
<CLASSES>
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/allopen-ide-plugin.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/android-extensions-ide.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/javaslang-2.0.6.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/kotlin-gradle-tooling.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/kotlin-plugin.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/kotlin-reflect.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/kotlin-script-runtime.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/noarg-ide-plugin.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/sam-with-receiver-ide-plugin.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/javax.inject-1.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/kapt3-idea.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/kotlin-scripting-common.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/kotlin-scripting-jvm.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/kotlin-scripting-compiler-impl.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/kotlin-scripting-intellij.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/kotlin-sam-with-receiver-compiler-plugin.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/kotlin-noarg-compiler-plugin.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/kotlinx-serialization-compiler-plugin.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/kotlin-allopen-compiler-plugin.jar!/" />
<root url="jar://$PROJECT_DIR$/build/dependencies/build/kotlin/Kotlin/lib/android-extensions-compiler.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/layoutlib.xml
Generated
-9
View File
@@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="layoutlib">
<CLASSES>
<root url="jar://$PROJECT_DIR$/android/android/lib/jdk8/layoutlib.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/org_jetbrains_intellij_deps_android_tools_perflib.xml → .idea/libraries/nosyncbuilder.xml
Generated
+4 -4
View File
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="org.jetbrains.intellij.deps.android.tools:perflib" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools:perflib:26.3.0" />
<library name="nosyncbuilder" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools:nosyncbuilder:26.5.0.1" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/perflib/26.3.0/perflib-26.3.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/nosyncbuilder/26.5.0.1/nosyncbuilder-26.5.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/perflib/26.3.0/perflib-26.3.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/nosyncbuilder/26.5.0.1/nosyncbuilder-26.5.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/org_jetbrains_intellij_deps_android_tools_layoutInspector.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="org.jetbrains.intellij.deps.android.tools:layoutInspector" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools:layoutInspector:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/layoutInspector/26.3.0/layoutInspector-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/layoutInspector/26.3.0/layoutInspector-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/org_jetbrains_intellij_deps_android_tools_perf_logger_tests.xml
Generated
-12
View File
@@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="org.jetbrains.intellij.deps.android.tools:perf-logger-tests" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools:perf-logger-tests:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/perf-logger-tests/26.3.0/perf-logger-tests-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/perf-logger-tests/26.3.0/perf-logger-tests-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/org_jetbrains_intellij_deps_android_tools_resources_aar.xml
Generated
+10
View File
@@ -0,0 +1,10 @@
<component name="libraryTable">
<library name="org.jetbrains.intellij.deps.android.tools:resources-aar" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools:resources-aar:26.5.0.1" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/resources-aar/26.5.0.1/resources-aar-26.5.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/studio_profiler_grpc_1_0_jarjar.xml
Generated
+3 -2
View File
@@ -1,7 +1,8 @@
<component name="libraryTable">
<library name="studio-profiler-grpc-1.0-jarjar">
<library name="studio-profiler-grpc-1.0-jarjar" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools:studio-profiler-grpc:26.5.0.1" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/android/android/lib/studio-profiler-grpc-1.0-jarjar.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/studio-profiler-grpc/26.5.0.1/studio-profiler-grpc-26.5.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/libraries/truth.xml
Generated
+12 -2
View File
@@ -1,8 +1,18 @@
<component name="libraryTable">
<library name="truth" type="repository">
<properties include-transitive-deps="false" maven-id="com.google.truth:truth:0.34" />
<properties maven-id="com.google.truth:truth:0.42">
<exclude>
<dependency maven-id="com.google.guava:guava" />
<dependency maven-id="org.checkerframework:checker-compat-qual" />
<dependency maven-id="org.checkerframework:checker-qual" />
<dependency maven-id="junit:junit" />
<dependency maven-id="com.google.auto.value:auto-value-annotations" />
<dependency maven-id="com.google.errorprone:error_prone_annotations" />
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/truth/truth/0.34/truth-0.34.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/truth/truth/0.42/truth-0.42.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/modules.xml
Generated
+50 -10
View File
@@ -345,38 +345,75 @@
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/android/tools-base/android.sdktools.layoutlib-resources.iml" filepath="$PROJECT_DIR$/android/tools-base/android.sdktools.layoutlib-resources.iml" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/sdklib/android.sdktools.sdklib.iml" filepath="$PROJECT_DIR$/android/tools-base/sdklib/android.sdktools.sdklib.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/android.sdktools.analytics-crash.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/android.sdktools.analytics-crash.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/android.sdktools.analytics-shared.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/android.sdktools.analytics-shared.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/android.sdktools.analytics-testing.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/android.sdktools.analytics-testing.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/android.sdktools.analytics-tracker.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/android.sdktools.analytics-tracker.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.analyzer.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.analyzer.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.android-annotations.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.android-annotations.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.binary-resources.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.binary-resources.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.builder-model.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.builder-model.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.builder-test-api.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.builder-test-api.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.common.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.common.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/android.sdktools.db-baseLibrary.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/android.sdktools.db-baseLibrary.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/android.sdktools.db-baseLibrarySupport.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/android.sdktools.db-baseLibrarySupport.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/android.sdktools.db-compiler.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/android.sdktools.db-compiler.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/android.sdktools.db-compilerCommon.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/android.sdktools.db-compilerCommon.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.ddmlib.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.ddmlib.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.deployer.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.deployer.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.draw9patch.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.draw9patch.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.dvlib.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.dvlib.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.fakeadbserver.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.fakeadbserver.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.flags.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.flags.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.java-lib-model.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.java-lib-model.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.java-lib-model-builder.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.java-lib-model-builder.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.layoutinspector.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.layoutinspector.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.layoutlib-api.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.layoutlib-api.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.lint-api.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.lint-api.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.lint-checks.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.lint-checks.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.manifest-merger.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.manifest-merger.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.ninepatch.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.ninepatch.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/android.sdktools.perf-logger.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/android.sdktools.perf-logger.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.perflib.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.perflib.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.pixelprobe.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.pixelprobe.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.repository.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.repository.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.sdk-common.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.sdk-common.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.sdklib.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.sdklib.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.testutils.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.testutils.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.tracer.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.tracer.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.usb-devices.iml" filepath="$PROJECT_DIR$/android/android/prebuilts/sdktools/android.sdktools.usb-devices.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android-adb/intellij.android.adb.iml" filepath="$PROJECT_DIR$/android/android-adb/intellij.android.adb.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android-adb/intellij.android.adb.tests.iml" filepath="$PROJECT_DIR$/android/android-adb/intellij.android.adb.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/adt-branding/intellij.android.adt.branding.iml" filepath="$PROJECT_DIR$/android/adt-branding/intellij.android.adt.branding.iml" />
<module fileurl="file://$PROJECT_DIR$/android/adt-testutils/intellij.android.adt.testutils.iml" filepath="$PROJECT_DIR$/android/adt-testutils/intellij.android.adt.testutils.iml" />
<module fileurl="file://$PROJECT_DIR$/android/adt-ui/intellij.android.adt.ui.iml" filepath="$PROJECT_DIR$/android/adt-ui/intellij.android.adt.ui.iml" />
<module fileurl="file://$PROJECT_DIR$/android/adt-ui-model/intellij.android.adt.ui.model.iml" filepath="$PROJECT_DIR$/android/adt-ui-model/intellij.android.adt.ui.model.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android-layout-inspector/intellij.android.androidLayoutInspector.iml" filepath="$PROJECT_DIR$/android/android-layout-inspector/intellij.android.androidLayoutInspector.iml" />
<module fileurl="file://$PROJECT_DIR$/android/apkanalyzer/intellij.android.apkanalyzer.iml" filepath="$PROJECT_DIR$/android/apkanalyzer/intellij.android.apkanalyzer.iml" />
<module fileurl="file://$PROJECT_DIR$/android/artwork/intellij.android.artwork.iml" filepath="$PROJECT_DIR$/android/artwork/intellij.android.artwork.iml" />
<module fileurl="file://$PROJECT_DIR$/android/assistant/intellij.android.assistant.iml" filepath="$PROJECT_DIR$/android/assistant/intellij.android.assistant.iml" />
<module fileurl="file://$PROJECT_DIR$/android/build-common/intellij.android.buildCommon.iml" filepath="$PROJECT_DIR$/android/build-common/intellij.android.buildCommon.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android-common/intellij.android.common.iml" filepath="$PROJECT_DIR$/android/android-common/intellij.android.common.iml" />
<module fileurl="file://$PROJECT_DIR$/android/connection-assistant/intellij.android.connectionAssistant.iml" filepath="$PROJECT_DIR$/android/connection-assistant/intellij.android.connectionAssistant.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/intellij.android.core.iml" filepath="$PROJECT_DIR$/android/android/intellij.android.core.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/intellij.android.core.tests.iml" filepath="$PROJECT_DIR$/android/android/intellij.android.core.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/databinding/intellij.android.databinding.iml" filepath="$PROJECT_DIR$/android/databinding/intellij.android.databinding.iml" />
<module fileurl="file://$PROJECT_DIR$/android/databinding/intellij.android.databinding.tests.iml" filepath="$PROJECT_DIR$/android/databinding/intellij.android.databinding.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android-debuggers/intellij.android.debuggers.iml" filepath="$PROJECT_DIR$/android/android-debuggers/intellij.android.debuggers.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android-debuggers/intellij.android.debuggers.tests.iml" filepath="$PROJECT_DIR$/android/android-debuggers/intellij.android.debuggers.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/deploy/intellij.android.deploy.iml" filepath="$PROJECT_DIR$/android/deploy/intellij.android.deploy.iml" />
<module fileurl="file://$PROJECT_DIR$/android/designer/intellij.android.designer.iml" filepath="$PROJECT_DIR$/android/designer/intellij.android.designer.iml" />
<module fileurl="file://$PROJECT_DIR$/android/designer/intellij.android.designer.tests.iml" filepath="$PROJECT_DIR$/android/designer/intellij.android.designer.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/uitest-framework/intellij.android.guiTestFramework.iml" filepath="$PROJECT_DIR$/android/uitest-framework/intellij.android.guiTestFramework.iml" />
<module fileurl="file://$PROJECT_DIR$/android/jps-plugin/intellij.android.jps.iml" filepath="$PROJECT_DIR$/android/jps-plugin/intellij.android.jps.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android-lang/intellij.android.lang.iml" filepath="$PROJECT_DIR$/android/android-lang/intellij.android.lang.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android-lang/intellij.android.lang.tests.iml" filepath="$PROJECT_DIR$/android/android-lang/intellij.android.lang.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android-layout-inspector/intellij.android.layoutInspector.iml" filepath="$PROJECT_DIR$/android/android-layout-inspector/intellij.android.layoutInspector.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android-layout-inspector/intellij.android.layoutInspector.test.iml" filepath="$PROJECT_DIR$/android/android-layout-inspector/intellij.android.layoutInspector.test.iml" />
<module fileurl="file://$PROJECT_DIR$/android/layout-inspector/intellij.android.layoutInspector.iml" filepath="$PROJECT_DIR$/android/layout-inspector/intellij.android.layoutInspector.iml" />
<module fileurl="file://$PROJECT_DIR$/android/layoutlib/intellij.android.layoutlib.iml" filepath="$PROJECT_DIR$/android/layoutlib/intellij.android.layoutlib.iml" />
<module fileurl="file://$PROJECT_DIR$/android/layoutlib/intellij.android.layoutlibLoader.iml" filepath="$PROJECT_DIR$/android/layoutlib/intellij.android.layoutlibLoader.iml" />
<module fileurl="file://$PROJECT_DIR$/android/layoutlib/intellij.android.layoutlibLoader.tests.iml" filepath="$PROJECT_DIR$/android/layoutlib/intellij.android.layoutlibLoader.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/native-symbolizer/intellij.android.nativeSymbolizer.iml" filepath="$PROJECT_DIR$/android/native-symbolizer/intellij.android.nativeSymbolizer.iml" />
<module fileurl="file://$PROJECT_DIR$/android/naveditor/intellij.android.naveditor.iml" filepath="$PROJECT_DIR$/android/naveditor/intellij.android.naveditor.iml" />
<module fileurl="file://$PROJECT_DIR$/android/naveditor/intellij.android.naveditor.tests.iml" filepath="$PROJECT_DIR$/android/naveditor/intellij.android.naveditor.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/observable/intellij.android.observable.iml" filepath="$PROJECT_DIR$/android/observable/intellij.android.observable.iml" />
<module fileurl="file://$PROJECT_DIR$/android/observable-ui/intellij.android.observable.ui.iml" filepath="$PROJECT_DIR$/android/observable-ui/intellij.android.observable.ui.iml" />
<module fileurl="file://$PROJECT_DIR$/android/perfd-host/intellij.android.perfdHost.iml" filepath="$PROJECT_DIR$/android/perfd-host/intellij.android.perfdHost.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android-plugin/intellij.android.plugin.iml" filepath="$PROJECT_DIR$/android/android-plugin/intellij.android.plugin.iml" />
<module fileurl="file://$PROJECT_DIR$/android/profilers/intellij.android.profilers.iml" filepath="$PROJECT_DIR$/android/profilers/intellij.android.profilers.iml" />
<module fileurl="file://$PROJECT_DIR$/android/profilers-atrace/intellij.android.profilers.atrace.iml" filepath="$PROJECT_DIR$/android/profilers-atrace/intellij.android.profilers.atrace.iml" />
@@ -386,13 +423,16 @@
<module fileurl="file://$PROJECT_DIR$/android/project-system-gradle/intellij.android.projectSystem.gradle.iml" filepath="$PROJECT_DIR$/android/project-system-gradle/intellij.android.projectSystem.gradle.iml" />
<module fileurl="file://$PROJECT_DIR$/android/project-system-gradle/intellij.android.projectSystem.gradle.tests.iml" filepath="$PROJECT_DIR$/android/project-system-gradle/intellij.android.projectSystem.gradle.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/project-system/intellij.android.projectSystem.tests.iml" filepath="$PROJECT_DIR$/android/project-system/intellij.android.projectSystem.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/property-editor/intellij.android.propertyEditor.iml" filepath="$PROJECT_DIR$/android/property-editor/intellij.android.propertyEditor.iml" />
<module fileurl="file://$PROJECT_DIR$/android/resources-aar/intellij.android.resourcesAar.iml" filepath="$PROJECT_DIR$/android/resources-aar/intellij.android.resourcesAar.iml" />
<module fileurl="file://$PROJECT_DIR$/android/resources-aar/intellij.android.resourcesAar.tests.iml" filepath="$PROJECT_DIR$/android/resources-aar/intellij.android.resourcesAar.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/rt/intellij.android.rt.iml" filepath="$PROJECT_DIR$/android/rt/intellij.android.rt.iml" />
<module fileurl="file://$PROJECT_DIR$/android/sdk-updates/intellij.android.sdkUpdates.iml" filepath="$PROJECT_DIR$/android/sdk-updates/intellij.android.sdkUpdates.iml" />
<module fileurl="file://$PROJECT_DIR$/android/smali/intellij.android.smali.iml" filepath="$PROJECT_DIR$/android/smali/intellij.android.smali.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android/intellij.android.studio.main.iml" filepath="$PROJECT_DIR$/android/android/intellij.android.studio.main.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android-test-framework/intellij.android.testFramework.iml" filepath="$PROJECT_DIR$/android/android-test-framework/intellij.android.testFramework.iml" />
<module fileurl="file://$PROJECT_DIR$/android/uitest-framework-bazel/intellij.android.uitestFramework.bazel.iml" filepath="$PROJECT_DIR$/android/uitest-framework-bazel/intellij.android.uitestFramework.bazel.iml" />
<module fileurl="file://$PROJECT_DIR$/android/whats-new-assistant/intellij.android.whatsNewAssistant.iml" filepath="$PROJECT_DIR$/android/whats-new-assistant/intellij.android.whatsNewAssistant.iml" />
<module fileurl="file://$PROJECT_DIR$/android/android-transport/intellij.android.transport.iml" filepath="$PROJECT_DIR$/android/android-transport/intellij.android.transport.iml" />
<module fileurl="file://$PROJECT_DIR$/android/transport-database/intellij.android.transportDatabase.iml" filepath="$PROJECT_DIR$/android/transport-database/intellij.android.transportDatabase.iml" />
<module fileurl="file://$PROJECT_DIR$/android/wizard/intellij.android.wizard.iml" filepath="$PROJECT_DIR$/android/wizard/intellij.android.wizard.iml" />
<module fileurl="file://$PROJECT_DIR$/android/wizard-model/intellij.android.wizard.model.iml" filepath="$PROJECT_DIR$/android/wizard-model/intellij.android.wizard.model.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/ant/intellij.ant.iml" filepath="$PROJECT_DIR$/plugins/ant/intellij.ant.iml" />
build/dependencies/setupAndroidSdk.gradle
+119 -115
View File
@@ -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,126 @@
* 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 org.gradle.util.GFileUtils
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/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
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
}
configurations {
androidOfflineRepo
androidSdk
kotlinDeps
}
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 {
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}"
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.
Later we will create an overlay with Android SDK and KotlinPlugin artifacts */
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 "$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 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
}
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))
}
}
}
}
intellij.idea.community.main.iml
-3
View File
@@ -8,7 +8,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.android.core" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.ant" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.boot" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.bootstrap" scope="RUNTIME" />
@@ -117,14 +116,12 @@
<orderEntry type="module" module-name="intellij.platform.builtInServer.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.updater" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.coverage" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.android.jps" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.scriptDebugger.ui" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.remoteServers.git" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.terminal" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.jps.javacRefScanner8" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.buildScripts" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.images.build" scope="TEST" />
<orderEntry type="module" module-name="intellij.android.plugin" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.statsCollector" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.debugger.streams" scope="RUNTIME" />
<orderEntry type="library" scope="RUNTIME" name="jgoodies-common" level="project" />
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+52 -48
View File
@@ -14,7 +14,7 @@ import static org.jetbrains.intellij.build.LibraryLicense.jetbrainsLibrary
class CommunityLibraryLicenses {
@SuppressWarnings("SpellCheckingInspection")
public static final List<LibraryLicense> 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,90 +22,94 @@ 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: "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",
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: "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",
new LibraryLicense(name: "Android Analytics Tracker", libraryName: "precompiled-analytics-tracker",
license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Analytics Tracker", libraryName: "com.android.tools.analytics-library: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",
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: "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 Data Binding Base Library", libraryName: "precompiled-db-baseLibrary", 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 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",
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/"),
new LibraryLicense(name: "Android IDE Extensions", libraryName: "android-extensions-ide.jar", 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 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: "com.android.java.tools.build: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: "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: "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 Resources Aar", libraryName: "org.jetbrains.intellij.deps.android.tools:resources-aar", 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 Common", libraryName: "precompiled-sdk-common", license: "Apache 2.0",
url: "http://source.android.com/"),
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 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",
url: "http://www.antlr.org", licenseUrl: "http://www.antlr.org/license.html"),
@@ -169,8 +173,6 @@ class CommunityLibraryLicenses {
new LibraryLicense(libraryName: "bouncy-castle-provider", license: "MIT License", url: "http://bouncycastle.org",
licenseUrl: "http://bouncycastle.org/licence.html"),
new LibraryLicense(name: "Bouncy Castle", libraryName: "org.bouncycastle:bcpkix-jdk15on:1.56", license: "MIT License",
url: "http://bouncycastle.org", licenseUrl: "http://bouncycastle.org/licence.html"),
new LibraryLicense(name: "CGLib", libraryName: "CGLIB", license: "Apache", url: "http://cglib.sourceforge.net/",
licenseUrl: "http://www.apache.org/foundation/licence-FAQ.html"),
new LibraryLicense(name: "classworlds", libraryName: "Maven", transitiveDependency: true, version: "1.1", license: "codehaus",
@@ -189,13 +191,11 @@ 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",
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",
@@ -225,7 +225,7 @@ class CommunityLibraryLicenses {
url: "https://github.com/tonsky/FiraCode/blob/master/LICENSE"),
new LibraryLicense(name: "FreeMarker", attachedTo: "intellij.java.coverage", version: "2.3.15", license: "BSD",
url: "http://freemarker.sourceforge.net/"),
new LibraryLicense(name: "FreeMarker", libraryName: "freemarker", version: "2.3.20", license: "BSD",
new LibraryLicense(name: "FreeMarker", libraryName: "freemarker", license: "BSD",
url: "http://freemarker.sourceforge.net/"),
new LibraryLicense(name: "Gant", libraryName: "gant-groovy", license: "Apache 2.0",
@@ -255,6 +255,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"),
@@ -274,9 +276,9 @@ 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",
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/",
@@ -385,6 +387,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",
@@ -459,7 +462,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",
@@ -493,6 +496,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",
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+83 -40
View File
@@ -1,9 +1,11 @@
// 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.
package org.jetbrains.intellij.build
import com.google.common.io.Files
import groovy.transform.CompileStatic
import org.jetbrains.intellij.build.impl.PluginLayout
import org.jetbrains.intellij.build.python.PythonCommunityPluginModules
import org.jetbrains.jps.model.library.JpsOrderRootType
import static org.jetbrains.intellij.build.impl.PluginLayout.plugin
@@ -255,19 +257,26 @@ 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.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.propertyEditor", "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")
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")
@@ -275,64 +284,98 @@ class CommunityRepositoryModules {
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.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")
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.layoutlibLoader", "layoutlib-loader.jar")
withModuleLibrary("layoutlib", "intellij.android.layoutlib", "")
withModuleLibrary("precompiled-manifest-merger", "android.sdktools.manifest-merger", "")
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("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", "")
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", "")
withGeneratedResources(new ResourcesGenerator() {
@Override
// Sole purpose of this method is to rename resources-aar-<version>.jar into framework_res.jar and put it into lib/layoutlib/data
File generateResources(BuildContext context) {
def frameworkResJar = new File("$context.paths.temp/andorid-plugin/resources-aar/framework_res.jar")
List<File> files= context.project.libraryCollection
.findLibrary("org.jetbrains.intellij.deps.android.tools:resources-aar")
.getFiles(JpsOrderRootType.COMPILED)
assert files.size() == 1: "Exactly one file (resources-aar-<version>.jar) is expected"
assert files[0].name.endsWith(".jar") : "JAR file is expected, but ${files[0]} was found"
Files.createParentDirs(frameworkResJar)
Files.copy(files[0], frameworkResJar)
return frameworkResJar
}
}, "lib/layoutlib/data")
// FIXME-ank: add "analytics-publisher"?
additionalModulesToJars.entrySet().each {
withModule(it.key, it.value)
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+1 -1
View File
@@ -1163,13 +1163,13 @@ public class PluginManagerCore {
boolean parallel = SystemProperties.getBooleanProperty("parallel.pluginDescriptors.loading", true);
try (LoadDescriptorsContext context = new LoadDescriptorsContext(parallel)) {
loadDescriptorsFromClassPath(urlsFromClassPath, result, context, platformPluginURL);
loadDescriptorsFromDir(new File(PathManager.getPluginsPath()), result, false, context);
if (!isUnitTestMode) {
loadDescriptorsFromDir(new File(PathManager.getPreInstalledPluginsPath()), result, true, context);
}
loadDescriptorsFromProperty(result, context);
loadDescriptorsFromClassPath(urlsFromClassPath, result, context, platformPluginURL);
if (isUnitTestMode && result.size() <= 1) {
// We're running in unit test mode but the classpath doesn't contain any plugins; try to load bundled plugins anyway
platform/lang-api/src/com/intellij/build/output/BuildOutputInstantReader.java
+5
View File
@@ -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;
}
}
platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFocusManagerHeadless.java
+1 -1
View File
@@ -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
platform/platform-impl/src/com/intellij/ui/picker/MacColorPipette.java
+3 -1
View File
@@ -182,8 +182,10 @@ public class MacColorPipette extends ColorPipetteBase {
return captureScreen(null, new Rectangle(0, 0, 1, 1)) != null;
}
// TODO-ank: Screen capturing looks like self-contained feature and should be placed to separate class. Note that it is also used from
// com.android.tools.idea.ui.resourcechooser.colorpicker2.GraphicalColorPipette) to pick a color from any window on the screen
@Nullable
static BufferedImage captureScreen(@Nullable Window belowWindow, @NotNull Rectangle rect) {
public static BufferedImage captureScreen(@Nullable Window belowWindow, @NotNull Rectangle rect) {
ID pool = Foundation.invoke("NSAutoreleasePool", "new");
try {
ID windowId = belowWindow != null ? MacUtil.findWindowFromJavaWindow(belowWindow) : null;
plugins/maven/src/test/java/org/jetbrains/idea/maven/externalSystemIntegration/output/MavenBuildToolLogTestUtils.java
+1 -1
View File
@@ -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;
}