Merge pull request #8 from ThoughtWorksInc/dynver

Atry · web-flow · commit 9a77393d83eb · 2019-04-05T03:35:03.000+08:00
Switch to sbt-dynver
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 target/
 local.sbt
+secret/
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,6 +7,12 @@ addons:
 
 language: scala
 
+scala:
+  - "2.10.7"
+  - "2.11.12"
+  - "2.12.6"
+  - "2.13.0-M4"
+
 jdk:
   - oraclejdk8
 
@@ -18,16 +24,16 @@ cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.sbt/boot/
+    - $HOME/.coursier/
 
-script:
-  - sbt +test
+before_script:
 
 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,14 +1,12 @@
-publishArtifact := false
+publish / skip  := true
 
 organization in ThisBuild := "com.thoughtworks.extractor"
 
-crossScalaVersions in ThisBuild := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-M4")
-
 lazy val extractor = crossProject in file(".")
 
-lazy val extractorJVM = extractor.jvm.addSbtFiles(file("../shared/build.sbt"))
+lazy val extractorJVM = extractor.jvm
 
-lazy val extractorJS = extractor.js.addSbtFiles(file("../shared/build.sbt"))
+lazy val extractorJS = extractor.js
 
 // Workaround for randomly Travis CI fail
 parallelExecution in Global := false
diff --git a/deploy.sbt.disabled b/deploy.sbt.disabled
diff --git a/js/build.sbt b/js/build.sbt
@@ -0,0 +1 @@
+../shared/build.sbt
diff --git a/jvm/build.sbt b/jvm/build.sbt
@@ -0,0 +1 @@
+../shared/build.sbt
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.17
+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,5 +1,16 @@
-addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "1.6.0")
+addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1")
 
-addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "latest.release")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")
+
+addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+14-76cb6848")
+
+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.26")
+
diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M13-2")
diff --git a/secret.sbt b/secret.sbt
@@ -0,0 +1,16 @@
+lazy val secret = project.settings(publishArtifact := false).in {
+  val secretDirectory = file(sourcecode.File()).getParentFile / "secret"
+  for (token <- sys.env.get("GITHUB_PERSONAL_ACCESS_TOKEN")) {
+    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
+}
diff --git a/version.sbt b/version.sbt

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`target/`
`2`	`2`	`local.sbt`
	`3`	`+secret/`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+version = "1.5.1"`
`1`	`2`	`maxColumn = 120`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=0.13.17`
	`1`	`+sbt.version=1.2.8`