From 683c40ff786996c4b6f23cbc16fe2afb90dbe05f Mon Sep 17 00:00:00 2001 From: Matt Hicks Date: Thu, 18 Jan 2018 11:17:48 -0600 Subject: [PATCH] Updated to support latest Sonatype SBT plugin. --- README.md | 8 ++++++-- build.sbt | 9 ++++++++- project/plugins.sbt | 2 +- sonatype.sbt | 23 ----------------------- 4 files changed, 15 insertions(+), 27 deletions(-) delete mode 100644 sonatype.sbt diff --git a/README.md b/README.md index e39187c..6a88b6b 100644 --- a/README.md +++ b/README.md @@ -31,13 +31,13 @@ reactify is published to Sonatype OSS and Maven Central currently supporting Sca Configuring the dependency in SBT simply requires: ``` -libraryDependencies += "com.outr" %% "reactify" % "2.2.0" +libraryDependencies += "com.outr" %% "reactify" % "2.3.0" ``` or for Scala.js / Scala Native / cross-building: ``` -libraryDependencies += "com.outr" %%% "reactify" % "2.2.0" +libraryDependencies += "com.outr" %%% "reactify" % "2.3.0" ``` ## Concepts @@ -276,6 +276,10 @@ We need implicits to be able to convert between the two, but now changes to one ## Versions +### Features for 2.3.0 (Released 2018.01.18) + +* [X] Cross-compile for Scala Native + ### Features for 2.2.0 (Released 2017.09.10) * [X] Refactoring of Listener to Observer for better naming convention (breaking changes) diff --git a/build.sbt b/build.sbt index 1dd5fe7..160affe 100644 --- a/build.sbt +++ b/build.sbt @@ -2,10 +2,16 @@ import sbtcrossproject.{crossProject, CrossType} name in ThisBuild := "reactify" organization in ThisBuild := "com.outr" -version in ThisBuild := "2.2.0" +version in ThisBuild := "2.3.0-SNAPSHOT" scalaVersion in ThisBuild := "2.12.4" crossScalaVersions in ThisBuild := List("2.12.4", "2.11.12", "2.13.0-M2") +publishTo in ThisBuild := sonatypePublishTo.value +sonatypeProfileName in ThisBuild := "com.outr" +publishMavenStyle in ThisBuild := true +licenses in ThisBuild := Seq("MIT" -> url("https://github.com/outr/reactify/blob/master/LICENSE")) +sonatypeProjectHosting in ThisBuild := Some(xerial.sbt.Sonatype.GithubHosting("outr", "reactify", "matt@outr.com")) + lazy val reactify = crossProject(JVMPlatform, JSPlatform, NativePlatform) .crossType(CrossType.Pure) .in(file(".")) @@ -25,6 +31,7 @@ lazy val reactifyNative = reactify.native lazy val tests = crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Pure) .dependsOn(reactify) .settings( + name := "reactify-tests", libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.4" % Test, publish := {}, publishLocal := {}, diff --git a/project/plugins.sbt b/project/plugins.sbt index 65664cf..6e9631f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ resolvers += "Typesafe Repository" at "https://repo.typesafe.com/typesafe/releas addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.1") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.11") addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.3.0") diff --git a/sonatype.sbt b/sonatype.sbt deleted file mode 100644 index 7e8c176..0000000 --- a/sonatype.sbt +++ /dev/null @@ -1,23 +0,0 @@ -sonatypeProfileName := "com.outr" - -pomExtra in Global := { - https://github.com/outr/reactify - - - MIT - https://raw.githubusercontent.com/outr/reactify/master/LICENSE - - - - scm:git:github.com/outr/reactify - scm:git:git@github.com:outr/reactify - github.com/outr/reactify - - - - darkfrog - Matt Hicks - http://matthicks.com - - -} \ No newline at end of file