Merge pull request #10 from Atry/scala-2.13.0

Build for Scala 2.13.0
ThoughtWorksInc · Jun 10, 2019 · 4e21475 · 4e21475
2 parents 401d3f8 + d2b8358
commit 4e21475
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 48 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1 +1,2 @@
+version = "1.5.1"
 maxColumn = 120
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,14 @@ addons:
 
 language: scala
 
+scala:
+  - 2.10.7
+  - 2.11.12
+  - 2.12.8
+  - 2.13.0
+
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 before_cache:
   - find $HOME/.sbt -name '*.lock' -delete
@@ -18,18 +24,16 @@ cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.sbt/boot/
+    - $HOME/.coursier/
 
 before_script:
 
-script:
-  - sbt +test
-
 before_deploy:
 
 deploy:
-  skip_cleanup: true
-  provider: script
-  script: sbt "release with-defaults"
-  on:
-    condition: -e ./deploy.sbt
-    all_branches: true
+  - provider: script
+    script: sbt ++$TRAVIS_SCALA_VERSION "sonatypeOpen \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\"" publishSigned sonatypeRelease
+    skip_cleanup: true
+    on:
+      all_branches: true
+      condition: $GITHUB_PERSONAL_ACCESS_TOKEN
diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,5 @@
 import scala.util.matching.Regex.{Groups, Match}
 
-crossScalaVersions in ThisBuild := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-RC2")
-
 val CovariantRegex = """extends TryTInstances0|covariant|\+\s*([A_])\b""".r
 
 def copySource(fromProject: Project) = {
@@ -45,11 +43,12 @@ lazy val covariantJS = covariant.js
 
 organization in ThisBuild := "com.thoughtworks.tryt"
 
-publishArtifact := false
+publish / skip := false
+
+enablePlugins(ScalaUnidocPlugin)
+
+unidocProjectFilter in ScalaUnidoc in unidoc := inProjects(invariantJVM, covariantJVM)
+
+addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3")
 
-lazy val unidoc = project
-  .enablePlugins(ScalaUnidocPlugin)
-  .settings(
-    addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.1"),
-    scalacOptions += "-Xexperimental"
-  )
+scalacOptions += "-Xexperimental"
diff --git a/covariant/build.sbt.shared b/covariant/build.sbt.shared
@@ -7,9 +7,9 @@ libraryDependencies += "org.scalaz" %%% "scalaz-core" % "7.2.27"
 
 libraryDependencies += "org.scalaz" %%% "scalaz-effect" % "7.2.27"
 
-libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.0-SNAP11" % Test
+libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.8" % Test
 
-addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.1")
+addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3")
 
 sourceGenerators in Test := {
   (sourceGenerators in Test).value.filterNot { sourceGenerator =>

diff --git a/deploy.sbt.disabled b/deploy.sbt.disabled
diff --git a/invariant/build.sbt.shared b/invariant/build.sbt.shared
@@ -7,11 +7,11 @@ libraryDependencies += "org.scalaz" %%% "scalaz-core" % "7.2.27"
 
 libraryDependencies += "org.scalaz" %%% "scalaz-effect" % "7.2.27"
 
-libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.0-SNAP11" % Test
+libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.8" % Test
 
 libraryDependencies += "org.scalaz" %% "scalaz-concurrent" % "7.2.27" % Test
 
-addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.1")
+addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3")
 
 sourceGenerators in Test := {
   (sourceGenerators in Test).value.filterNot { sourceGenerator =>

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.4
+sbt.version=1.2.8
diff --git a/project/coursier.sbt b/project/coursier.sbt
@@ -0,0 +1 @@
+addSbtCoursier
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,9 +1,15 @@
-addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1")
+addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+28-0b91b5bf")
+
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")
+
+addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+19-f9a4262c")
+
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
 
 addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2")
 
+addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "6.0.1")
+
 addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.0.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28")
-
-addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "6.0.0")
diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M14-3")
diff --git a/secret.sbt b/secret.sbt
@@ -0,0 +1,19 @@
+lazy val secret = {
+  for (token <- sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN")) yield {
+    val secret = project.settings(publishArtifact := false).in {
+      val secretDirectory = file(sourcecode.File()).getParentFile / "secret"
+      IO.delete(secretDirectory)
+      org.eclipse.jgit.api.Git
+        .cloneRepository()
+        .setURI("https://github.com/ThoughtWorksInc/tw-data-china-continuous-delivery-password.git")
+        .setDirectory(secretDirectory)
+        .setCredentialsProvider(
+          new org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider(token, "")
+        )
+        .call()
+        .close()
+      secretDirectory
+    }
+    secret
+  }
+}.getOrElse(null)
diff --git a/version.sbt b/version.sbt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M14-3")