Skip to content

Commit

Permalink
IntelliJ IDEA files for version 14
Browse files Browse the repository at this point in the history
The latest version of the Scala plugin for IntelliJ IDEA introduces
a new project structure

http://blog.jetbrains.com/scala/2014/10/30/scala-plugin-update-for-intellij-idea-14-rc-is-out/

Due to a bug (https://youtrack.jetbrains.com/issue/SCL-7753), you
currently need to install the latest nightly build from here:
http://confluence.jetbrains.com/display/SCA/Scala+Plugin+Nightly+Builds+for+Cassiopeia

The new format doesn't allow scala compiler options per-module, so
the `-sourcepath src/libarary` is used for all modules.
  • Loading branch information
lrytz committed Nov 3, 2014
1 parent d1a76d5 commit 479ae8c
Show file tree
Hide file tree
Showing 22 changed files with 564 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .gitignore
Expand Up @@ -39,9 +39,9 @@
# eclipse, intellij
/.classpath
/.project
/src/intellij/*.iml
/src/intellij/*.ipr
/src/intellij/*.iws
/src/intellij*/*.iml
/src/intellij*/*.ipr
/src/intellij*/*.iws
**/.cache
/.idea
/.settings
Expand Down
12 changes: 12 additions & 0 deletions src/intellij-14/README
@@ -0,0 +1,12 @@
Use the latest IntelliJ IDEA release and install the Scala plugin from within the IDE.

Compilation withing IDEA is performed in "-Dlocker.skip=1" mode: the sources are built
directly using the STARR compiler.

The following steps are required to use IntelliJ IDEA on Scala trunk
- Run "ant init". This will download some JARs from to ./build/deps, which are
included in IntelliJ's classpath.
- Run src/intellij-14/setup.sh
- Open ./src/intellij-14/scala.ipr in IntelliJ
- File, Project Settings, Project, SDK. Create an SDK entry named "1.6" containing the
Java 1.6 SDK
14 changes: 14 additions & 0 deletions src/intellij-14/actors.iml.SAMPLE
@@ -0,0 +1,14 @@
<?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$/../actors">
<sourceFolder url="file://$MODULE_DIR$/../actors" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="forkjoin" />
<orderEntry type="module" module-name="library" />
<orderEntry type="library" name="starr-no-deps" level="project" />
</component>
</module>
12 changes: 12 additions & 0 deletions src/intellij-14/asm.iml.SAMPLE
@@ -0,0 +1,12 @@
<?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$/../asm">
<sourceFolder url="file://$MODULE_DIR$/../asm/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../asm" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
16 changes: 16 additions & 0 deletions src/intellij-14/compiler.iml.SAMPLE
@@ -0,0 +1,16 @@
<?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$/../compiler">
<sourceFolder url="file://$MODULE_DIR$/../compiler" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="asm" />
<orderEntry type="module" module-name="library" />
<orderEntry type="module" module-name="reflect" />
<orderEntry type="library" name="ant" level="project" />
<orderEntry type="library" name="starr-no-deps" level="project" />
</component>
</module>
8 changes: 8 additions & 0 deletions src/intellij-14/diff.sh
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
#
# Diffs the SAMPLE files against the working project config.
#
export SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
for f in "$SCRIPT_DIR"/*.{iml,ipr}; do
echo $f; diff -u $f.SAMPLE $f;
done
11 changes: 11 additions & 0 deletions src/intellij-14/forkjoin.iml.SAMPLE
@@ -0,0 +1,11 @@
<?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$/../forkjoin">
<sourceFolder url="file://$MODULE_DIR$/../forkjoin" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
16 changes: 16 additions & 0 deletions src/intellij-14/interactive.iml.SAMPLE
@@ -0,0 +1,16 @@
<?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$/../interactive">
<sourceFolder url="file://$MODULE_DIR$/../interactive" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="compiler" />
<orderEntry type="module" module-name="library" />
<orderEntry type="module" module-name="reflect" />
<orderEntry type="module" module-name="scaladoc" />
<orderEntry type="library" name="starr-no-deps" level="project" />
</component>
</module>
13 changes: 13 additions & 0 deletions src/intellij-14/library.iml.SAMPLE
@@ -0,0 +1,13 @@
<?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$/../library">
<sourceFolder url="file://$MODULE_DIR$/../library" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="forkjoin" />
<orderEntry type="library" name="starr-no-deps" level="project" />
</component>
</module>
15 changes: 15 additions & 0 deletions src/intellij-14/manual.iml.SAMPLE
@@ -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$/../manual">
<sourceFolder url="file://$MODULE_DIR$/../manual" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="library" />
<orderEntry type="library" name="ant" level="project" />
<orderEntry type="library" name="scaladoc-deps" level="project" />
<orderEntry type="library" name="starr-no-deps" level="project" />
</component>
</module>
18 changes: 18 additions & 0 deletions src/intellij-14/partest-extras.iml.SAMPLE
@@ -0,0 +1,18 @@
<?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$/../partest-extras">
<sourceFolder url="file://$MODULE_DIR$/../partest-extras" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="asm" />
<orderEntry type="module" module-name="compiler" />
<orderEntry type="module" module-name="library" />
<orderEntry type="module" module-name="reflect" />
<orderEntry type="module" module-name="repl" />
<orderEntry type="library" name="partest" level="project" />
<orderEntry type="library" name="starr-no-deps" level="project" />
</component>
</module>
13 changes: 13 additions & 0 deletions src/intellij-14/partest-javaagent.iml.SAMPLE
@@ -0,0 +1,13 @@
<?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$/../partest-javaagent">
<sourceFolder url="file://$MODULE_DIR$/../partest-javaagent" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="asm" />
<orderEntry type="library" name="starr-no-deps" level="project" />
</component>
</module>
13 changes: 13 additions & 0 deletions src/intellij-14/reflect.iml.SAMPLE
@@ -0,0 +1,13 @@
<?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$/../reflect">
<sourceFolder url="file://$MODULE_DIR$/../reflect" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="library" />
<orderEntry type="library" name="starr-no-deps" level="project" />
</component>
</module>
16 changes: 16 additions & 0 deletions src/intellij-14/repl.iml.SAMPLE
@@ -0,0 +1,16 @@
<?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$/../repl">
<sourceFolder url="file://$MODULE_DIR$/../repl" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="library" />
<orderEntry type="module" module-name="compiler" />
<orderEntry type="module" module-name="reflect" />
<orderEntry type="library" name="repl-deps" level="project" />
<orderEntry type="library" name="starr-no-deps" level="project" />
</component>
</module>
11 changes: 11 additions & 0 deletions src/intellij-14/scala.iml.SAMPLE
@@ -0,0 +1,11 @@
<?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$/../..">
<excludeFolder url="file://$MODULE_DIR$/../../build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

0 comments on commit 479ae8c

Please sign in to comment.