azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build output parser in separate module under 1.6 (KT-12159)

Browse Source 
KotlinOutputParser accessed from gradle execution environment that can be started under Java 1.6.

 #KT-12159 Fixed
This commit is contained in:
Nikolay Krasko
2016-06-14 12:45:55 +03:00
parent 7e38b93d80
commit 5e7d007e75
9 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/artifacts/KotlinPlugin.xml
Generated
+1
View File
@@ -38,6 +38,7 @@
<element id="module-output" name="ide-common" />
<element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
<element id="module-output" name="idea-android" />
<element id="module-output" name="idea-android-output-parser" />
<element id="module-output" name="js.serializer" />
<element id="module-output" name="serialization" />
<element id="module-output" name="idea-completion" />
.idea/modules.xml
Generated
+1
View File
@@ -41,6 +41,7 @@
<module fileurl="file://$PROJECT_DIR$/idea/idea.iml" filepath="$PROJECT_DIR$/idea/idea.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" filepath="$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-android/idea-android.iml" filepath="$PROJECT_DIR$/idea/idea-android/idea-android.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml" filepath="$PROJECT_DIR$/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-completion/idea-completion.iml" filepath="$PROJECT_DIR$/idea/idea-completion/idea-completion.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-core/idea-core.iml" filepath="$PROJECT_DIR$/idea/idea-core/idea-core.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" filepath="$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" group="ide" />
.idea/scopes/IDE.xml
Generated
+1 -1
View File
@@ -1,3 +1,3 @@
<component name="DependencyValidationManager">
<scope name="IDE" pattern="file[idea]:src/*/||file[idea]:testData/*/||file[ide-common]:src/*/||file[idea-analysis]:src/*/||file[idea-android]:src/*/||file[idea-completion]:src/*/||file[idea-completion]:testData/*/||file[idea-core]:src/*/||file[idea-jps-common]:/*/||file[idea-live-templates]:/*/||file[idea-live-templates]:testData/*/||file[idea-repl]:/*/" />
<scope name="IDE" pattern="file[idea]:src/*/||file[idea]:testData/*/||file[ide-common]:src/*/||file[idea-analysis]:src/*/||file[idea-android]:src/*/||file[idea-completion]:src/*/||file[idea-completion]:testData/*/||file[idea-core]:src/*/||file[idea-jps-common]:/*/||file[idea-live-templates]:/*/||file[idea-live-templates]:testData/*/||file[idea-repl]:/*/||src[idea-android-output-parser]:*..*" />
</component>
generators/generators.iml
+1
View File
@@ -37,6 +37,7 @@
<orderEntry type="module" module-name="build-common" scope="TEST" />
<orderEntry type="module" module-name="plugins-tests" scope="TEST" />
<orderEntry type="module" module-name="idea-android" scope="TEST" />
<orderEntry type="module" module-name="idea-android-output-parser" scope="TEST" />
<orderEntry type="module" module-name="idea-maven" scope="TEST" />
<orderEntry type="module" module-name="uast-kotlin" scope="TEST" />
</component>
idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="gradle-and-groovy-plugin" level="project" />
<orderEntry type="library" exported="" name="android-plugin" level="project" />
<orderEntry type="module" module-name="util" />
<orderEntry type="library" name="intellij-core" level="project" />
</component>
</module>
idea/idea-android/src/META-INF/services/com.android.ide.common.blame.parser.PatternAwareOutputParser → idea/idea-android/idea-android-output-parser/src/META-INF/services/com.android.ide.common.blame.parser.PatternAwareOutputParser
View File
idea/idea-android/src/org/jetbrains/kotlin/android/KotlinOutputParser.java → idea/idea-android/idea-android-output-parser/src/org/jetbrains/kotlin/android/KotlinOutputParser.java
View File
idea/idea-android/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt → idea/idea-android/idea-android-output-parser/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
* Copyright 2010-2016 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.
ultimate/.idea/libraries/main_project_production.xml
Generated
+2
View File
@@ -36,6 +36,7 @@
<root url="file://$PROJECT_DIR$/../out/production/idea" />
<root url="file://$PROJECT_DIR$/../out/production/idea-analysis" />
<root url="file://$PROJECT_DIR$/../out/production/idea-android" />
<root url="file://$PROJECT_DIR$/../out/production/idea-android-output-parser" />
<root url="file://$PROJECT_DIR$/../out/production/idea-completion" />
<root url="file://$PROJECT_DIR$/../out/production/idea-core" />
<root url="file://$PROJECT_DIR$/../out/production/idea-jps-common" />
@@ -90,6 +91,7 @@
<root url="file://$PROJECT_DIR$/../idea/ide-common/src" />
<root url="file://$PROJECT_DIR$/../idea/idea-analysis/src" />
<root url="file://$PROJECT_DIR$/../idea/idea-android/src" />
<root url="file://$PROJECT_DIR$/../idea/idea-android-output-parser/src" />
<root url="file://$PROJECT_DIR$/../idea/idea-completion/src" />
<root url="file://$PROJECT_DIR$/../idea/idea-core/src" />
<root url="file://$PROJECT_DIR$/../idea/idea-jps-common/src" />