Skip to content
This repository was archived by the owner on Feb 8, 2022. It is now read-only.

Commit 59354d5

Browse files
larsrhjohnynek
authored andcommitted
build for 2.13.0-M5 (#223)
* build for 2.13.0-M5 - simplify build (depend on cats-testkit directly, simplify dependencies) - drop 2.10.x build (dropped by cats) - bump dependencies * bump MiMa previous artifact to 1.0.0 * enable coverage for all versions
1 parent 27b2ce4 commit 59354d5

File tree

4 files changed

+17
-33
lines changed

4 files changed

+17
-33
lines changed

.travis.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,17 @@ sudo: false
22

33
language: scala
44

5-
scala:
6-
- 2.11.11
7-
- 2.10.6
8-
9-
env:
10-
- DEPLOY=false
11-
125
jdk:
136
- oraclejdk8
147

158
matrix:
169
include:
1710
- scala: 2.12.3
18-
jdk: oraclejdk8
1911
env: DEPLOY=true
20-
- scala: 2.13.0-M4
21-
script:
22-
# TODO https://github.com/scoverage/scalac-scoverage-plugin/issues/225
23-
- ./sbt "++${TRAVIS_SCALA_VERSION}!" coreJS/test lawsJS/test coreJVM/test lawsJVM/test
12+
- scala: 2.11.11
13+
env: DEPLOY=false
14+
- scala: 2.13.0-M5
15+
env: DEPLOY=false
2416

2517
before_install:
2618
- export PATH=${PATH}:./vendor/bundle

build.sbt

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
import sbtrelease.Utilities._
22
import ReleaseTransformations._
33
import microsites.ExtraMdFileConfig
4-
import sbtcrossproject.{crossProject, CrossType}
4+
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
55

6-
lazy val scalaCheckVersion = "1.14.0"
7-
lazy val scalaTestVersion = "3.0.6-SNAP1"
8-
lazy val disciplineVersion = "0.8"
9-
lazy val catsVersion = "1.2.0"
10-
lazy val catalystsVersion = "0.0.5"
6+
lazy val catsVersion = "1.5.0"
117

128
lazy val buildSettings = Seq(
139
organization := "org.typelevel",
1410
scalaVersion := "2.12.4",
15-
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.4", "2.13.0-M4")
11+
crossScalaVersions := Seq("2.11.12", "2.12.4", "2.13.0-M5")
1612
)
1713

1814
lazy val commonSettings = Seq(
@@ -31,7 +27,8 @@ lazy val commonSettings = Seq(
3127
"-Xfuture"
3228
) ++ (CrossVersion.partialVersion(scalaVersion.value) match {
3329
case Some((2, 10)) => Seq.empty
34-
case _ => Seq("-Ywarn-unused-import")
30+
case Some((2, v)) if v <= 12 => Seq("-Ywarn-unused-import")
31+
case _ => Seq.empty
3532
}),
3633
scalacOptions ++= {
3734
CrossVersion.partialVersion(scalaVersion.value) match {
@@ -108,7 +105,7 @@ lazy val aggregate = project.in(file("."))
108105
.aggregate(coreJS, lawsJS)
109106
.dependsOn(coreJS, lawsJS)
110107

111-
val binaryCompatibleVersion = "0.6.0"
108+
val binaryCompatibleVersion = "1.0.0"
112109

113110
/**
114111
* Empty this each time we publish a new version (and bump the minor number)
@@ -131,8 +128,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
131128
)
132129
.settings(libraryDependencies ++= Seq(
133130
"org.typelevel" %%% "cats-kernel" % catsVersion,
134-
"org.scalacheck" %%% "scalacheck" % scalaCheckVersion % "test",
135-
"org.scalatest" %%% "scalatest" % scalaTestVersion % "test"))
131+
"org.typelevel" %%% "cats-testkit" % catsVersion % "test"))
136132
.settings(algebraSettings: _*)
137133
.settings(sourceGenerators in Compile += (sourceManaged in Compile).map(Boilerplate.gen).taskValue)
138134

@@ -149,11 +145,7 @@ lazy val laws = crossProject(JSPlatform, JVMPlatform)
149145
.settings(algebraSettings: _*)
150146
.settings(libraryDependencies ++= Seq(
151147
"org.typelevel" %%% "cats-kernel-laws" % catsVersion,
152-
"org.scalacheck" %%% "scalacheck" % scalaCheckVersion,
153-
"org.typelevel" %%% "discipline" % disciplineVersion,
154-
"org.typelevel" %%% "catalysts-platform" % catalystsVersion % "test",
155-
"org.typelevel" %%% "catalysts-macros" % catalystsVersion % "test",
156-
"org.scalatest" %%% "scalatest" % scalaTestVersion % "test"))
148+
"org.typelevel" %%% "cats-testkit" % catsVersion % "test"))
157149

158150
lazy val lawsJVM = laws.jvm
159151
lazy val lawsJS = laws.js

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.1.1
1+
sbt.version=1.2.3

project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
2-
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.16")
2+
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.27")
33
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7")
44
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
55
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
66
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
7-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
7+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26")
88
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18")
9-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
9+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0-M5")
1010
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3")
11-
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
11+
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")

0 commit comments

Comments
 (0)