Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions m2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.12</artifactId>
<version>3.0.5</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
7 changes: 7 additions & 0 deletions m2/src/main/java/m2/M2Java.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package m2;

public class M2Java {
public static void main(String[] args) {
System.out.println("hello, Maven, Scala, Java " + System.getProperty("java.specification.version"));
}
}
7 changes: 0 additions & 7 deletions m2/src/main/scala/m2/M2.scala

This file was deleted.

12 changes: 12 additions & 0 deletions m2/src/test/scala/m2/TestSpec.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package m2

import org.scalatest.FunSuite
import org.scalatest.Matchers.convertToAnyShouldWrapper

class TestSpec extends FunSuite {

test("x"){
List(1) should ===(List(1))
}

}
11 changes: 10 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,20 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.2</version>
<version>3.3.1</version>
<executions>
<execution>
<id>scala-compile-first</id>
<phase>process-resources</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
Expand Down