Skip to content

Commit ec4f542

Browse files
authored
Merge pull request #4 from cquiroz/test_release
Release info
2 parents 492575f + 14fbeea commit ec4f542

File tree

6 files changed

+18
-11
lines changed

6 files changed

+18
-11
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@
3131
!/src/test/
3232

3333
**/TempTest.java
34+
tzdb/

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## Scala Java-Time
33

44
[![Build Status](https://travis-ci.org/cquiroz/scala-java-time.svg?branch=master)](https://travis-ci.org/cquiroz/scala-java-time)
5-
[![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)
5+
[![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)
66
[![Scala.js](http://scala-js.org/assets/badges/scalajs-0.6.8.svg)](http://scala-js.org)
77

88
This project provides an implementation of the `java.time` package, a date and time library that was added in Java 8.
@@ -11,11 +11,11 @@ The implementation is based on the original BSD-licensed reference implementatio
1111
#### Usage
1212

1313
The *scala-java-time* library is currently available for Scala (JVM, version 8 and later) and Scala.js (JavaScript).
14-
Both Scala 2.11 and Scala 2.12 (2.12.0-M5 and later) are supported.
14+
Both Scala 2.11 and Scala 2.12 (2.12.0-M6 and later) are supported.
1515

1616
To get started with SBT, add one (or both) of these dependencies:
1717

18-
- `libraryDependencies += "io.github.cquiroz" % "scala-java-time" % "2.0.0-M6"` (for Scala)
18+
- `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-M6"` (for Scala)
1919
- `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)
2020

2121
#### Documentation

build.sbt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,13 @@ lazy val commonSettings = Seq(
3333

3434
lazy val root = project.in(file("."))
3535
.aggregate(scalajavatimeJVM, scalajavatimeJS)
36-
.enablePlugins(MicrositesPlugin)
36+
.settings(commonSettings: _*)
3737
.settings(
38-
scalaVersion := scalaVer,
39-
crossScalaVersions := crossScalaVer,
38+
name := "scalajavatime",
4039
// No, SBT, we don't want any artifacts for root.
4140
// No, not even an empty jar.
42-
// Invoking Cthulhu:
43-
packageBin in Global := file(""),
44-
packagedArtifacts := Map(),
4541
publish := {},
4642
publishLocal := {},
47-
publishArtifact := false,
4843
Keys.`package` := file(""))
4944

5045
/**

docs/src/main/tut/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Both Scala 2.11 and Scala 2.12 (2.12.0-M6 and later) are supported.
5959

6060
To get started with SBT, add one (or both) of these dependencies:
6161

62-
- `libraryDependencies += "io.github.cquiroz" % "scala-java-time" % "2.0.0-M6"` (for Scala)
62+
- `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-M6"` (for Scala)
6363
- `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)
6464

6565
#### Building

docs/src/main/tut/release_process.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
This are the steps to make a release
2+
3+
```bash
4+
sbt
5+
+publishSigned
6+
sonatypeRelease
7+
```

project/plugins.sbt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14-7")
66

77
addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.3.3")
88

9+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
10+
11+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
12+
913
// Incompatible with 2.12.0-M5
1014
// addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5")
1115
// addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")

0 commit comments

Comments
 (0)