93 lines
4.0 KiB
Diff
93 lines
4.0 KiB
Diff
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -177,23 +177,26 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
- <groupId>net.alchim31.maven</groupId>
|
|
- <artifactId>scala-maven-plugin</artifactId>
|
|
- <version>${scala.maven.version}</version>
|
|
- <configuration>
|
|
- <scalaVersion>${scala.version}</scalaVersion>
|
|
- <scalaCompatVersion>${scala.compat.version}</scalaCompatVersion>
|
|
- <failOnMultipleScalaVersions>true</failOnMultipleScalaVersions>
|
|
- </configuration>
|
|
+ <groupId>org.codehaus.mojo</groupId>
|
|
+ <artifactId>exec-maven-plugin</artifactId>
|
|
+ <version>1.3.2</version>
|
|
<executions>
|
|
<execution>
|
|
<phase>generate-sources</phase>
|
|
<goals>
|
|
- <goal>script</goal>
|
|
+ <goal>exec</goal>
|
|
</goals>
|
|
<configuration>
|
|
- <includeScopes>plugin</includeScopes>
|
|
- <scriptFile>${project.basedir}/generator/Generator.scala</scriptFile>
|
|
+ <workingDirectory>${project.basedir}</workingDirectory>
|
|
+ <executable>scala</executable>
|
|
+ <arguments>
|
|
+ <argument>-nobootcp</argument>
|
|
+ <argument>-howtorun:script</argument>
|
|
+ <argument>-i</argument>
|
|
+ <argument>${project.basedir}/generator/Generator.scala</argument>
|
|
+ <argument>-e</argument>
|
|
+ <argument>run</argument>
|
|
+ </arguments>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
--- a/vavr-test/generator/Generator.scala
|
|
+++ b/vavr-test/generator/Generator.scala
|
|
@@ -25,8 +25,8 @@ import JavaGenerator._
|
|
import scala.language.implicitConversions
|
|
|
|
val N = 8
|
|
-val TARGET_MAIN = s"${project.getBasedir()}/src-gen/main/java"
|
|
-val TARGET_TEST = s"${project.getBasedir()}/src-gen/test/java"
|
|
+val TARGET_MAIN = s"src-gen/main/java"
|
|
+val TARGET_TEST = s"src-gen/test/java"
|
|
val CHARSET = java.nio.charset.StandardCharsets.UTF_8
|
|
|
|
/**
|
|
--- a/vavr-test/pom.xml
|
|
+++ b/vavr-test/pom.xml
|
|
@@ -46,8 +46,8 @@
|
|
<artifactId>maven-clean-plugin</artifactId>
|
|
</plugin>
|
|
<plugin>
|
|
- <groupId>net.alchim31.maven</groupId>
|
|
- <artifactId>scala-maven-plugin</artifactId>
|
|
+ <groupId>org.codehaus.mojo</groupId>
|
|
+ <artifactId>exec-maven-plugin</artifactId>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
--- a/vavr/generator/Generator.scala
|
|
+++ b/vavr/generator/Generator.scala
|
|
@@ -27,8 +27,8 @@ import scala.language.implicitConversions
|
|
|
|
val N = 8
|
|
val VARARGS = 10
|
|
-val TARGET_MAIN = s"${project.getBasedir()}/src-gen/main/java"
|
|
-val TARGET_TEST = s"${project.getBasedir()}/src-gen/test/java"
|
|
+val TARGET_MAIN = s"src-gen/main/java"
|
|
+val TARGET_TEST = s"src-gen/test/java"
|
|
val CHARSET = java.nio.charset.StandardCharsets.UTF_8
|
|
|
|
/**
|
|
--- a/vavr/pom.xml
|
|
+++ b/vavr/pom.xml
|
|
@@ -54,8 +54,8 @@
|
|
<artifactId>maven-clean-plugin</artifactId>
|
|
</plugin>
|
|
<plugin>
|
|
- <groupId>net.alchim31.maven</groupId>
|
|
- <artifactId>scala-maven-plugin</artifactId>
|
|
+ <groupId>org.codehaus.mojo</groupId>
|
|
+ <artifactId>exec-maven-plugin</artifactId>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|