Skip to content

Commit e1b2d85

Browse files
skipoleschrisskipoleschris
committed
Merge branch 'develop'
2 parents 5c18d6a + a735c44 commit e1b2d85

File tree

5 files changed

+86
-1
lines changed

5 files changed

+86
-1
lines changed

‎.idea/modules.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎testProjects/multiModuleTestProject/jar-project/jar-project.iml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="scala" name="Scala">
5+
<configuration>
6+
<option name="compilerLibraryLevel" value="Project" />
7+
<option name="compilerLibraryName" value="Scala 2.9.0-1" />
8+
</configuration>
9+
</facet>
10+
</component>
11+
<component name="NewModuleRootManager" inherit-compiler-output="false">
12+
<output url="file://$MODULE_DIR$/target/scala-2.9.0.1/classes" />
13+
<output-test url="file://$MODULE_DIR$/target/scala-2.9.0.1/test-classes" />
14+
<exclude-output />
15+
<content url="file://$MODULE_DIR$">
16+
<sourceFolder url="file://$MODULE_DIR$/src/main/scala" isTestSource="false" />
17+
<sourceFolder url="file://$MODULE_DIR$/features" isTestSource="true" />
18+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
19+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
20+
<sourceFolder url="file://$MODULE_DIR$/src/test/scala" isTestSource="true" />
21+
<excludeFolder url="file://$MODULE_DIR$/target" />
22+
</content>
23+
<orderEntry type="inheritedJdk" />
24+
<orderEntry type="sourceFolder" forTests="false" />
25+
<orderEntry type="library" exported="" scope="TEST" name="Cuke4Duke 0.4.4" level="project" />
26+
<orderEntry type="library" name="Scala 2.9.0-1" level="project" />
27+
<orderEntry type="library" exported="" scope="TEST" name="Scalatest 1.5" level="project" />
28+
</component>
29+
</module>
30+

‎testProjects/multiModuleTestProject/multiModuleTestProject.iml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="scala" name="Scala">
5+
<configuration>
6+
<option name="compilerLibraryLevel" value="Project" />
7+
<option name="compilerLibraryName" value="Scala 2.8.1" />
8+
</configuration>
9+
</facet>
10+
</component>
11+
<component name="NewModuleRootManager" inherit-compiler-output="false">
12+
<output url="file://$MODULE_DIR$/target/scala-2.9.0.1/classes" />
13+
<output-test url="file://$MODULE_DIR$/target/scala-2.9.0.1/test-classes" />
14+
<exclude-output />
15+
<content url="file://$MODULE_DIR$">
16+
<sourceFolder url="file://$MODULE_DIR$/src/main/scala" isTestSource="false" />
17+
<excludeFolder url="file://$MODULE_DIR$/project/boot" />
18+
<excludeFolder url="file://$MODULE_DIR$/project/plugins/project" />
19+
<excludeFolder url="file://$MODULE_DIR$/project/plugins/target" />
20+
<excludeFolder url="file://$MODULE_DIR$/project/target" />
21+
<excludeFolder url="file://$MODULE_DIR$/target" />
22+
</content>
23+
<orderEntry type="inheritedJdk" />
24+
<orderEntry type="sourceFolder" forTests="false" />
25+
<orderEntry type="library" name="SBT 0.10" level="project" />
26+
<orderEntry type="library" name="Scala 2.8.1" level="project" />
27+
</component>
28+
</module>
29+

‎testProjects/multiModuleTestProject/war-project/war-project.iml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="false">
4+
<output url="file://$MODULE_DIR$/target/scala-2.9.0.1/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/scala-2.9.0.1/test-classes" />
6+
<exclude-output />
7+
<content url="file://$MODULE_DIR$">
8+
<sourceFolder url="file://$MODULE_DIR$/src/main/scala" isTestSource="false" />
9+
<sourceFolder url="file://$MODULE_DIR$/features" isTestSource="true" />
10+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
11+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
12+
<sourceFolder url="file://$MODULE_DIR$/src/test/scala" isTestSource="true" />
13+
<excludeFolder url="file://$MODULE_DIR$/target" />
14+
</content>
15+
<orderEntry type="inheritedJdk" />
16+
<orderEntry type="sourceFolder" forTests="false" />
17+
<orderEntry type="library" name="Scala 2.9.0-1" level="project" />
18+
<orderEntry type="module" module-name="jar-project" />
19+
</component>
20+
</module>
21+

‎testProjects/testProject/testProject.iml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@
2929
</content>
3030
<orderEntry type="inheritedJdk" />
3131
<orderEntry type="sourceFolder" forTests="false" />
32+
<orderEntry type="library" exported="" scope="TEST" name="Cuke4Duke 0.4.4" level="project" />
3233
<orderEntry type="library" name="Scala 2.9.0-1" level="project" />
33-
<orderEntry type="library" name="Scalatest 1.5" level="project" />
34+
<orderEntry type="library" exported="" scope="TEST" name="Scalatest 1.5" level="project" />
3435
</component>
3536
</module>
3637

0 commit comments

Comments
 (0)