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/merge-as-3.0'

Browse Source
This commit is contained in:
Dmitry Avdeev
2017-12-27 15:28:53 +03:00
parent 0055b859e0 84d8cc861c
commit d2defa3bd6
37 changed files with 9921 additions and 11052 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/jarRepositories.xml
Generated
+5
View File
@@ -21,5 +21,10 @@
<option name="name" value="JCenter on Bintray"/>
<option name="url" value="https://jcenter.bintray.com"/>
</remote-repository>
<remote-repository>
<option name="id" value="18c13506-e994-44b4-9eef-4e6ec3262e15" />
<option name="name" value="18c13506-e994-44b4-9eef-4e6ec3262e15" />
<option name="url" value="https://dl.google.com/dl/android/maven2" />
</remote-repository>
</component>
</project>
.idea/libraries/analytics_protos.xml
Generated
+11
View File
@@ -0,0 +1,11 @@
<component name="libraryTable">
<library name="analytics-protos" type="repository">
<properties maven-id="com.android.tools.analytics-library:protos:26.0.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/archive_patcher.xml
Generated
+11
View File
@@ -0,0 +1,11 @@
<component name="libraryTable">
<library name="archive-patcher">
<CLASSES>
<root url="jar://$PROJECT_DIR$/android/android/lib/explainer.jar!/" />
<root url="jar://$PROJECT_DIR$/android/android/lib/generator.jar!/" />
<root url="jar://$PROJECT_DIR$/android/android/lib/shared.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/baksmali.xml
Generated
+10
View File
@@ -0,0 +1,10 @@
<component name="libraryTable">
<library name="baksmali">
<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!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/com_android_tools_analytics_library_shared_26_0_0.xml
Generated
+10
View File
@@ -0,0 +1,10 @@
<component name="libraryTable">
<library name="com.android.tools.analytics-library:shared:26.0.0" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.analytics-library:shared:26.0.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/com_android_tools_analytics_library_tracker_26_0_0.xml
Generated
+10
View File
@@ -0,0 +1,10 @@
<component name="libraryTable">
<library name="com.android.tools.analytics-library:tracker:26.0.0" type="repository">
<properties include-transitive-deps="false" maven-id="com.android.tools.analytics-library:tracker:26.0.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/dexlib2.xml
Generated
+1 -2
View File
@@ -1,8 +1,7 @@
<component name="libraryTable">
<library name="dexlib2">
<CLASSES>
<root url="jar://$PROJECT_DIR$/android/android/lib/dexlib2-2.0.8-dev.jar!/" />
<root url="jar://$PROJECT_DIR$/android/android/lib/dexlib2-util-2.0.8-dev.jar!/" />
<root url="jar://$PROJECT_DIR$/android/android/lib/dexlib2-2.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/libraries/equalsverifier.xml
Generated
+10
View File
@@ -0,0 +1,10 @@
<component name="libraryTable">
<library name="equalsverifier" type="repository">
<properties maven-id="nl.jqno.equalsverifier:equalsverifier:2.1.5" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/nl/jqno/equalsverifier/equalsverifier/2.1.5/equalsverifier-2.1.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/fest_swing.xml
Generated
+2 -2
View File
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="fest-swing" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps:fest-swing:1.4.2" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps:fest-swing:1.4.3" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/fest-swing/1.4.2/fest-swing-1.4.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/fest-swing/1.4.3/fest-swing-1.4.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
.idea/libraries/google_analytics_library.xml
Generated
-9
View File
@@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="google-analytics-library">
<CLASSES>
<root url="jar://$PROJECT_DIR$/android/android/lib/google-analytics-library.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/javax_inject_javax_inject_1.xml
Generated
+12
View File
@@ -0,0 +1,12 @@
<component name="libraryTable">
<library name="javax.inject:javax.inject:1" type="repository">
<properties include-transitive-deps="false" maven-id="javax.inject:javax.inject:1" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/jogl_all.xml
Generated
-9
View File
@@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="jogl-all">
<CLASSES>
<root url="jar://$PROJECT_DIR$/android/android/lib/jogl-all.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
.idea/libraries/mockito_2.xml
Generated
+18
View File
@@ -0,0 +1,18 @@
<component name="libraryTable">
<library name="mockito-2" type="repository">
<properties maven-id="org.mockito:mockito-core:2.11.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.11.0/mockito-core-2.11.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.7.4/byte-buddy-1.7.4.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.7.4/byte-buddy-agent-1.7.4.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.11.0/mockito-core-2.11.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.7.4/byte-buddy-1.7.4-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.7.4/byte-buddy-agent-1.7.4-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/protobuf.xml
Generated
+3 -3
View File
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="protobuf" type="repository">
<properties maven-id="com.google.protobuf:protobuf-java:2.5.0" />
<properties maven-id="com.google.protobuf:protobuf-java:3.0.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/modules.xml
Generated
+16 -3
View File
@@ -17,9 +17,11 @@
<module fileurl="file://$PROJECT_DIR$/platform/analysis-api/analysis-api.iml" filepath="$PROJECT_DIR$/platform/analysis-api/analysis-api.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" filepath="$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/analytics-library/testing/analytics-testing.iml" filepath="$PROJECT_DIR$/android/tools-base/analytics-library/testing/analytics-testing.iml" group="android/sdktools" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/apkparser/analyzer/analyzer.iml" filepath="$PROJECT_DIR$/android/tools-base/apkparser/analyzer/analyzer.iml" group="android/sdktools" />
<module fileurl="file://$PROJECT_DIR$/android/android/android.iml" filepath="$PROJECT_DIR$/android/android/android.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/annotations/android-annotations.iml" filepath="$PROJECT_DIR$/android/tools-base/annotations/android-annotations.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/common/android-common.iml" filepath="$PROJECT_DIR$/android/common/android-common.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/android-common/android-common.iml" filepath="$PROJECT_DIR$/android/android-common/android-common.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/android-gradle-jps/android-gradle-jps.iml" filepath="$PROJECT_DIR$/android/android-gradle-jps/android-gradle-jps.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/jps-plugin/android-jps-plugin.iml" filepath="$PROJECT_DIR$/android/jps-plugin/android-jps-plugin.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/android-plugin/android-plugin.iml" filepath="$PROJECT_DIR$/android/android-plugin/android-plugin.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/rt/android-rt.iml" filepath="$PROJECT_DIR$/android/rt/android-rt.iml" group="android" />
@@ -33,12 +35,14 @@
<module fileurl="file://$PROJECT_DIR$/plugins/ant/jps-plugin/ant-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/ant/jps-plugin/ant-jps-plugin.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/jps/antLayout/antlayout.iml" filepath="$PROJECT_DIR$/jps/antLayout/antlayout.iml" group="jps" />
<module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/runtime/appEngine-runtime.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/runtime/appEngine-runtime.iml" group="plugins/GAE" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/asset-studio/assetstudio.iml" filepath="$PROJECT_DIR$/android/tools-base/asset-studio/assetstudio.iml" group="android/sdktools" />
<module fileurl="file://$PROJECT_DIR$/android/artwork/artwork.iml" filepath="$PROJECT_DIR$/android/artwork/artwork.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/apkparser/binary-resources/binary-resources.iml" filepath="$PROJECT_DIR$/android/tools-base/apkparser/binary-resources/binary-resources.iml" group="android/sdktools" />
<module fileurl="file://$PROJECT_DIR$/platform/boot/boot.iml" filepath="$PROJECT_DIR$/platform/boot/boot.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" filepath="$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" />
<module fileurl="file://$PROJECT_DIR$/android/build-common/build-common.iml" filepath="$PROJECT_DIR$/android/build-common/build-common.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/python/build/build-debug-binaries/build-debug-binaries.iml" filepath="$PROJECT_DIR$/python/build/build-debug-binaries/build-debug-binaries.iml" group="plugins/python" />
<module fileurl="file://$PROJECT_DIR$/platform/build-scripts/testFramework/buildScripts-testFramework.iml" filepath="$PROJECT_DIR$/platform/build-scripts/testFramework/buildScripts-testFramework.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/builder-model/builder-model.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/builder-model/builder-model.iml" group="android/sdktools" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/builder-test-api/builder-test-api.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/builder-test-api/builder-test-api.iml" group="android/sdktools" />
<module fileurl="file://$PROJECT_DIR$/platform/built-in-server/built-in-server.iml" filepath="$PROJECT_DIR$/platform/built-in-server/built-in-server.iml" group="platform" />
@@ -76,6 +80,7 @@
<module fileurl="file://$PROJECT_DIR$/java/debugger/openapi/debugger-openapi.iml" filepath="$PROJECT_DIR$/java/debugger/openapi/debugger-openapi.iml" group="java" />
<module fileurl="file://$PROJECT_DIR$/build/dependencies/dependencies.iml" filepath="$PROJECT_DIR$/build/dependencies/dependencies.iml" />
<module fileurl="file://$PROJECT_DIR$/android/designer/designer.iml" filepath="$PROJECT_DIR$/android/designer/designer.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/designer/designer-tests.iml" filepath="$PROJECT_DIR$/android/designer/designer-tests.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/plugins/devkit/devkit.iml" filepath="$PROJECT_DIR$/plugins/devkit/devkit.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/plugins/devkit/jps-plugin/devkit-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/devkit/jps-plugin/devkit-jps-plugin.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/plugins/devkit/devkit-kotlin-tests/devkit-kotlin-tests.iml" filepath="$PROJECT_DIR$/plugins/devkit/devkit-kotlin-tests/devkit-kotlin-tests.iml" group="plugins/devkit" />
@@ -102,6 +107,8 @@
<module fileurl="file://$PROJECT_DIR$/platform/external-system-api/external-system-api.iml" filepath="$PROJECT_DIR$/platform/external-system-api/external-system-api.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/external-system-impl/external-system-impl.iml" filepath="$PROJECT_DIR$/platform/external-system-impl/external-system-impl.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/external-system-rt/external-system-rt.iml" filepath="$PROJECT_DIR$/platform/external-system-rt/external-system-rt.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/fakeadbserver/fakeadbserver.iml" filepath="$PROJECT_DIR$/android/tools-base/fakeadbserver/fakeadbserver.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/flags/flags.iml" filepath="$PROJECT_DIR$/android/tools-base/flags/flags.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/java/compiler/forms-compiler/forms-compiler.iml" filepath="$PROJECT_DIR$/java/compiler/forms-compiler/forms-compiler.iml" group="java/compiler" />
<module fileurl="file://$PROJECT_DIR$/platform/forms_rt/forms_rt.iml" filepath="$PROJECT_DIR$/platform/forms_rt/forms_rt.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/plugins/git4idea/git4idea.iml" filepath="$PROJECT_DIR$/plugins/git4idea/git4idea.iml" group="plugins/VCS" />
@@ -145,6 +152,8 @@
<module fileurl="file://$PROJECT_DIR$/java/java-impl/java-impl.iml" filepath="$PROJECT_DIR$/java/java-impl/java-impl.iml" group="java" />
<module fileurl="file://$PROJECT_DIR$/java/java-indexing-api/java-indexing-api.iml" filepath="$PROJECT_DIR$/java/java-indexing-api/java-indexing-api.iml" group="java" />
<module fileurl="file://$PROJECT_DIR$/java/java-indexing-impl/java-indexing-impl.iml" filepath="$PROJECT_DIR$/java/java-indexing-impl/java-indexing-impl.iml" group="java" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/java-lib-plugin/java-lib-model/java-lib-model.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/java-lib-plugin/java-lib-model/java-lib-model.iml" group="android/sdktools" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/java-lib-plugin/java-lib-model-builder/java-lib-model-builder.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/java-lib-plugin/java-lib-model-builder/java-lib-model-builder.iml" group="android/sdktools" />
<module fileurl="file://$PROJECT_DIR$/java/java-psi-api/java-psi-api.iml" filepath="$PROJECT_DIR$/java/java-psi-api/java-psi-api.iml" group="java" />
<module fileurl="file://$PROJECT_DIR$/java/java-psi-impl/java-psi-impl.iml" filepath="$PROJECT_DIR$/java/java-psi-impl/java-psi-impl.iml" group="java" />
<module fileurl="file://$PROJECT_DIR$/java/java-runtime/java-runtime.iml" filepath="$PROJECT_DIR$/java/java-runtime/java-runtime.iml" group="java" />
@@ -182,6 +191,7 @@
<module fileurl="file://$PROJECT_DIR$/platform/lang-api/lang-api.iml" filepath="$PROJECT_DIR$/platform/lang-api/lang-api.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/lang-impl/lang-impl.iml" filepath="$PROJECT_DIR$/platform/lang-impl/lang-impl.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/lang-impl/lang-tests.iml" filepath="$PROJECT_DIR$/platform/lang-impl/lang-tests.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/layoutinspector/layoutinspector.iml" filepath="$PROJECT_DIR$/android/tools-base/layoutinspector/layoutinspector.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/layoutlib/layoutlib.iml" filepath="$PROJECT_DIR$/android/layoutlib/layoutlib.iml" group="android/sdktools" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/layoutlib-api/layoutlib-api.iml" filepath="$PROJECT_DIR$/android/tools-base/layoutlib-api/layoutlib-api.iml" group="android/sdktools" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/layoutlib-resources.iml" filepath="$PROJECT_DIR$/android/tools-base/layoutlib-resources.iml" group="android/sdktools" />
@@ -210,19 +220,20 @@
<module fileurl="file://$PROJECT_DIR$/android/tools-base/ninepatch/ninepatch.iml" filepath="$PROJECT_DIR$/android/tools-base/ninepatch/ninepatch.iml" group="android/sdktools" />
<module fileurl="file://$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/node-rpc-client.iml" filepath="$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/node-rpc-client.iml" group="plugins/JavaScript" />
<module fileurl="file://$PROJECT_DIR$/android/observable/observable.iml" filepath="$PROJECT_DIR$/android/observable/observable.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/observable-ui/observable-ui.iml" filepath="$PROJECT_DIR$/android/observable-ui/observable-ui.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/java/openapi/openapi.iml" filepath="$PROJECT_DIR$/java/openapi/openapi.iml" group="java" />
<module fileurl="file://$PROJECT_DIR$/android/perfd-host/perfd-host.iml" filepath="$PROJECT_DIR$/android/perfd-host/perfd-host.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/perflib/perflib.iml" filepath="$PROJECT_DIR$/android/tools-base/perflib/perflib.iml" group="android/sdktools" />
<module fileurl="file://$PROJECT_DIR$/android/tools-base/pixelprobe/pixelprobe.iml" filepath="$PROJECT_DIR$/android/tools-base/pixelprobe/pixelprobe.iml" group="android/sdktools" />
<module fileurl="file://$PROJECT_DIR$/platform/platform-api/platform-api.iml" filepath="$PROJECT_DIR$/platform/platform-api/platform-api.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/build-scripts/platform-build-scripts.iml" filepath="$PROJECT_DIR$/platform/build-scripts/platform-build-scripts.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/build-scripts/testFramework/buildScripts-testFramework.iml" filepath="$PROJECT_DIR$/platform/build-scripts/testFramework/buildScripts-testFramework.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/platform-impl/platform-impl.iml" filepath="$PROJECT_DIR$/platform/platform-impl/platform-impl.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/platform-main/platform-main.iml" filepath="$PROJECT_DIR$/platform/platform-main/platform-main.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/platform-resources/platform-resources.iml" filepath="$PROJECT_DIR$/platform/platform-resources/platform-resources.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/platform-resources-en/platform-resources-en.iml" filepath="$PROJECT_DIR$/platform/platform-resources-en/platform-resources-en.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/platform-tests/platform-tests.iml" filepath="$PROJECT_DIR$/platform/platform-tests/platform-tests.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/android/profilers/profilers.iml" filepath="$PROJECT_DIR$/android/profilers/profilers.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/profilers-android/profilers-android.iml" filepath="$PROJECT_DIR$/android/profilers-android/profilers-android.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/profilers-ui/profilers-ui.iml" filepath="$PROJECT_DIR$/android/profilers-ui/profilers-ui.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/platform/projectModel-api/projectModel-api.iml" filepath="$PROJECT_DIR$/platform/projectModel-api/projectModel-api.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/projectModel-impl/projectModel-impl.iml" filepath="$PROJECT_DIR$/platform/projectModel-impl/projectModel-impl.iml" group="platform" />
@@ -275,6 +286,7 @@
<module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/settings-repository-tests.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/settings-repository-tests.iml" group="plugins" />
<module fileurl="file://$PROJECT_DIR$/android/sherpa-ui/sherpa-ui.iml" filepath="$PROJECT_DIR$/android/sherpa-ui/sherpa-ui.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/platform/smRunner/smRunner.iml" filepath="$PROJECT_DIR$/platform/smRunner/smRunner.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/android/smali/smali.iml" filepath="$PROJECT_DIR$/android/smali/smali.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/plugins/cvs/smartcvs-src/smartcvs-src.iml" filepath="$PROJECT_DIR$/plugins/cvs/smartcvs-src/smartcvs-src.iml" group="plugins/VCS/cvs" />
<module fileurl="file://$PROJECT_DIR$/spellchecker/spellchecker.iml" filepath="$PROJECT_DIR$/spellchecker/spellchecker.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/stats-collector.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/stats-collector.iml" group="plugins/stats-collector" />
@@ -325,6 +337,7 @@
<module fileurl="file://$PROJECT_DIR$/platform/vcs-log/impl/vcs-log-impl.iml" filepath="$PROJECT_DIR$/platform/vcs-log/impl/vcs-log-impl.iml" group="platform/vcs-log" />
<module fileurl="file://$PROJECT_DIR$/platform/vcs-tests/vcs-tests.iml" filepath="$PROJECT_DIR$/platform/vcs-tests/vcs-tests.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/android/wizard/wizard.iml" filepath="$PROJECT_DIR$/android/wizard/wizard.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/android/wizard-model/wizard-model.iml" filepath="$PROJECT_DIR$/android/wizard-model/wizard-model.iml" group="android" />
<module fileurl="file://$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" filepath="$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" group="platform" />
<module fileurl="file://$PROJECT_DIR$/xml/impl/xml.iml" filepath="$PROJECT_DIR$/xml/impl/xml.iml" group="xml" />
build/dependencies/setupAndroidSdk.gradle
+12 -5
View File
@@ -32,14 +32,21 @@ import de.undercouch.gradle.tasks.download.Download
def currentOs = org.gradle.internal.os.OperatingSystem.current()
task downloadGradleDistribution(type: Download) {
src "http://repo.labs.intellij.net/thirdparty/gradle/gradle-3.3-bin.zip"
dest "$buildDir/android-sdk/tools/external/gradle/gradle-3.3-bin.zip"
src "http://repo.labs.intellij.net/thirdparty/gradle/gradle-4.1-bin.zip"
dest "$buildDir/android-sdk/tools/external/gradle/gradle-4.1-bin.zip"
onlyIfNewer true
onlyIf { inJetBrainsNetwork }
}
task downloadGradleDistribution2(type: Download) {
src "http://repo.labs.intellij.net/thirdparty/gradle/gradle-2.2.1-bin.zip"
dest "$buildDir/android-sdk/tools/external/gradle/gradle-2.2.1-bin.zip"
onlyIfNewer true
onlyIf { inJetBrainsNetwork }
}
task downloadOfflineRepo(type: Download) {
src "http://repo.labs.intellij.net/thirdparty/android-sdk/offline_repo_repo_04.zip"
src "http://repo.labs.intellij.net/thirdparty/android-sdk/offline_repo_repo_3_0_03.zip"
dest "$buildDir/android-sdk/offline_repo_repo.zip"
onlyIfNewer true
onlyIf { inJetBrainsNetwork }
@@ -52,13 +59,13 @@ task setupOfflineRepo(dependsOn: downloadOfflineRepo, type: Copy) {
task downloadAndroidSdk(type: Download) {
def osFamily = currentOs.familyName
src "http://repo.labs.intellij.net/thirdparty/android-sdk/${osFamily}.zip"
src "http://repo.labs.intellij.net/thirdparty/android-sdk/${osFamily}_3_0.zip"
dest "$buildDir/android-sdk/${osFamily}.zip"
onlyIfNewer true
onlyIf { !currentOs.isMacOsX() && inJetBrainsNetwork }
}
task setupAndroidSdk(dependsOn: [downloadAndroidSdk, downloadGradleDistribution, setupOfflineRepo], type: Copy) {
task setupAndroidSdk(dependsOn: [downloadAndroidSdk, downloadGradleDistribution, downloadGradleDistribution2, setupOfflineRepo], type: Copy) {
from zipTree(downloadAndroidSdk.outputs.files.singleFile)
into "$buildDir/android-sdk/prebuilts/studio/sdk"
onlyIf { !currentOs.isMacOsX() }
build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
+1 -1
View File
@@ -42,7 +42,7 @@ abstract class BaseIdeaProperties extends ProductProperties {
"git4idea", "remote-servers-git", "remote-servers-git-java", "svn4idea", "hg4idea", "github", "cvs-plugin",
"jetgroovy", "junit", "testng", "xpath", "xslt-debugger", "android-plugin", "javaFX-CE",
"java-i18n", "ant", "ui-designer", "ByteCodeViewer", "coverage", "java-decompiler-plugin", "devkit", "eclipse",
"IntelliLang", "IntelliLang-java", "IntelliLang-xml", "intellilang-jps-plugin", "stream-debugger"
"IntelliLang", "IntelliLang-java", "IntelliLang-xml", "intellilang-jps-plugin", "stream-debugger", "smali"
]
BaseIdeaProperties() {
build/lib/jps/aether-dependency-resolver.jar
BIN
View File
Binary file not shown.
build/lib/jps/antlayout.jar
BIN
View File
Binary file not shown.
build/lib/jps/groovy-jps-plugin.jar
BIN
View File
Binary file not shown.
build/lib/jps/groovy-rt-constants.jar
BIN
View File
Binary file not shown.
build/lib/jps/groovy_rt.jar
BIN
View File
Binary file not shown.
build/lib/jps/jps-builders-6.jar
BIN
View File
Binary file not shown.
build/lib/jps/jps-builders.jar
BIN
View File
Binary file not shown.
build/lib/jps/jps-model.jar
BIN
View File
Binary file not shown.
build/lib/jps/ui-designer-jps-plugin.jar
BIN
View File
Binary file not shown.
build/lib/jps/util.jar
BIN
View File
Binary file not shown.
community-main.iml
+8 -8
View File
@@ -5,11 +5,11 @@
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="annotations" />
<orderEntry type="module" module-name="android" />
<orderEntry type="module" module-name="ant" />
<orderEntry type="module" module-name="boot" />
<orderEntry type="module" module-name="bootstrap" />
<orderEntry type="module" module-name="commander" />
<orderEntry type="module" module-name="annotations" />
<orderEntry type="module" module-name="compiler-impl" />
<orderEntry type="module" module-name="compiler-openapi" />
<orderEntry type="module" module-name="debugger-impl" />
@@ -26,7 +26,7 @@
<orderEntry type="module" module-name="idea-ui" />
<orderEntry type="module" module-name="java-impl" />
<orderEntry type="module" module-name="java-runtime" />
<orderEntry type="module" module-name="jsp-base-openapi" />
<orderEntry type="module" module-name="commander" />
<orderEntry type="module" module-name="jsp-openapi" />
<orderEntry type="module" module-name="jsp-spi" />
<orderEntry type="module" module-name="lang-api" />
@@ -44,7 +44,7 @@
<orderEntry type="module" module-name="resources" />
<orderEntry type="module" module-name="resources-en" />
<orderEntry type="module" module-name="spellchecker" />
<orderEntry type="module" module-name="testFramework" />
<orderEntry type="module" module-name="jsp-base-openapi" />
<orderEntry type="module" module-name="testFramework-java" />
<orderEntry type="module" module-name="testRunner" />
<orderEntry type="module" module-name="usageView" />
@@ -59,7 +59,7 @@
<orderEntry type="module" module-name="java-tests" scope="TEST" />
<orderEntry type="module" module-name="copyright" />
<orderEntry type="module" module-name="cvs-plugin" />
<orderEntry type="module" module-name="java-i18n" />
<orderEntry type="module" module-name="testFramework" />
<orderEntry type="module" module-name="ui-designer" />
<orderEntry type="module" module-name="devkit" />
<orderEntry type="module" module-name="eclipse" />
@@ -77,7 +77,7 @@
<orderEntry type="module" module-name="xpath" />
<orderEntry type="module" module-name="xslt-debugger" />
<orderEntry type="module" module-name="xslt-debugger-engine" />
<orderEntry type="module" module-name="tasks-core" />
<orderEntry type="module" module-name="java-i18n" />
<orderEntry type="module" module-name="tasks-api" />
<orderEntry type="module" module-name="tasks-java" />
<orderEntry type="module" module-name="tasks-tests" scope="TEST" />
@@ -95,7 +95,7 @@
<orderEntry type="module" module-name="yaml" />
<orderEntry type="module" module-name="xml-tests" scope="TEST" />
<orderEntry type="module" module-name="devkit-jps-plugin" scope="TEST" />
<orderEntry type="module" module-name="jps-model-tests" scope="TEST" />
<orderEntry type="module" module-name="tasks-core" />
<orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
<orderEntry type="module" module-name="ui-designer-jps-plugin" scope="TEST" />
<orderEntry type="module" module-name="ui-designer-jps-plugin" scope="TEST" />
@@ -109,7 +109,7 @@
<orderEntry type="module" module-name="json-tests" scope="TEST" />
<orderEntry type="module" module-name="typeMigration" />
<orderEntry type="module" module-name="platform-tests" scope="TEST" />
<orderEntry type="module" module-name="android" />
<orderEntry type="module" module-name="jps-model-tests" scope="TEST" />
<orderEntry type="module" module-name="diff-tests" scope="TEST" />
<orderEntry type="module" module-name="built-in-server-tests" scope="TEST" />
<orderEntry type="module" module-name="updater" scope="TEST" />
java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaModuleFixtureBuilderImpl.java
+1 -2
View File
@@ -40,7 +40,6 @@ import com.intellij.testFramework.fixtures.IdeaProjectTestFixture;
import com.intellij.testFramework.fixtures.ModuleFixture;
import com.intellij.testFramework.fixtures.TestFixtureBuilder;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.NonNls;
import java.io.File;
@@ -52,7 +51,7 @@ import java.util.Map;
/**
* @author mike
*/
abstract class JavaModuleFixtureBuilderImpl<T extends ModuleFixture> extends ModuleFixtureBuilderImpl<T> implements JavaModuleFixtureBuilder<T> {
public abstract class JavaModuleFixtureBuilderImpl<T extends ModuleFixture> extends ModuleFixtureBuilderImpl<T> implements JavaModuleFixtureBuilder<T> {
private final List<Lib> myLibraries = new ArrayList<>();
private String myJdk;
private MockJdkLevel myMockJdkLevel = MockJdkLevel.jdk14;
jps/jps-builders-6/src/org/jetbrains/jps/javac/JavacRemoteProto.java
+3906 -4327
View File
File diff suppressed because it is too large Load Diff
jps/jps-builders/src/org/jetbrains/jps/api/CmdlineRemoteProto.java
+5757 -6630
View File
File diff suppressed because it is too large Load Diff
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+6 -4
View File
@@ -27,6 +27,12 @@ class CommunityLibraryLicenses {
new LibraryLicense(name: "Android SDK Tools", libraryName: "android-sdk-tools", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Analytics", libraryName: "google-analytics-library", 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 Analytics Shared", libraryName: "com.android.tools.analytics-library:shared:26.0.0", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Analytics Tracker", libraryName: "com.android.tools.analytics-library:tracker:26.0.0", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Analytics Protos", libraryName: "analytics-protos", 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 Archive Patcher", libraryName: "archive-patcher", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Aia Manifest Proto", libraryName: "aia-manifest-proto-1.0-jarjar.jar", 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 DEX library", libraryName: "dexlib2", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Sherpa library", libraryName: "sherpa-solver", license: "Apache 2.0", url: "http://source.android.com/"),
@@ -119,8 +125,6 @@ class CommunityLibraryLicenses {
url: "https://github.com/codehaus/gant", licenseUrl: "https://github.com/codehaus/gant/blob/master/LICENCE.txt"),
new LibraryLicense(name: "Gherkin", libraryName: "Gherkin", version: "2.12.2", license: "MIT",
licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://github.com/cucumber/gherkin"),
new LibraryLicense(name: "Gluegen", libraryName: "gluegen-rt", license: "Creative Commons Attribution License",
url: "https://jogamp.org/gluegen/www/", licenseUrl: "http://creativecommons.org/licenses/by/3.0"),
new LibraryLicense(name: "Google Feedback", libraryName: "GoogleFeedback.jar", version: "", license: "TBD"),
new LibraryLicense(name: "Gradle", version: "4.4", license: "Apache 2.0", url: "http://gradle.org/",
licenseUrl: "http://gradle.org/license"),
@@ -188,8 +192,6 @@ class CommunityLibraryLicenses {
new LibraryLicense(name: "jsch-agent-proxy", libraryName: "jsch-agent-proxy", version: "0.0.9", license: "BSD",
url: "https://github.com/ymnk/jsch-agent-proxy",
licenseUrl: "https://github.com/ymnk/jsch-agent-proxy/blob/master/LICENSE.txt"),
new LibraryLicense(name: "JOGL", libraryName: "jogl-all", license: "Creative Commons Attribution License",
url: "https://jogamp.org/jogl/www/", licenseUrl: "http://creativecommons.org/licenses/by/3.0"),
new LibraryLicense(name: "JSch", libraryName: "JSch", version: "0.1.53", license: "BSD", url: "http://www.jcraft.com/jsch/",
licenseUrl: "http://www.jcraft.com/jsch/LICENSE.txt"),
new LibraryLicense(name: "JSON", libraryName: "json.jar", license: "JSON License", licenseUrl: "http://www.json.org/license.html",
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+65 -45
View File
@@ -214,79 +214,99 @@ class CommunityRepositoryModules {
withResource("resources/jediterm-bash.in", "")
withResource("resources/fish/config.fish", "fish")
},
PythonCommunityPluginModules.pythonCommunityPluginLayout()
PythonCommunityPluginModules.pythonCommunityPluginLayout(),
// required for android plugin
plugin("smali") {
withModule("smali")
}
]
static PluginLayout androidPlugin(Map<String, String> additionalModulesToJars) {
// the following is copied from https://android.googlesource.com/platform/tools/idea/+/studio-master-dev/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy
plugin("android-plugin") {
mainJarName = "android.jar"
directoryName = "android"
withModule("android", "android.jar")
mainJarName = "android.jar"
withModule("android-common", "android-common.jar", false)
withModule("build-common", "build-common.jar", false)
withModule("android-rt", "android-rt.jar", false)
withModule("android", "android.jar", false)
withModule("artwork")
withModule("observable", "android.jar")
withModule("wizard", "android.jar")
withModule("sdk-updates", "android.jar")
withModule("observable-ui", "android.jar")
withModule("flags", "android.jar")
withModule("designer", "android.jar")
withModule("manifest-merger")
withModule("sdk-updates", "android.jar")
withModule("wizard", "android.jar")
withModule("wizard-model", "android.jar")
withModule("profilers-android", "android.jar")
withModule("perfd-host", "android-profilers.jar")
withModule("profilers", "android-profilers.jar")
withModule("profilers-ui", "android-profilers.jar")
withModule("adt-ui", "adt-ui.jar")
withModule("adt-ui-model", "adt-ui.jar")
withModule("repository")
withModule("common", "android-common.jar")
withModule("android-common", "android-common.jar", null)
withModule("android-rt", "android-rt.jar", null)
withModule("android-annotations", "androidAnnotations.jar")
withModule("sherpa-ui", "constraint-layout.jar")
withModule("sdklib", "sdklib.jar")
withModule("sdk-common", "sdk-common.jar")
withModule("layoutlib-api", "layoutlib-api.jar")
withModule("layoutlib", "layoutlib-loader.jar")
withModule("adt-ui", "adt-ui.jar")
withModule("adt-ui-model", "adt-ui.jar")
withModule("sherpa-ui", "constraint-layout.jar")
withModule("pixelprobe", "pixalprobe.jar")
withModule("manifest-merger", "manifest-merger.jar")
withModule("assetstudio", "sdk-tools.jar")
withModule("chunkio", "pixelprobe.jar")
withModule("pixelprobe", "pixelprobe.jar")
withModule("binary-resources", "sdk-tools.jar")
withModule("analyzer", "sdk-tools.jar")
withModule("ddmlib", "sdk-tools.jar")
withModule("dvlib", "sdk-tools.jar")
withModule("draw9patch", "sdk-tools.jar")
withModule("instant-run-client", "sdk-tools.jar")
withModule("instant-run-common", "sdk-tools.jar")
withModule("lint-api", "sdk-tools.jar")
withModule("lint-checks", "sdk-tools.jar")
withModule("ninepatch", "sdk-tools.jar")
withModule("perflib", "sdk-tools.jar")
withModule("builder-model", "sdk-tools.jar")
withModule("builder-test-api", "sdk-tools.jar")
withModule("instant-run-common", "sdk-tools.jar")
withModule("instant-run-client", "sdk-tools.jar")
withModule("instant-run-runtime", "sdk-tools.jar")
withModule("android-jps-plugin", "jps/android-jps-plugin.jar", null)
withModule("android-annotations", "sdk-tools.jar")
withModule("layoutinspector", "sdk-tools.jar")
withJpsModule("android-gradle-jps")
withJpsModule("android-jps-plugin")
withProjectLibrary("freemarker-2.3.20") //todo[nik] move to module libraries
withProjectLibrary("jgraphx-3.4.0.1") //todo[nik] move to module libraries
withProjectLibrary("kxml2") //todo[nik] move to module libraries
withProjectLibrary("lombok-ast") //todo[nik] move to module libraries
withProjectLibrary("layoutlib") //todo[nik] move to module libraries
withResource("../android/device-art-resources", "lib/device-art-resources")
withResourceFromModule("layoutlib-resources", ".", "lib/layoutlib")
withResourceFromModule("sdklib", "../templates", "lib/templates")
withResourceFromModule("android","lib/antlr4-runtime-4.5.3.jar", "lib")
withResourceFromModule("android","lib/asm-5.0.3.jar", "lib")
withResourceFromModule("android","lib/asm-analysis-5.0.3.jar", "lib")
withResourceFromModule("android","lib/asm-tree-5.0.3.jar", "lib")
withResourceFromModule("android","lib/commons-io-2.4.jar", "lib")
withResourceFromModule("android","lib/commons-compress-1.8.1.jar", "lib")
withResourceFromModule("android","lib/javawriter-2.2.1.jar", "lib")
withResourceFromModule("android","lib/juniversalchardet-1.0.3.jar", "lib")
withResourceFromModule("android","lib/androidWidgets", "lib/androidWidgets")
withResourceFromModule("artwork","resources/device-art-resources", "lib/device-art-resources")
withResourceFromModule("android","lib/sampleData", "lib/sampleData")
withResourceArchive("../android/annotations", "lib/androidAnnotations.jar")
withResource("../android/lib/antlr4-runtime-4.5.3.jar", "lib")
withResource("../android/lib/asm-5.0.3.jar", "lib")
withResource("../android/lib/asm-analysis-5.0.3.jar", "lib")
withResource("../android/lib/asm-tree-5.0.3.jar", "lib")
withResource("../android/lib/commons-io-2.4.jar", "lib")
withResource("../android/lib/commons-compress-1.8.1.jar", "lib")
withResource("../android/lib/javawriter-2.2.1.jar", "lib")
withResource("../android/lib/juniversalchardet-1.0.3.jar", "lib")
withResource("../android/lib/layoutlib.jar", "lib")
withResource("../android/lib/google-analytics-library.jar", "lib")
withResource("../android/lib/gluegen-rt.jar", "lib")
withResource("../android/lib/gluegen-rt-natives-linux-amd64.jar", "lib")
withResource("../android/lib/gluegen-rt-natives-linux-i586.jar", "lib")
withResource("../android/lib/gluegen-rt-natives-macosx-universal.jar", "lib")
withResource("../android/lib/gluegen-rt-natives-windows-amd64.jar", "lib")
withResource("../android/lib/gluegen-rt-natives-windows-i586.jar", "lib")
withProjectLibrary("jogl-all") //todo[nik] move to module libraries
withResource("../android/lib/jogl-all-natives-linux-amd64.jar", "lib")
withResource("../android/lib/jogl-all-natives-linux-i586.jar", "lib")
withResource("../android/lib/jogl-all-natives-macosx-universal.jar", "lib")
withResource("../android/lib/jogl-all-natives-windows-amd64.jar", "lib")
withResource("../android/lib/jogl-all-natives-windows-i586.jar", "lib")
withResource("../android/lib/androidWidgets", "lib/androidWidgets")
// here go some differences from original Android Studio layout
withResourceFromModule("layoutlib-resources", ".", "lib/layoutlib") // todo replace this with runtime downloading
withResourceFromModule("sdklib", "../templates", "lib/templates")
// we put it to plugin instead of ide in original Android Studio layout
withModule("common", "android-base-common.jar")
withProjectLibrary("studio-profiler-grpc-1.0-jarjar")
withProjectLibrary("archive-patcher")
withProjectLibrary("com.android.tools.analytics-library:shared:26.0.0")
withProjectLibrary("com.android.tools.analytics-library:tracker:26.0.0")
withProjectLibrary("analytics-protos")
additionalModulesToJars.entrySet().each {
withModule(it.key, it.value)
}
platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java
+2
View File
@@ -78,6 +78,7 @@ import com.intellij.openapi.externalSystem.settings.ExternalProjectSettings;
import com.intellij.openapi.externalSystem.task.TaskCallback;
import com.intellij.openapi.externalSystem.view.ExternalProjectsView;
import com.intellij.openapi.externalSystem.view.ExternalProjectsViewImpl;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.progress.EmptyProgressIndicator;
import com.intellij.openapi.progress.PerformInBackgroundOption;
@@ -588,6 +589,7 @@ public class ExternalSystemUtil {
};
TransactionGuard.getInstance().assertWriteSafeContext(ModalityState.defaultModalityState());
ApplicationManager.getApplication().invokeAndWait(FileDocumentManager.getInstance()::saveAllDocuments);
final String title;
switch (progressExecutionMode) {
platform/lang-impl/src/com/intellij/codeInspection/ui/util/SynchronizedBidiMultiMap.java
+4
View File
@@ -6,6 +6,7 @@ package com.intellij.codeInspection.ui.util;
import com.intellij.util.ArrayFactory;
import com.intellij.util.ArrayUtil;
import gnu.trove.THashMap;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
@@ -91,6 +92,9 @@ public abstract class SynchronizedBidiMultiMap<K, V> {
return myValue2Keys.isEmpty();
}
@TestOnly
public Map<K, V[]> getMap() { return myKey2Values; }
@NotNull
protected abstract ArrayFactory<V> arrayFactory();
}
platform/testFramework/testSrc/tests/testGroups.properties
+38
View File
@@ -25,6 +25,25 @@ org.jetbrains.android.*
-com.android.ide.common.util.ReadWriteThreadLockTest
-com.android.tools.idea.templates.TemplateTest
-com.android.tools.idea.testartifacts.*
-com.android.tools.adtui.*
-com.android.ide.common.caching.CreatingCacheTest
-org.jetbrains.android.actions.CreateMultiRootResourceFileActionTest
-com.android.tools.apk.analyzer.*
-com.android.tools.idea.naveditor.*
-com.android.tools.idea.uibuilder.property.*
-com.android.tools.idea.explorer.DeviceExplorerControllerTest
-com.android.tools.idea.gradle.project.sync.GradleSyncIntegrationTest
-org.jetbrains.android.databinding.GeneratedCodeMatchTest
-org.jetbrains.android.databinding.DataBindingScopeTest
-com.android.tools.idea.instantapp.MultiFeatureSupportTest
-com.android.tools.idea.gradle.project.build.invoker.BuildActionInvokerTest
-com.android.tools.idea.refactoring.modularize.AndroidModularizeGradleTest
-com.android.tools.idea.instantapp.InstantAppSupportTest
-com.android.tools.idea.gradle.project.build.GradleBuildStateIntegrationTest
-com.android.tools.idea.testartifacts.junit.AndroidJUnitClasspathTest
-com.android.tools.idea.actions.ExportProjectZipTest
-com.android.tools.idea.common.model.NlModelTest
[ANDROID_BOMBED]
com.android.ide.common.util.ReadWriteProcessLockTest
@@ -32,6 +51,25 @@ com.android.ide.common.util.ReadWriteThreadLockTest
com.android.tools.idea.templates.TemplateTest
com.android.tools.idea.testartifacts.*
org.jetbrains.jps.android.*
com.android.tools.adtui.*
com.android.ide.common.caching.CreatingCacheTest
org.jetbrains.android.actions.CreateMultiRootResourceFileActionTest
com.android.tools.apk.analyzer.*
com.android.tools.idea.naveditor.*
com.android.tools.idea.uibuilder.property.*
com.android.tools.idea.explorer.DeviceExplorerControllerTest
com.android.tools.idea.gradle.project.sync.GradleSyncIntegrationTest
org.jetbrains.android.databinding.GeneratedCodeMatchTest
org.jetbrains.android.databinding.DataBindingScopeTest
com.android.tools.idea.instantapp.MultiFeatureSupportTest
com.android.tools.idea.gradle.project.build.invoker.BuildActionInvokerTest
com.android.tools.idea.refactoring.modularize.AndroidModularizeGradleTest
com.android.tools.idea.instantapp.InstantAppSupportTest
com.android.tools.idea.gradle.project.build.GradleBuildStateIntegrationTest
com.android.tools.idea.testartifacts.junit.AndroidJUnitClasspathTest
com.android.tools.idea.actions.ExportProjectZipTest
com.android.tools.idea.common.model.NlModelTest
[GRADLE_INTEGRATION_TESTS]
org.jetbrains.plugins.gradle.importing.*
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+2 -2
View File
@@ -472,19 +472,19 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
moduleData.setInheritProjectCompileOutputPath(inheritOutputDirs);
}
private void excludeOutDir(@NotNull DataNode<ModuleData> ideModule, File ideaOutDir) {
private static void excludeOutDir(@NotNull DataNode<ModuleData> ideModule, File ideaOutDir) {
ContentRootData excludedContentRootData;
DataNode<ContentRootData> contentRootDataDataNode = ExternalSystemApiUtil.find(ideModule, ProjectKeys.CONTENT_ROOT);
if (contentRootDataDataNode == null ||
!FileUtil.isAncestor(new File(contentRootDataDataNode.getData().getRootPath()), ideaOutDir, false)) {
excludedContentRootData = new ContentRootData(GradleConstants.SYSTEM_ID, ideaOutDir.getAbsolutePath());
ideModule.createChild(ProjectKeys.CONTENT_ROOT, excludedContentRootData);
}
else {
excludedContentRootData = contentRootDataDataNode.getData();
}
excludedContentRootData.storePath(ExternalSystemSourceType.EXCLUDED, ideaOutDir.getAbsolutePath());
ideModule.createChild(ProjectKeys.CONTENT_ROOT, excludedContentRootData);
}
@Nullable