Skip to content
This repository was archived by the owner on Feb 8, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ language: scala
matrix:
include:
- scala: 2.10.5
script: ./sbt ++$TRAVIS_SCALA_VERSION clean test && ./sbt ++$TRAVIS_SCALA_VERSION core:mima-report-binary-issues
script: ./sbt ++$TRAVIS_SCALA_VERSION clean compile test && ./sbt ++$TRAVIS_SCALA_VERSION core:mima-report-binary-issues

- scala: 2.11.7
script: ./sbt ++$TRAVIS_SCALA_VERSION clean test && ./sbt ++$TRAVIS_SCALA_VERSION core:mima-report-binary-issues
script: ./sbt ++$TRAVIS_SCALA_VERSION clean compile test && ./sbt ++$TRAVIS_SCALA_VERSION core:mima-report-binary-issues
notifications:
irc:
channels:
Expand Down
25 changes: 14 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact

lazy val buildSettings = Seq(
organization := "org.spire-math",
scalaVersion := "2.11.7",
crossScalaVersions := Seq("2.10.5", "2.11.7")
organization := "org.typelevel",
scalaVersion := "2.11.8",
crossScalaVersions := Seq("2.10.6", "2.11.8")
)

lazy val commonSettings = Seq(
Expand All @@ -30,9 +30,13 @@ lazy val commonSettings = Seq(
case Some((2, 11)) => Seq("-Ywarn-unused-import")
case _ => Seq.empty
}),
resolvers += Resolver.sonatypeRepo("public"),
scalacOptions in (Compile, console) ~= (_ filterNot (_ == "-Ywarn-unused-import")),
scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value,
scalaJSStage in Test := FastOptStage,
scalaJSStage in Global := FastOptStage,
scalaJSUseRhino := false,
requiresDOM := false,
jsEnv := NodeJSEnv().value,
fork := false,
parallelExecution in Test := false
)
Expand Down Expand Up @@ -64,6 +68,7 @@ lazy val core = crossProject
.settings(mimaDefaultSettings: _*)
// TODO: update this to a published stable version, e.g. 0.4.0
//.settings(previousArtifact := Some("org.spire-math" %% "algebra" % "0.3.1"))
.settings(libraryDependencies += "org.typelevel" %%% "cats-kernel" % "0.6.0-M2")
.settings(algebraSettings: _*)

lazy val coreJVM = core.jvm
Expand Down Expand Up @@ -107,13 +112,11 @@ lazy val laws = crossProject
.dependsOn(core, ring, lattice, std, macros)
.settings(moduleName := "algebra-laws")
.settings(algebraSettings: _*)
.settings(
libraryDependencies ++= Seq(
"org.scalacheck" %%% "scalacheck" % "1.12.4",
"org.typelevel" %%% "discipline" % "0.4",
"org.scalatest" %%% "scalatest" % "3.0.0-M7" % "test"
)
)
.settings(libraryDependencies ++= Seq(
"org.typelevel" %%% "cats-kernel-laws" % "0.6.0-M2",
"org.scalacheck" %%% "scalacheck" % "1.12.4",
"org.typelevel" %%% "discipline" % "0.4",
"org.scalatest" %%% "scalatest" % "3.0.0-M7" % "test"))

lazy val lawsJVM = laws.jvm
lazy val lawsJS = laws.js
Expand Down
18 changes: 0 additions & 18 deletions core/src/main/scala/algebra/Band.scala

This file was deleted.

13 changes: 0 additions & 13 deletions core/src/main/scala/algebra/BoundedSemilattice.scala

This file was deleted.

17 changes: 0 additions & 17 deletions core/src/main/scala/algebra/CommutativeGroup.scala

This file was deleted.

17 changes: 0 additions & 17 deletions core/src/main/scala/algebra/CommutativeMonoid.scala

This file was deleted.

18 changes: 0 additions & 18 deletions core/src/main/scala/algebra/CommutativeSemigroup.scala

This file was deleted.

138 changes: 0 additions & 138 deletions core/src/main/scala/algebra/Eq.scala

This file was deleted.

48 changes: 0 additions & 48 deletions core/src/main/scala/algebra/Group.scala

This file was deleted.

52 changes: 0 additions & 52 deletions core/src/main/scala/algebra/Monoid.scala

This file was deleted.

Loading