From ded37814f57667ff13ba0ecbe4dca53841f7c621 Mon Sep 17 00:00:00 2001 From: Carlos Quiroz Date: Thu, 8 Dec 2016 18:20:33 -0300 Subject: [PATCH 1/2] Prepare for a test release --- .gitignore | 1 + README.md | 4 ++-- docs/src/main/tut/index.md | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 626fc4dfd..6326c7dae 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ !/src/test/ **/TempTest.java +tzdb/ diff --git a/README.md b/README.md index cef5fadc8..6032c7b2a 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,11 @@ The implementation is based on the original BSD-licensed reference implementatio #### Usage The *scala-java-time* library is currently available for Scala (JVM, version 8 and later) and Scala.js (JavaScript). -Both Scala 2.11 and Scala 2.12 (2.12.0-M5 and later) are supported. +Both Scala 2.11 and Scala 2.12 (2.12.0-M6 and later) are supported. To get started with SBT, add one (or both) of these dependencies: -- `libraryDependencies += "io.github.cquiroz" % "scala-java-time" % "2.0.0-M6"` (for Scala) +- `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-M6"` (for Scala) - `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.0.0-M6"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required) #### Documentation diff --git a/docs/src/main/tut/index.md b/docs/src/main/tut/index.md index 97806737b..dc9686ffa 100644 --- a/docs/src/main/tut/index.md +++ b/docs/src/main/tut/index.md @@ -59,7 +59,7 @@ Both Scala 2.11 and Scala 2.12 (2.12.0-M6 and later) are supported. To get started with SBT, add one (or both) of these dependencies: -- `libraryDependencies += "io.github.cquiroz" % "scala-java-time" % "2.0.0-M6"` (for Scala) +- `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-M6"` (for Scala) - `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.0.0-M6"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required) #### Building From 14fbeead03f676ebf671da3a29306c30bf00f9af Mon Sep 17 00:00:00 2001 From: Carlos Quiroz Date: Thu, 8 Dec 2016 18:53:19 -0300 Subject: [PATCH 2/2] Document the release process using sonatype sbt plugins --- README.md | 2 +- build.sbt | 9 ++------- docs/src/main/tut/release_process.md | 7 +++++++ project/plugins.sbt | 4 ++++ 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 docs/src/main/tut/release_process.md diff --git a/README.md b/README.md index 6032c7b2a..cd74a1b19 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Scala Java-Time [![Build Status](https://travis-ci.org/cquiroz/scala-java-time.svg?branch=master)](https://travis-ci.org/cquiroz/scala-java-time) -[![Maven Central](https://img.shields.io/maven-central/v/com.github.cquiroz/scala-java-time_2.11.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.cquiroz/scala-java-time_2.11) +[![Maven Central](https://img.shields.io/maven-central/v/io.github.cquiroz/scala-java-time_2.11.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.cquiroz/scala-java-time_2.11) [![Scala.js](http://scala-js.org/assets/badges/scalajs-0.6.8.svg)](http://scala-js.org) This project provides an implementation of the `java.time` package, a date and time library that was added in Java 8. diff --git a/build.sbt b/build.sbt index 8dd98147b..309eee6b5 100644 --- a/build.sbt +++ b/build.sbt @@ -33,18 +33,13 @@ lazy val commonSettings = Seq( lazy val root = project.in(file(".")) .aggregate(scalajavatimeJVM, scalajavatimeJS) - .enablePlugins(MicrositesPlugin) + .settings(commonSettings: _*) .settings( - scalaVersion := scalaVer, - crossScalaVersions := crossScalaVer, + name := "scalajavatime", // No, SBT, we don't want any artifacts for root. // No, not even an empty jar. - // Invoking Cthulhu: - packageBin in Global := file(""), - packagedArtifacts := Map(), publish := {}, publishLocal := {}, - publishArtifact := false, Keys.`package` := file("")) /** diff --git a/docs/src/main/tut/release_process.md b/docs/src/main/tut/release_process.md new file mode 100644 index 000000000..f58d42a7f --- /dev/null +++ b/docs/src/main/tut/release_process.md @@ -0,0 +1,7 @@ +This are the steps to make a release + +```bash +sbt ++publishSigned +sonatypeRelease +``` diff --git a/project/plugins.sbt b/project/plugins.sbt index f6f333b1d..2cec54dcb 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,6 +6,10 @@ addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14-7") addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.3.3") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") + +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") + // Incompatible with 2.12.0-M5 // addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5") // addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")