From 2fd96af92f9bc1396e18ed3956cb5b7c99a6eb4d Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 18 Jul 2019 18:30:47 -0700 Subject: [PATCH 1/5] bump version --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c213b16..4e9eca5 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ import ScalaModulePlugin._ scalaModuleSettings name := "scala-collection-contrib" -version := "0.1.0-SNAPSHOT" +version := "0.1.1-SNAPSHOT" scalaVersionsByJvm in ThisBuild := { val v213 = "2.13.0" From 42a3970b851b05eca030cce32a5db4cb2d074db3 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 18 Jul 2019 18:31:17 -0700 Subject: [PATCH 2/5] configure Scala versions properly the ByJvm thing is handled in admin/build.sh instead now --- build.sbt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 4e9eca5..981cf12 100644 --- a/build.sbt +++ b/build.sbt @@ -5,13 +5,7 @@ scalaModuleSettings name := "scala-collection-contrib" version := "0.1.1-SNAPSHOT" -scalaVersionsByJvm in ThisBuild := { - val v213 = "2.13.0" - Map( - 8 -> List(v213 -> true), - 11 -> List(v213 -> false), - 12 -> List(v213 -> false)) -} +crossScalaVersions in ThisBuild := Seq("2.13.0") scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds", "-deprecation", "-feature", "-Xfatal-warnings") scalacOptions in (Compile, doc) ++= Seq("-implicits", "-groups") From d4338665bd3e4c0597fec31d80dd4e501509a774 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 18 Jul 2019 18:33:15 -0700 Subject: [PATCH 3/5] add usage information to readme --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index e47a5ba..2babbd2 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,14 @@ This module provides various additions to the Scala 2.13 standard collections. +## Usage + +If you're using sbt, you can add the dependency as follows: + +``` +libraryDependencies += "org.scala-lang.modules" %% "scala-collection-contrib" % "0.1.0" +``` + ## New collection types - `MultiSet` (both mutable and immutable) From ff8f55824219c283d0754fe2e373b0ffd56fa043 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 18 Jul 2019 18:40:36 -0700 Subject: [PATCH 4/5] enable mima fixes #23 --- build.sbt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sbt b/build.sbt index 981cf12..cf2a979 100644 --- a/build.sbt +++ b/build.sbt @@ -13,6 +13,8 @@ scalacOptions in (Compile, doc) ++= Seq("-implicits", "-groups") testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a") parallelExecution in Test := false // why? +mimaPreviousVersion := Some("0.1.0") + homepage := Some(url("https://github.com/scala/scala-collection-contrib")) licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0")) From cb0bd9ad010875b9155f30f61c6a9db8e082a66c Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 18 Jul 2019 18:49:04 -0700 Subject: [PATCH 5/5] enable OSGI stuff --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index cf2a979..a7c6449 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,7 @@ import ScalaModulePlugin._ scalaModuleSettings +scalaModuleSettingsJVM name := "scala-collection-contrib" version := "0.1.1-SNAPSHOT"