diff options
| author |  Chris Fallin <cfallin@google.com> | 2015-05-13 14:58:48 -0700 |
|---|---|---|
| committer | Chris Fallin <cfallin@google.com> | 2015-05-13 14:58:48 -0700 |
| commit | eb37551ae4fbb491f7670bf4175cb43bbc649fe0 (patch) | |
| tree | 87a1d982445a86526e0a1903b156ddaaeeba790a /ruby/pom.xml | |
| parent | 23bb79d4a32a77e8349d6c49052be1e56a8b8153 (diff) | |
Added Ruby to Travis testing.
- Added RVM-based Ruby test driver that tests MRI and JRuby.
- Fixed JRuby compilation (at least in my current setup): force source
version to 1.6 (Java 6) to allow generics and annotations.
- Modify the skipped JRuby JSON tests so that the exit code is 0 (skip()
results in a failing exit code from `rake test`). An upcoming PR
should fix JSON under JRuby in general soon.
Diffstat (limited to 'ruby/pom.xml')
| -rw-r--r-- | ruby/pom.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ruby/pom.xml b/ruby/pom.xml index 01f0e16b..247b243a 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -61,6 +61,14 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> </plugins> </build> <dependencies> @@ -78,7 +86,7 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>3.0.0-alpha-3-pre</version> + <version>3.0.0-alpha-2</version> </dependency> </dependencies> </project> |