Merge branch 'release/1.0.1'

daniel-shuy · Nov 9, 2019 · 95d639f · 95d639f
2 parents 3ea0e3c + 08da1dc
commit 95d639f
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -61,16 +61,16 @@ Add the following to your `project/plugins.sbt`:
 
 
 ```scala
-addSbtPlugin("com.github.daniel-shuy" % "sbt-release-mdoc" % "1.0.0")
+addSbtPlugin("com.github.daniel-shuy" % "sbt-release-mdoc" % "1.0.1")
 ```
 
 Override the `sbt-mdoc` and `mdoc` dependency versions with the version of mdoc you wish to use:
 
 
 ```scala
-addSbtPlugin("com.github.daniel-shuy" % "sbt-release-mdoc" % "1.0.0")
+addSbtPlugin("com.github.daniel-shuy" % "sbt-release-mdoc" % "1.0.1")
 
-val mdocVersion = "1.0.0"
+val mdocVersion = "2.0.0"
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % mdocVersion)
 libraryDependencies ++= Seq(
   "org.scalameta" %% "mdoc" % mdocVersion

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import ReleaseTransformations._
 import com.github.daniel.shuy.sbt.release.mdoc.ReleaseMdocStateTransformations
 
 val sbtReleaseVersion = "1.0.11"
-val mdocVersion = "1.0.0"
+val mdocVersion = "2.0.0"
 
 ThisBuild / organization := "com.github.daniel-shuy"
 ThisBuild / name := "sbt-release-mdoc"
@@ -76,7 +76,9 @@ lazy val sbtReleaseMdoc = project
   .in(file("sbt-release-mdoc"))
   .settings(
     moduleName := (ThisBuild / name).value,
-    crossSbtVersions := Seq("1.2.8"),
+    crossSbtVersions := Seq(
+      "1.3.3",
+    ),
     // mdoc must be declared before sbt-mdoc due to package/class name conflict (mdoc.Main)
     // The compiler looks up classes in the build classpath order
     libraryDependencies ++= Seq(

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.3
diff --git a/project/release.sbt b/project/release.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.github.daniel-shuy" % "sbt-release-mdoc" % "0.2.0")
+addSbtPlugin("com.github.daniel-shuy" % "sbt-release-mdoc" % "1.0.0")
 
 val mdocVersion = "2.0.0"
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % mdocVersion)

diff --git a/sbt-release-mdoc/src/sbt-test/sbt-1.0/commit/project/build.properties b/sbt-release-mdoc/src/sbt-test/sbt-1.0/commit/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.3
diff --git a/sbt-release-mdoc/src/sbt-test/sbt-1.0/commit/project/plugins.sbt b/sbt-release-mdoc/src/sbt-test/sbt-1.0/commit/project/plugins.sbt
@@ -6,6 +6,8 @@ sys.props.get("plugin.version") match {
                  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
 }
 
+useCoursier := false
+
 addSbtPlugin("com.github.daniel-shuy" % "sbt-scripted-scalatest" % "1.1.1")
 libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8"
 

diff --git a/sbt-release-mdoc/src/sbt-test/sbt-1.0/mdoc/build.sbt b/sbt-release-mdoc/src/sbt-test/sbt-1.0/mdoc/build.sbt
@@ -5,6 +5,8 @@ import org.eclipse.jgit.api.{Git => JGit}
 import org.scalatest.{BeforeAndAfterAll, WordSpec}
 import sbtrelease.Git
 
+import scala.util.Properties
+
 lazy val testMdoc = (project in file("."))
   .enablePlugins(MdocPlugin)
   .settings(
@@ -44,7 +46,7 @@ lazy val testMdoc = (project in file("."))
           Command.process(ReleaseKeys.releaseCommand.nameOption.get, sbtState)
 
           assert(generatedMarkdownFile.exists(), s"$generatedMarkdownFile not found")
-          assert(generatedMarkdownFile.contentAsString == "KEY : VALUE\n")
+          assert(generatedMarkdownFile.contentAsString == s"KEY : VALUE${Properties.lineSeparator}")
         }
       }
     })

diff --git a/sbt-release-mdoc/src/sbt-test/sbt-1.0/mdoc/project/build.properties b/sbt-release-mdoc/src/sbt-test/sbt-1.0/mdoc/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.3
diff --git a/sbt-release-mdoc/src/sbt-test/sbt-1.0/mdoc/project/plugins.sbt b/sbt-release-mdoc/src/sbt-test/sbt-1.0/mdoc/project/plugins.sbt
@@ -6,6 +6,8 @@ sys.props.get("plugin.version") match {
                          |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
 }
 
+useCoursier := false
+
 addSbtPlugin("com.github.daniel-shuy" % "sbt-scripted-scalatest" % "1.1.1")
 libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8"
 

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "1.0.1-SNAPSHOT"
+version in ThisBuild := "1.0.2-SNAPSHOT"