Skip to content

Commit

Permalink
Merge pull request #15 from ktoso/12-port-tck-to-java-ktoso
Browse files Browse the repository at this point in the history
!tck #12 Migrated TCK to plain Java
  • Loading branch information
rkuhn committed Apr 14, 2014
2 parents 4d9bd6f + c687271 commit b42fec3
Show file tree
Hide file tree
Showing 18 changed files with 2,183 additions and 1,166 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ target/
.eprj
.history
.idea
.idea_modules
6 changes: 4 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
organization in ThisBuild := "org.reactivestreams"

version in ThisBuild := "0.2-SNAPSHOT"
version in ThisBuild := "0.3"

scalaVersion in ThisBuild := "2.10.3"

licenses in ThisBuild := Seq("CC0" -> url("http://creativecommons.org/publicdomain/zero/1.0/"))

homepage in ThisBuild := Some(url("https://groups.google.com/forum/?hl=en#!forum/reactive-streams"))

scalaVersion in ThisBuild := "2.10.3"
publishTo in ThisBuild := Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")

lazy val spi = project

Expand Down
17 changes: 0 additions & 17 deletions project/Build.scala

This file was deleted.

1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
addSbtPlugin("de.johoop" % "sbt-testng-plugin" % "3.0.0")
2 changes: 0 additions & 2 deletions spi/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,3 @@ autoScalaLibrary := false
crossPaths := false

publishMavenStyle := true

Common.javadocSettings
14 changes: 14 additions & 0 deletions tck/build.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
import de.johoop.testngplugin.TestNGPlugin._

name := "reactive-streams-tck"

javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-Xlint:deprecation")

javacOptions in (Compile,doc) ++= Seq("-encoding","UTF-8","-docencoding", "UTF-8", "-charset", "UTF-8", "-notimestamp", "-linksource")

autoScalaLibrary := false

crossPaths := false

publishMavenStyle := true

libraryDependencies += "org.testng" % "testng" % "5.14.10"

testNGSettings
Loading

0 comments on commit b42fec3

Please sign in to comment.