Skip to content

Commit

Permalink
scala 2.11.6 support
Browse files Browse the repository at this point in the history
  • Loading branch information
@rladstaetter
rladstaetter committed Mar 23, 2015
1 parent d292ac0 commit ff751de
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 78 deletions.
9 changes: 9 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,12 @@ Stable version (Scala 2.10):
<artifactId>scala-mojo-support_2.10</artifactId>
<version>0.5</version>
</dependency>


Development version (Scala 2.11):

<dependency>
<groupId>com.jsuereth</groupId>
<artifactId>scala-mojo-support_2.11</artifactId>
<version>0.5.1-SNAPSHOT</version>
</dependency>
15 changes: 10 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.version>3.0.4</maven.version>
<scala.version>2.10.0</scala.version>
<maven.version>3.2.3</maven.version>
<scala.version>2.11.6</scala.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<groupId>com.jsuereth</groupId>
<artifactId>scala-mojo-support_2.10</artifactId>
<artifactId>scala-mojo-support_2.11</artifactId>
<packaging>jar</packaging>
<version>0.5.1-SNAPSHOT</version>
<name>Scala Mojo Support</name>
Expand Down Expand Up @@ -84,6 +84,11 @@
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-xml_2.11</artifactId>
<version>1.0.3</version>
</dependency>
</dependencies>
<licenses>
<license>
Expand All @@ -109,7 +114,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>compile</id>
Expand All @@ -129,7 +134,7 @@
<configuration>
<scalaVersion>${scala.version}</scalaVersion>
<args>
<arg>-target:jvm-1.5</arg>
<arg>-target:jvm-1.6</arg>
<arg>-no-specialization</arg>
<arg>-deprecation</arg>
<!--<arg>-Ystop:erasure</arg>-->
Expand Down
144 changes: 72 additions & 72 deletions src/it/test-mojo-project/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.scala-tools</groupId>
<artifactId>test-scala-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>@project.version@</version>
<name>test-scala-plugin Maven Mojo</name>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.scala-tools</groupId>
<artifactId>test-scala-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>@project.version@</version>
<name>test-scala-plugin Maven Mojo</name>

<properties>
<scala.version>2.10.0</scala.version>
<scala-mojo-support.artifactId>scala-mojo-support_2.10</scala-mojo-support.artifactId>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<scala.version>2.11.6</scala.version>
<scala-mojo-support.artifactId>scala-mojo-support_2.11</scala-mojo-support.artifactId>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven.version@</version>
</dependency>
<dependency>
<groupId>com.jsuereth</groupId>
<artifactId>${scala-mojo-support.artifactId}</artifactId>
<version>@project.version@</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
<executions>
<execution>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>2.6</version>
<dependencies>
<dependency>
<groupId>com.jsuereth</groupId>
<artifactId>${scala-mojo-support.artifactId}</artifactId>
<version>@project.version@</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@maven.version@</version>
</dependency>
<dependency>
<groupId>com.jsuereth</groupId>
<artifactId>${scala-mojo-support.artifactId}</artifactId>
<version>@project.version@</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>2.6</version>
<dependencies>
<dependency>
<groupId>com.jsuereth</groupId>
<artifactId>${scala-mojo-support.artifactId}</artifactId>
<version>@project.version@</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.5</version>
<configuration>
Expand All @@ -80,22 +80,22 @@
</execution>
</executions>
</plugin>
</plugins>
</build>
</plugins>
</build>

<repositories>
<repository>
<id>scala-tools.org</id>
<name>Scala-tools Maven2 Repository</name>
<url>http://scala-tools.org/repo-releases</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>scala-tools.org</id>
<name>Scala-tools Maven2 Repository</name>
<url>http://scala-tools.org/repo-releases</url>
</pluginRepository>
</pluginRepositories>
<repositories>
<repository>
<id>scala-tools.org</id>
<name>Scala-tools Maven2 Repository</name>
<url>http://scala-tools.org/repo-releases</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>scala-tools.org</id>
<name>Scala-tools Maven2 Repository</name>
<url>http://scala-tools.org/repo-releases</url>
</pluginRepository>
</pluginRepositories>

</project>
2 changes: 1 addition & 1 deletion src/main/java/org/scala_tools/maven/mojo/extractor/MojoExtractorCompiler.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class MojoExtractorCompiler(project: MavenProject) extends MavenProjectTools wit
val settings = new Settings();
//TODO - Set settings
settings.classpath.value = getCompileClasspathString(project)
settings.stop.tryToSetColon(List("constructors"))
settings.stopAfter.tryToSetColon(List("constructors"))
settings.sourcepath.tryToSet(project.getCompileSourceRoots().asInstanceOf[java.util.List[String]].toList)
val reporter = new ConsoleReporter(settings);
(settings, reporter)
Expand Down

0 comments on commit ff751de

Please sign in to comment.