Skip to content

Commit a3c5468

Browse files
committed
move things around to a more consistent naming (sorry collaborators)
1 parent 6c870b6 commit a3c5468

File tree

15 files changed

+10
-6
lines changed

15 files changed

+10
-6
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ JVM implementation of the consumer driven contract library (pact)[https://github
77

88
##I Use Scala and Specs 2
99

10-
You want to look at: [pact-jvm-specs2](pact-jvm-specs2)
10+
You want to look at: [pact-jvm-consumer-specs2](pact-jvm-consumer-specs2)
1111

1212
##I Use Java
1313

14-
You want to look at: [pact-jvm-junit](pact-jvm-junit)
14+
You want to look at: [pact-jvm-consumer-junit](pact-jvm-consumer-junit)
1515

1616
##I Use some other jvm language or test framework (groovy, clojure etc)
1717

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

project/Build.scala

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.typesafe.sbt.pgp.PgpKeys._
44

55
object BuildSettings {
66
val publishSettings = Seq(
7-
version := "2.0-RC1",
7+
version := "2.0-RC3",
88
organization := "au.com.dius",
99
scalaVersion := "2.10.3",
1010

@@ -58,7 +58,11 @@ object BuildSettings {
5858
testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "junitxml", "console")
5959
)
6060

61-
val commonSettings = Defaults.defaultSettings ++ publishSettings ++ testSettings
61+
val javacSettings = Seq (
62+
scalacOptions += "-target:jvm-1.6"
63+
)
64+
65+
val commonSettings = Defaults.defaultSettings ++ publishSettings ++ testSettings ++ javacSettings
6266
val skipPublish = Seq(
6367
publish := { },
6468
publishLocal := { },
@@ -88,9 +92,9 @@ object RootBuild extends Build {
8892

8993
lazy val consumer = p("pact-jvm-consumer").dependsOn(model)
9094

91-
lazy val specs2 = p("pact-jvm-specs2").dependsOn(consumer)
95+
lazy val specs2 = p("pact-jvm-consumer-specs2").dependsOn(consumer)
9296

93-
lazy val junit = p("pact-jvm-junit").dependsOn(consumer)
97+
lazy val junit = p("pact-jvm-consumer-junit").dependsOn(consumer)
9498

9599
lazy val provider = p("pact-jvm-provider").dependsOn(model)
96100

0 commit comments

Comments
 (0)