Skip to content

Commit

Permalink
Merge pull request #110 from olafurpg/cross-version
Browse files Browse the repository at this point in the history
Remove CrossVersion.full
  • Loading branch information
olafurpg authored Dec 7, 2018
2 parents 66e801f + d012f30 commit 151bd57
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ lazy val runtime = project
lazy val mdoc = project
.settings(
moduleName := "mdoc",
crossVersion := CrossVersion.full,
mainClass in assembly := Some("mdoc.Main"),
assemblyJarName in assembly := "mdoc.jar",
test in assembly := {},
Expand Down
4 changes: 2 additions & 2 deletions docs/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Add the following dependency to your build
```scala
// build.sbt
scalaVersion := "@SCALA_VERSION@" // Any version in @SCALA_BINARY_VERSION@.x works.
libraryDependencies += "com.geirsson" % "mdoc" % "@VERSION@" cross CrossVersion.full
libraryDependencies += "com.geirsson" %% "mdoc" % "@VERSION@"
```

Then write a main function that invokes mdoc as a library
Expand Down Expand Up @@ -150,7 +150,7 @@ lazy val docs = project
.settings(
moduleName := "myproject-docs",
scalaVersion := "@SCALA_VERSION@", // Any version in @SCALA_BINARY_VERSION@.x works.
libraryDependencies += "com.geirsson" % "mdoc" % "@VERSION@" cross CrossVersion.full,
libraryDependencies += "com.geirsson" %% "mdoc" % "@VERSION@",
// (optional): enable compiler plugins and other flags
resourceGenerators.in(Compile) += Def.task {
val out = resourceDirectory.in(Compile).value / "mdoc.properties"
Expand Down
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Add the following dependency to your build
```scala
// build.sbt
scalaVersion := "2.12.8" // Any version in 2.12.x works.
libraryDependencies += "com.geirsson" % "mdoc" % "0.7.0" cross CrossVersion.full
libraryDependencies += "com.geirsson" %% "mdoc" % "0.7.0"
```

Then write a main function that invokes mdoc as a library
Expand Down Expand Up @@ -150,7 +150,7 @@ lazy val docs = project
.settings(
moduleName := "myproject-docs",
scalaVersion := "2.12.8", // Any version in 2.12.x works.
libraryDependencies += "com.geirsson" % "mdoc" % "0.7.0" cross CrossVersion.full,
libraryDependencies += "com.geirsson" %% "mdoc" % "0.7.0",
// (optional): enable compiler plugins and other flags
resourceGenerators.in(Compile) += Def.task {
val out = resourceDirectory.in(Compile).value / "mdoc.properties"
Expand Down

0 comments on commit 151bd57

Please sign in to comment.