Skip to content

Commit ef13e8f

Browse files
goodwinnkgoodwinnk
committed
Prepare building plugins modules against 1.8 JDK
1 parent 24a54e2 commit ef13e8f

File tree

17 files changed

+17
-21
lines changed

17 files changed

+17
-21
lines changed

‎android-studio/android-studio.iml

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
<component name="NewModuleRootManager" inherit-compiler-output="true">
44
<exclude-output />
55
<content url="file://$MODULE_DIR$" />
6-
<orderEntry type="inheritedJdk" />
6+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
77
<orderEntry type="sourceFolder" forTests="false" />
88
<orderEntry type="library" scope="RUNTIME" name="android-studio" level="project" />
99
<orderEntry type="module" module-name="idea" scope="PROVIDED" />
1010
</component>
11-
</module>
12-
11+
</module>

‎idea-runner/idea-runner.iml

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
<content url="file://$MODULE_DIR$">
66
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
77
</content>
8-
<orderEntry type="inheritedJdk" />
8+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
99
<orderEntry type="sourceFolder" forTests="false" />
1010
<orderEntry type="library" name="idea-full" level="project" />
1111
<orderEntry type="module" module-name="idea" scope="PROVIDED" />
1212
</component>
13-
</module>
14-
13+
</module>

‎idea/idea-android/idea-android.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
77
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
88
</content>
9-
<orderEntry type="inheritedJdk" />
9+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1010
<orderEntry type="sourceFolder" forTests="false" />
1111
<orderEntry type="library" exported="" name="android-plugin" level="project" />
1212
<orderEntry type="library" name="gradle-and-groovy-plugin" level="project" />

‎idea/idea-completion/idea-completion.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
77
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
88
</content>
9-
<orderEntry type="inheritedJdk" />
9+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1010
<orderEntry type="sourceFolder" forTests="false" />
1111
<orderEntry type="module" module-name="descriptors" />
1212
<orderEntry type="module" module-name="idea-analysis" />

‎idea/idea-core/idea-core.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<content url="file://$MODULE_DIR$">
66
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
77
</content>
8-
<orderEntry type="inheritedJdk" />
8+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
99
<orderEntry type="sourceFolder" forTests="false" />
1010
<orderEntry type="module" module-name="descriptors" />
1111
<orderEntry type="library" name="idea-full" level="project" />

‎idea/idea-live-templates/idea-live-templates.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
77
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
88
</content>
9-
<orderEntry type="inheritedJdk" />
9+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1010
<orderEntry type="sourceFolder" forTests="false" />
1111
<orderEntry type="module" module-name="util" />
1212
<orderEntry type="module" module-name="idea-core" />

‎idea/idea-repl/idea-repl.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<content url="file://$MODULE_DIR$">
66
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
77
</content>
8-
<orderEntry type="inheritedJdk" />
8+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
99
<orderEntry type="library" name="idea-full" level="project" />
1010
<orderEntry type="module" module-name="frontend" />
1111
<orderEntry type="module" module-name="idea-analysis" />

‎idea/idea-test-framework/idea-test-framework.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<content url="file://$MODULE_DIR$">
66
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" />
77
</content>
8-
<orderEntry type="inheritedJdk" />
8+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
99
<orderEntry type="sourceFolder" forTests="false" />
1010
<orderEntry type="module" module-name="compiler-tests" />
1111
<orderEntry type="module" module-name="frontend" />

‎idea/idea.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
1616
<excludeFolder url="file://$MODULE_DIR$/testData/debugger/tinyApp/classes" />
1717
</content>
18-
<orderEntry type="inheritedJdk" />
18+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1919
<orderEntry type="sourceFolder" forTests="false" />
2020
<orderEntry type="module" module-name="backend" />
2121
<orderEntry type="module" module-name="frontend" />

‎j2k/j2k.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
77
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
88
</content>
9-
<orderEntry type="inheritedJdk" />
9+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1010
<orderEntry type="sourceFolder" forTests="false" />
1111
<orderEntry type="library" name="intellij-core" level="project" />
1212
<orderEntry type="module" module-name="frontend" />

‎jps-plugin/bare-plugin/bare-plugin.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<content url="file://$MODULE_DIR$">
66
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
77
</content>
8-
<orderEntry type="inheritedJdk" />
8+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
99
<orderEntry type="sourceFolder" forTests="false" />
1010
<orderEntry type="library" name="idea-full" level="project" />
1111
<orderEntry type="module" module-name="jps-plugin" />

‎jps-plugin/jps-plugin.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
77
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
88
</content>
9-
<orderEntry type="inheritedJdk" />
9+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1010
<orderEntry type="sourceFolder" forTests="false" />
1111
<orderEntry type="module" module-name="idea-jps-common" />
1212
<orderEntry type="module" module-name="cli-common" />

‎jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<content url="file://$MODULE_DIR$">
66
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
77
</content>
8-
<orderEntry type="inheritedJdk" />
8+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
99
<orderEntry type="sourceFolder" forTests="false" />
1010
<orderEntry type="module" module-name="build-common" scope="TEST" />
1111
<orderEntry type="module" module-name="jps-plugin" scope="TEST" />

‎plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<orderEntry type="module" module-name="frontend.java" exported="" />
1414
<orderEntry type="module" module-name="util" />
1515
<orderEntry type="module" module-name="backend" scope="PROVIDED" />
16-
<orderEntry type="library" scope="TEST" name="idea-full" level="project" />
1716
<orderEntry type="library" scope="TEST" name="jps-test" level="project" />
1817
<orderEntry type="module" module-name="compiler-tests" scope="TEST" />
1918
<orderEntry type="library" name="intellij-core" level="project" />

‎plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
77
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
88
</content>
9-
<orderEntry type="inheritedJdk" />
9+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1010
<orderEntry type="sourceFolder" forTests="false" />
1111
<orderEntry type="module" module-name="android-extensions-compiler" exported="" />
1212
<orderEntry type="module" module-name="idea-android" />

‎plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
77
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
88
</content>
9-
<orderEntry type="inheritedJdk" />
9+
<orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
1010
<orderEntry type="sourceFolder" forTests="false" />
1111
<orderEntry type="module" module-name="jps-plugin" scope="PROVIDED" />
1212
<orderEntry type="library" scope="PROVIDED" name="jps" level="project" />

‎plugins/annotation-collector/annotation-collector.iml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<orderEntry type="module" module-name="frontend.java" />
1616
<orderEntry type="module" module-name="compiler-tests" scope="TEST" />
1717
<orderEntry type="module" module-name="cli" />
18-
<orderEntry type="library" scope="TEST" name="idea-full" level="project" />
1918
<orderEntry type="module" module-name="light-classes" />
2019
</component>
2120
</module>

0 commit comments

Comments
 (0)