summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-11-12 12:50:22 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-11-12 12:50:22 +1000
commitb40153b72123f86b68399f067d3278cd117f525f (patch)
tree923746a1a278275ddbbc635aa31c7208004584da /src
parent44ae563d375ba462dff621d7e1c5abad1da825af (diff)
parent94d34cf05c3af5788226d4ec0eda82c542fb8044 (diff)
downloadscala-b40153b72123f86b68399f067d3278cd117f525f.tar.gz
scala-b40153b72123f86b68399f067d3278cd117f525f.tar.bz2
scala-b40153b72123f86b68399f067d3278cd117f525f.zip
Merge pull request #4840 from SethTisue/bump-intellij-project-jdk-version
for 2.12, bump JDK version (6 -> 8) in IntelliJ sample config
Diffstat (limited to 'src')
-rw-r--r--src/intellij/scala.ipr.SAMPLE2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/intellij/scala.ipr.SAMPLE b/src/intellij/scala.ipr.SAMPLE
index 3e6e074717..c4c6a2e44f 100644
--- a/src/intellij/scala.ipr.SAMPLE
+++ b/src/intellij/scala.ipr.SAMPLE
@@ -50,7 +50,7 @@
<module fileurl="file://$PROJECT_DIR$/test-junit.iml" filepath="$PROJECT_DIR$/test-junit.iml" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/../../out" />
</component>
<component name="ScalaCompilerConfiguration">