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

KotlinOutputParser accessed from gradle execution environment that can be started under Java 1.6. #KT-12159 Fixed
JetBrains · Jun 14, 2016 · 5e7d007 · 5e7d007
1 parent 7e38b93
commit 5e7d007
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 2 deletions.
diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/IDE.xml b/.idea/scopes/IDE.xml
diff --git a/generators/generators.iml b/generators/generators.iml
@@ -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>

diff --git a/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml b/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml
@@ -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>
diff --git a/...mon.blame.parser.PatternAwareOutputParser → ...mon.blame.parser.PatternAwareOutputParser b/...mon.blame.parser.PatternAwareOutputParser → ...mon.blame.parser.PatternAwareOutputParser
diff --git a/...ns/kotlin/android/KotlinOutputParser.java → ...ns/kotlin/android/KotlinOutputParser.java b/...ns/kotlin/android/KotlinOutputParser.java → ...ns/kotlin/android/KotlinOutputParser.java
diff --git a/...otlin/android/KotlinOutputParserHelper.kt → ...otlin/android/KotlinOutputParserHelper.kt b/...otlin/android/KotlinOutputParserHelper.kt → ...otlin/android/KotlinOutputParserHelper.kt
@@ -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.

diff --git a/ultimate/.idea/libraries/main_project_production.xml b/ultimate/.idea/libraries/main_project_production.xml