Skip to content

Commit ec564e0

Browse files
hwielenberghwielenberg
committed
Adds test
1 parent 42921d9 commit ec564e0

File tree

5 files changed

+79
-2
lines changed

5 files changed

+79
-2
lines changed

‎integration/ide/gen-idea/resources/hello-idea/build.mill

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package build
22

33
import mill._
44
import mill.scalajslib.ScalaJSModule
5-
import mill.scalalib.{Dep, DepSyntax, JavaModule, TestModule}
5+
import mill.scalalib.{Dep, DepSyntax, JavaModule, ScalaModule, TestModule}
66

77
trait HelloIdeaModule extends scalalib.ScalaModule {
88
def scalaVersion = "2.12.5"
@@ -60,3 +60,8 @@ object moduleF extends JavaModule {
6060
override def compileModuleDeps = Seq(moduleC)
6161
override def moduleDeps = Seq(moduleB, moduleA)
6262
}
63+
object moduleG extends Cross[ModuleG]("2.12.5", "2.13.6")
64+
trait ModuleG extends ScalaModule with Cross.Module[String] {
65+
def scalaVersion = crossValue
66+
def scalacOptions = Seq("-Xsource:3")
67+
}

‎integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/moduleg-2.12.5.iml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<module type="JAVA_MODULE" version="4">
2+
<component name="NewModuleRootManager">
3+
<output url="file://$MODULE_DIR$/../../out/moduleG/2.12.5/ideaCompileOutput.dest/classes"/>
4+
<exclude-output/>
5+
<content url="file://$MODULE_DIR$/../../moduleG">
6+
<sourceFolder url="file://$MODULE_DIR$/../../moduleG/src" isTestSource="false"/>
7+
<sourceFolder url="file://$MODULE_DIR$/../../moduleG/resources" type="java-resource"/>
8+
</content>
9+
<orderEntry type="inheritedJdk"/>
10+
<orderEntry type="sourceFolder" forTests="false"/>
11+
<orderEntry type="library" name="scala-SDK-2.12.5" level="project"/>
12+
<orderEntry type="library" name="scala-library-2.12.5.jar" level="project"/>
13+
</component>
14+
</module>

‎integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/moduleg-2.13.6.iml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<module type="JAVA_MODULE" version="4">
2+
<component name="NewModuleRootManager">
3+
<output url="file://$MODULE_DIR$/../../out/moduleG/2.13.6/ideaCompileOutput.dest/classes"/>
4+
<exclude-output/>
5+
<content url="file://$MODULE_DIR$/../../moduleG">
6+
<sourceFolder url="file://$MODULE_DIR$/../../moduleG/src" isTestSource="false"/>
7+
<sourceFolder url="file://$MODULE_DIR$/../../moduleG/resources" type="java-resource"/>
8+
</content>
9+
<orderEntry type="inheritedJdk"/>
10+
<orderEntry type="sourceFolder" forTests="false"/>
11+
<orderEntry type="library" name="scala-SDK-2.13.6" level="project"/>
12+
<orderEntry type="library" name="scala-library-2.13.6.jar" level="project"/>
13+
</component>
14+
</module>

‎integration/ide/gen-idea/resources/hello-idea/idea/modules.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<module fileurl="file://$PROJECT_DIR$/.idea/mill_modules/moduled.iml" filepath="$PROJECT_DIR$/.idea/mill_modules/moduled.iml"/>
1717
<module fileurl="file://$PROJECT_DIR$/.idea/mill_modules/modulee.iml" filepath="$PROJECT_DIR$/.idea/mill_modules/modulee.iml"/>
1818
<module fileurl="file://$PROJECT_DIR$/.idea/mill_modules/modulef.iml" filepath="$PROJECT_DIR$/.idea/mill_modules/modulef.iml"/>
19+
<module fileurl="file://$PROJECT_DIR$/.idea/mill_modules/moduleg-2.12.5.iml" filepath="$PROJECT_DIR$/.idea/mill_modules/moduleg-2.12.5.iml"/>
20+
<module fileurl="file://$PROJECT_DIR$/.idea/mill_modules/moduleg-2.13.6.iml" filepath="$PROJECT_DIR$/.idea/mill_modules/moduleg-2.13.6.iml"/>
1921
</modules>
2022
</component>
21-
</project>
23+
</project>

‎integration/ide/gen-idea/resources/hello-idea/idea/scala_compiler.xml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<project version="4">
2+
<component name="ScalaCompilerConfiguration">
3+
<profile name="mill 1" modules="helloidea,helloidea.scala2_13,helloidea.scala2_13.test,helloidea.scala3,helloidea.scala3.test,helloidea.test,modulea,moduleb,modulec,moduled,modulee,modulef">
4+
<parameters></parameters>
5+
<plugins></plugins>
6+
</profile>
7+
<profile name="mill 2" modules="helloideajs,helloideajs.test">
8+
<parameters>
9+
<parameter value="-scalajs"/>
10+
</parameters>
11+
<plugins></plugins>
12+
</profile>
13+
<profile name="mill 3" modules="moduleg-2.12.5,moduleg-2.13.6">
14+
<parameters>
15+
<parameter value="-Xsource:3"/>
16+
</parameters>
17+
<plugins></plugins>
18+
</profile>
19+
<profile name="mill 4" modules="">
20+
<parameters>
21+
<parameter value="-Xplugin:/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/lihaoyi/scalac-mill-moduledefs-plugin_3.7.0/0.11.4/scalac-mill-moduledefs-plugin_3.7.0-0.11.4.jar"/>
22+
<parameter value="-deprecation"/>
23+
</parameters>
24+
<plugins>
25+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/lihaoyi/scalac-mill-moduledefs-plugin_3.7.0/0.11.4/scalac-mill-moduledefs-plugin_3.7.0-0.11.4.jar"/>
26+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.7.0/scala3-compiler_3-3.7.0.jar"/>
27+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.7.0/scala3-library_3-3.7.0.jar"/>
28+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/lihaoyi/mill-moduledefs_3/0.11.4/mill-moduledefs_3-0.11.4.jar"/>
29+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala3-interfaces/3.7.0/scala3-interfaces-3.7.0.jar"/>
30+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/tasty-core_3/3.7.0/tasty-core_3-3.7.0.jar"/>
31+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-asm/9.7.1-scala-1/scala-asm-9.7.1-scala-1.jar"/>
32+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-sbt/compiler-interface/1.10.7/compiler-interface-1.10.7.jar"/>
33+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/jline/jline-reader/3.29.0/jline-reader-3.29.0.jar"/>
34+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal/3.29.0/jline-terminal-3.29.0.jar"/>
35+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/jline/jline-terminal-jni/3.29.0/jline-terminal-jni-3.29.0.jar"/>
36+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.16/scala-library-2.13.16.jar"/>
37+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-sbt/util-interface/1.10.7/util-interface-1.10.7.jar"/>
38+
<plugin path="/Users/henning.wielenberg/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/jline/jline-native/3.29.0/jline-native-3.29.0.jar"/>
39+
</plugins>
40+
</profile>
41+
</component>
42+
</project>

0 commit comments

Comments
 (0)