Skip to content
Browse files

Switch to automatically generated IDEA project definition, created by…

… the sbt-idea processor.
  • Loading branch information...
1 parent 6167e89 commit cdf274646c3f660d0d21dfce204f7631f8a11d2d @retronym retronym committed Feb 6, 2011
View
2 .idea/libraries/scala_2_7_7.xml → .idea/libraries/scala_2_7_7__build_.xml
@@ -1,5 +1,5 @@
<component name="libraryTable">
- <library name="scala-2.7.7">
+ <library name="scala-2.7.7 (build)">
<CLASSES>
<root url="jar://$PROJECT_DIR$/project/boot/scala-2.7.7/lib/scala-library.jar!/" />
<root url="jar://$PROJECT_DIR$/project/boot/scala-2.7.7/lib/scala-compiler.jar!/" />
View
7 .idea/modules.xml
@@ -2,9 +2,10 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/core/core.iml" filepath="$PROJECT_DIR$/core/core.iml" />
- <module fileurl="file://$PROJECT_DIR$/demo/demo.iml" filepath="$PROJECT_DIR$/demo/demo.iml" />
- <module fileurl="file://$PROJECT_DIR$/fjscala/fjscala.iml" filepath="$PROJECT_DIR$/fjscala/fjscala.iml" />
+ <module fileurl="file://$PROJECT_DIR$/functionaljava.iml" filepath="$PROJECT_DIR$/functionaljava.iml" />
+ <module fileurl="file://$PROJECT_DIR$/core/functionaljava-core.iml" filepath="$PROJECT_DIR$/core/functionaljava-core.iml" />
+ <module fileurl="file://$PROJECT_DIR$/demo/functionaljava-demo.iml" filepath="$PROJECT_DIR$/demo/functionaljava-demo.iml" />
+ <module fileurl="file://$PROJECT_DIR$/fjscala/functionaljava-scala.iml" filepath="$PROJECT_DIR$/fjscala/functionaljava-scala.iml" />
<module fileurl="file://$PROJECT_DIR$/project/project.iml" filepath="$PROJECT_DIR$/project/project.iml" />
</modules>
</component>
View
43 core/functionaljava-core.iml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="scala" name="Scala">
+ <configuration>
+ <option name="compilerLibraryLevel" value="Project" />
+ <option name="compilerLibraryName" value="buildScala" />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="buildScala" level="project" />
+ <orderEntry type="module-library" exported="" scope="TEST">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib_managed/test/jar/scalacheck_2.8.1-1.8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library" exported="" scope="TEST">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib_managed/test/jar/test-interface-0.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ </component>
+</module>
+
View
12 fjscala/fjscala.iml → demo/functionaljava-demo.iml
@@ -4,20 +4,22 @@
<facet type="scala" name="Scala">
<configuration>
<option name="compilerLibraryLevel" value="Project" />
- <option name="compilerLibraryName" value="scala-2.8.1" />
+ <option name="compilerLibraryName" value="buildScala" />
</configuration>
</facet>
</component>
- <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="scala-2.8.1" level="project" />
- <orderEntry type="module" module-name="core" />
+ <orderEntry type="library" name="buildScala" level="project" />
+ <orderEntry type="module" module-name="functionaljava-core" />
</component>
</module>
View
13 core/core.iml → fjscala/functionaljava-scala.iml
@@ -4,20 +4,21 @@
<facet type="scala" name="Scala">
<configuration>
<option name="compilerLibraryLevel" value="Project" />
- <option name="compilerLibraryName" value="scala-2.8.1" />
+ <option name="compilerLibraryName" value="buildScala" />
</configuration>
</facet>
</component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="scalacheck-1.8" level="project" />
- <orderEntry type="library" name="scala-2.8.1" level="project" />
+ <orderEntry type="library" name="buildScala" level="project" />
+ <orderEntry type="module" module-name="functionaljava-core" />
</component>
</module>
View
6 demo/demo.iml → functionaljava.iml
@@ -2,13 +2,9 @@
<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/main" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
- </content>
+ <content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="core" />
</component>
</module>
View
2 project/build.properties
@@ -5,5 +5,5 @@ project.name=functionaljava
sbt.version=0.7.4
project.version=3.1-SNAPSHOT
def.scala.version=2.7.7
-build.scala.versions=2.8.1 2.8.0
+build.scala.versions=2.8.1
project.initialize=false

0 comments on commit cdf2746

Please sign in to comment.
Something went wrong with that request. Please try again.