Skip to content

Commit c94e861

Browse files
authored
Merge pull request #372 from cquiroz/release-1.6
Prepare release 1.6
2 parents 6a08bf5 + afd4e7c commit c94e861

File tree

5 files changed

+75
-44
lines changed

5 files changed

+75
-44
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
on:
2+
push:
3+
# Sequence of patterns matched against refs/tags
4+
tags:
5+
- "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
6+
7+
name: Create Release
8+
9+
jobs:
10+
build:
11+
name: Create Release
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout code
15+
uses: actions/checkout@master
16+
- name: Create Release
17+
id: create_release
18+
uses: actions/create-release@v1
19+
env:
20+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
21+
with:
22+
tag_name: ${{ github.ref }}
23+
release_name: Release ${{ github.ref }}
24+
body: |
25+
Changes in this Release:
26+
* First Change
27+
* Second Change
28+
draft: false
29+
prerelease: false

README.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ All types are immutable and thread-safe.
1515
|
1616
[![Join the chat at https://gitter.im/typelevel/squants](https://badges.gitter.im/typelevel/squants.svg)](https://gitter.im/typelevel/squants?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
1717
|
18-
[![Scaladocs](https://www.javadoc.io/badge/org.typelevel/squants_2.12.svg?label=scaladoc)](https://static.javadoc.io/org.typelevel/squants_2.12/1.5.0/squants/index.html)
18+
[![Scaladocs](https://www.javadoc.io/badge/org.typelevel/squants_2.13.svg?label=scaladoc)](https://static.javadoc.io/org.typelevel/squants_2.13/1.6.0/squants/index.html)
1919
|
2020
[![Build Status](https://travis-ci.org/typelevel/squants.png?branch=master)](https://travis-ci.org/typelevel/squants)
2121

2222

2323
### Current Versions
24-
Current Release: **1.5.0**
25-
([API Docs](https://oss.sonatype.org/service/local/repositories/releases/archive/org/typelevel/squants_2.12/1.5.0/squants_2.12-1.5.0-javadoc.jar/!/index.html#squants.package))
24+
Current Release: **1.6.0**
25+
([API Docs](https://oss.sonatype.org/service/local/repositories/releases/archive/org/typelevel/squants_2.13/1.6.0/squants_2.13-1.6.0-javadoc.jar/!/index.html#squants.package))
2626

27-
Development Build: **1.6.0-SNAPSHOT**
28-
([API Docs](https://oss.sonatype.org/service/local/repositories/snapshots/archive/org/typelevel/squants_2.12/1.6.0-SNAPSHOT/squants_2.12-1.6.0-SNAPSHOT-javadoc.jar/!/index.html#squants.package))
27+
Development Build: **1.7.0-SNAPSHOT**
28+
([API Docs](https://oss.sonatype.org/service/local/repositories/snapshots/archive/org/typelevel/squants_2.13/1.6.0-SNAPSHOT/squants_2.13-1.7.0-SNAPSHOT-javadoc.jar/!/index.html#squants.package))
2929

3030
[Release History](https://github.com/typelevel/squants/wiki/Release-History)
3131

@@ -38,10 +38,10 @@ For more information on feature availability of a specific version see the Relea
3838
Repository hosting for Squants is provided by [Sonatype](https://oss.sonatype.org/).
3939
To use Squants in your SBT project add the following dependency to your build.
4040

41-
"org.typelevel" %% "squants" % "1.5.0"
41+
"org.typelevel" %% "squants" % "1.6.0"
4242
or
4343

44-
"org.typelevel" %% "squants" % "1.6.0-SNAPSHOT"
44+
"org.typelevel" %% "squants" % "1.7.0-SNAPSHOT"
4545

4646

4747
To use Squants in your Maven project add the following dependency
@@ -50,13 +50,13 @@ To use Squants in your Maven project add the following dependency
5050
<dependency>
5151
<groupId>org.typelevel</groupId>
5252
<artifactId>squants_2.11</artifactId>
53-
<version>1.5.0</version>
53+
<version>1.6.0</version>
5454
</dependency>
5555
```
5656

5757
Beginning with Squants 0.4.x series, both Scala 2.10 and 2.11 builds are available.
58-
Beginning with Squants 1.x series, Scala 2.10, 2.11 and 2.12 builds are available.
59-
Scala.js is supported on version 0.6.28 and 1.0.0-M8
58+
Beginning with Squants 1.x series, Scala 2.11, 2.12 and 2.13 builds are available.
59+
Scala.js is supported on version 0.6.31 and 1.0.0-RC1
6060

6161
To use Squants interactively in the Scala REPL, clone the git repo and run `sbt squantsJVM/console`
6262

@@ -692,7 +692,7 @@ This will fail because `lower` = `upper`:
692692
scala> QuantityRange(1.km, 1.km)
693693
java.lang.IllegalArgumentException: QuantityRange upper bound must be strictly greater than to the lower bound
694694
at squants.QuantityRange.<init>(QuantityRange.scala:25)
695-
... 44 elided
695+
... 43 elided
696696
```
697697

698698
`QuantityRange` contains two functions that check if an element is part of the range, `contains` and `includes`.
@@ -963,7 +963,7 @@ import squants.experimental.unitgroups.si.strict.implicits._
963963
// import squants.experimental.unitgroups.si.strict.implicits._
964964

965965
val siLengths: UnitGroup[Length] = implicitly[UnitGroup[Length]]
966-
// siLengths: squants.experimental.unitgroups.UnitGroup[squants.space.Length] = squants.experimental.unitgroups.si.strict.package$implicits$$anon$1@3bd46477
966+
// siLengths: squants.experimental.unitgroups.UnitGroup[squants.space.Length] = squants.experimental.unitgroups.si.strict.package$implicits$$anon$1@f52ca1b
967967
```
968968

969969
To print out units and their conversion factors to the primary SI unit, you could use this code:
@@ -1020,16 +1020,16 @@ val usCookingUnitGroup = new UnitGroup[Volume] {
10201020
// units don't have to be specified in-order.
10211021
val units: Set[UnitOfMeasure[Volume]] = Set(UsPints, UsGallons, Teaspoons, Tablespoons, UsQuarts, FluidOunces)
10221022
}
1023-
// usCookingUnitGroup: squants.experimental.unitgroups.UnitGroup[squants.space.Volume]{val units: Set[squants.UnitOfMeasure[squants.space.Volume]]} = $anon$1@13cf78bc
1023+
// usCookingUnitGroup: squants.experimental.unitgroups.UnitGroup[squants.space.Volume]{val units: Set[squants.UnitOfMeasure[squants.space.Volume]]} = $anon$1@495c28e0
10241024

10251025
// squants automatically sorts units
10261026
usCookingUnitGroup.sortedUnits.foreach(println)
1027-
// squants.space.Teaspoons$@754c402e
1028-
// squants.space.Tablespoons$@41f51dac
1029-
// squants.space.FluidOunces$@4151520
1030-
// squants.space.UsPints$@297ee46f
1031-
// squants.space.UsQuarts$@1f76d461
1032-
// squants.space.UsGallons$@5f688205
1027+
// squants.space.Teaspoons$@1f2aa9fd
1028+
// squants.space.Tablespoons$@20a4318e
1029+
// squants.space.FluidOunces$@3f31c22
1030+
// squants.space.UsPints$@6b5332c3
1031+
// squants.space.UsQuarts$@5293da73
1032+
// squants.space.UsGallons$@25de9dee
10331033
```
10341034

10351035
The `UnitGroup` values provided with Squants are only samples and aren't intended to be exhaustive.
@@ -1065,7 +1065,7 @@ import squants.experimental.unitgroups.misc.AstronomicalLengthUnitGroup
10651065
Then create the formatter by passing in a unit group:
10661066
```scala
10671067
val astroFormatter = new DefaultFormatter(AstronomicalLengthUnitGroup)
1068-
// astroFormatter: squants.experimental.formatter.DefaultFormatter[squants.space.Length] = squants.experimental.formatter.DefaultFormatter@4a75b2e0
1068+
// astroFormatter: squants.experimental.formatter.DefaultFormatter[squants.space.Length] = squants.experimental.formatter.DefaultFormatter@790fe346
10691069
```
10701070

10711071
Now, we create some values using human-unfriendly numbers:
@@ -1117,7 +1117,7 @@ import squants.experimental.unitgroups.misc.AstronomicalLengthUnitGroup
11171117

11181118
```scala
11191119
implicit val astroFormatter = new DefaultFormatter(AstronomicalLengthUnitGroup)
1120-
// astroFormatter: squants.experimental.formatter.DefaultFormatter[squants.space.Length] = squants.experimental.formatter.DefaultFormatter@679fbbc2
1120+
// astroFormatter: squants.experimental.formatter.DefaultFormatter[squants.space.Length] = squants.experimental.formatter.DefaultFormatter@135301a1
11211121

11221122
val earthToJupiter = 588000000.km
11231123
// earthToJupiter: squants.space.Length = 588000000.0 km
@@ -1552,9 +1552,9 @@ To make a release do the following:
15521552
sbt squantsNative/publishSigned
15531553
```
15541554

1555-
* Repeat for scala.js 1.0.0-M8
1555+
* Repeat for scala.js 1.0.0-RC1
15561556
```
1557-
SCALAJS_VERSION=1.0.0-M8 sbt +squantsJS/publishSigned
1557+
SCALAJS_VERSION=1.0.0-RC1 sbt +squantsJS/publishSigned
15581558
```
15591559

15601560
* Then make a release (Note: after this step the release cannot be replaced)

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ lazy val squants =
2828
parallelExecution in Test := false
2929
)
3030
.jvmSettings(Tests.defaultSettings: _*)
31-
.jsSettings(Tests.defaultSettings: _*)
3231
.jsSettings(
3332
parallelExecution in Test := false,
3433
excludeFilter in Test := "*Serializer.scala" || "*SerializerSpec.scala",
3534
scalacOptions in Tut --= Seq("-Ywarn-unused-import", "-Ywarn-unused:imports"),
36-
sources in (Compile, test) := List() // This is a pity but we can't reliable compile on 1.0.0-M8
35+
// sources in (Compile, test) := List() // This is a pity but we can't reliable compile on 1.0.0-M8
3736
)
37+
.jsSettings(Tests.defaultSettings: _*)
3838
.nativeSettings(
3939
sources in (Compile, doc) := List(), // Can't build docs in native
4040
sources in (Compile, test) := List() // Can't yet compile in native

project/Build.scala

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.typesafe.sbt.osgi.SbtOsgi
77
import com.typesafe.sbt.osgi.SbtOsgi.autoImport._
88

99
object Versions {
10-
val Squants = "1.6.0-SNAPSHOT"
10+
val Squants = "1.6.0"
1111
val Scala = "2.11.12" // Don't use 2.12 yet to avoid troubles with native
1212
val scalaJSVersion =
1313
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.31")
@@ -126,12 +126,14 @@ object Publish {
126126

127127
object Tests {
128128
val defaultSettings =
129-
Seq(
130-
libraryDependencies ++=
131-
Dependencies.scalaTest.value ++
132-
Dependencies.scalaCheck.value ++
133-
Dependencies.json4s.value
134-
)
129+
if (Versions.scalaJSVersion.startsWith("0.6")) {
130+
Seq(
131+
libraryDependencies ++=
132+
Dependencies.scalaTest.value ++
133+
Dependencies.scalaCheck.value ++
134+
Dependencies.json4s.value
135+
)
136+
} else Seq.empty
135137
}
136138

137139
object Formatting {

shared/src/main/tut/README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ All types are immutable and thread-safe.
1515
|
1616
[![Join the chat at https://gitter.im/typelevel/squants](https://badges.gitter.im/typelevel/squants.svg)](https://gitter.im/typelevel/squants?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
1717
|
18-
[![Scaladocs](https://www.javadoc.io/badge/org.typelevel/squants_2.12.svg?label=scaladoc)](https://static.javadoc.io/org.typelevel/squants_2.12/1.5.0/squants/index.html)
18+
[![Scaladocs](https://www.javadoc.io/badge/org.typelevel/squants_2.13.svg?label=scaladoc)](https://static.javadoc.io/org.typelevel/squants_2.13/1.6.0/squants/index.html)
1919
|
2020
[![Build Status](https://travis-ci.org/typelevel/squants.png?branch=master)](https://travis-ci.org/typelevel/squants)
2121

2222

2323
### Current Versions
24-
Current Release: **1.5.0**
25-
([API Docs](https://oss.sonatype.org/service/local/repositories/releases/archive/org/typelevel/squants_2.12/1.5.0/squants_2.12-1.5.0-javadoc.jar/!/index.html#squants.package))
24+
Current Release: **1.6.0**
25+
([API Docs](https://oss.sonatype.org/service/local/repositories/releases/archive/org/typelevel/squants_2.13/1.6.0/squants_2.13-1.6.0-javadoc.jar/!/index.html#squants.package))
2626

27-
Development Build: **1.6.0-SNAPSHOT**
28-
([API Docs](https://oss.sonatype.org/service/local/repositories/snapshots/archive/org/typelevel/squants_2.12/1.6.0-SNAPSHOT/squants_2.12-1.6.0-SNAPSHOT-javadoc.jar/!/index.html#squants.package))
27+
Development Build: **1.7.0-SNAPSHOT**
28+
([API Docs](https://oss.sonatype.org/service/local/repositories/snapshots/archive/org/typelevel/squants_2.13/1.6.0-SNAPSHOT/squants_2.13-1.7.0-SNAPSHOT-javadoc.jar/!/index.html#squants.package))
2929

3030
[Release History](https://github.com/typelevel/squants/wiki/Release-History)
3131

@@ -38,10 +38,10 @@ For more information on feature availability of a specific version see the Relea
3838
Repository hosting for Squants is provided by [Sonatype](https://oss.sonatype.org/).
3939
To use Squants in your SBT project add the following dependency to your build.
4040

41-
"org.typelevel" %% "squants" % "1.5.0"
41+
"org.typelevel" %% "squants" % "1.6.0"
4242
or
4343

44-
"org.typelevel" %% "squants" % "1.6.0-SNAPSHOT"
44+
"org.typelevel" %% "squants" % "1.7.0-SNAPSHOT"
4545

4646

4747
To use Squants in your Maven project add the following dependency
@@ -50,13 +50,13 @@ To use Squants in your Maven project add the following dependency
5050
<dependency>
5151
<groupId>org.typelevel</groupId>
5252
<artifactId>squants_2.11</artifactId>
53-
<version>1.5.0</version>
53+
<version>1.6.0</version>
5454
</dependency>
5555
```
5656

5757
Beginning with Squants 0.4.x series, both Scala 2.10 and 2.11 builds are available.
58-
Beginning with Squants 1.x series, Scala 2.10, 2.11 and 2.12 builds are available.
59-
Scala.js is supported on version 0.6.28 and 1.0.0-M8
58+
Beginning with Squants 1.x series, Scala 2.11, 2.12 and 2.13 builds are available.
59+
Scala.js is supported on version 0.6.31 and 1.0.0-RC1
6060

6161
To use Squants interactively in the Scala REPL, clone the git repo and run `sbt squantsJVM/console`
6262

@@ -1205,9 +1205,9 @@ To make a release do the following:
12051205
sbt squantsNative/publishSigned
12061206
```
12071207

1208-
* Repeat for scala.js 1.0.0-M8
1208+
* Repeat for scala.js 1.0.0-RC1
12091209
```
1210-
SCALAJS_VERSION=1.0.0-M8 sbt +squantsJS/publishSigned
1210+
SCALAJS_VERSION=1.0.0-RC1 sbt +squantsJS/publishSigned
12111211
```
12121212

12131213
* Then make a release (Note: after this step the release cannot be replaced)

0 commit comments

Comments
 (0)