From 92c4b3d41e06ad4b89004212c85248e9e6cd61d7 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Mon, 16 May 2016 15:28:59 -0700
Subject: Move project to `ch.jodersky` and upgrade sbt-jni

---
 project/Dependencies.scala |  4 ++--
 project/FlowBuild.scala    |  9 ++++++---
 project/Release.scala      | 14 ++++----------
 project/plugins.sbt        |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

(limited to 'project')

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index a96a97d..ce1a6b1 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -4,8 +4,8 @@ import sbt._
 
 object Dependencies {
 
-  val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.4"
+  val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.7"
 
-  val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.4.4"
+  val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.4.7"
 
 }
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala
index 8600e49..3a31723 100644
--- a/project/FlowBuild.scala
+++ b/project/FlowBuild.scala
@@ -12,7 +12,7 @@ object FlowBuild extends Build {
     scalaVersion in ThisBuild := scalaVersions.head,
     crossScalaVersions in ThisBuild := scalaVersions.reverse,
     scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-target:jvm-1.8"),
-    organization := "com.github.jodersky",
+    organization := "ch.jodersky",
     licenses := Seq(("BSD New", url("http://opensource.org/licenses/BSD-3-Clause"))),
     homepage := Some(url("https://jodersky.github.io/flow")),
     pomIncludeRepository := { _ => false },
@@ -33,11 +33,14 @@ object FlowBuild extends Build {
   lazy val root = (project in file(".")).
     aggregate(core, native, stream)
 
-  lazy val core = (project in file("flow-core"))
+  lazy val core = (project in file("flow-core")).
+    settings(name:= "flow-core")
 
-  lazy val native = (project in file("flow-native"))
+  lazy val native = (project in file("flow-native")).
+    settings(name:= "flow-native")
 
   lazy val stream = (project in file("flow-stream")).
+    settings(name:= "flow-stream").
     dependsOn(core)
 
   lazy val samplesTerminal = (project in file("flow-samples") / "terminal").
diff --git a/project/Release.scala b/project/Release.scala
index 3a1a670..d1a188d 100644
--- a/project/Release.scala
+++ b/project/Release.scala
@@ -6,7 +6,7 @@ import sbtrelease.ReleasePlugin.autoImport._
 import sbtrelease.ReleaseStateTransformations._
 
 import ch.jodersky.sbt.jni.plugins.JniNative.autoImport._
-import ch.jodersky.sbt.jni.plugins.JniPackaging.autoImport._
+import ch.jodersky.sbt.jni.plugins.JniPackage.autoImport._
 
 import com.typesafe.sbt.pgp.PgpKeys._
 
@@ -90,19 +90,13 @@ object Release {
     val (st1, libs) = extracted.runTask(unmanagedNativeLibraries in project in Compile, st0)
 
     log.info("The following native libraries will be packaged:")
-    log.info("Kernel\tArchitecture\tFile")
     log.info("---------------------")
-    libs.toSeq.sortBy(_._1.id).foreach{ case (platform, file) =>
-      log.info(platform.kernel + "\t" + platform.arch + "\t" + file.getAbsolutePath)
-    }
-
-    val currentPlatform = extracted.get(nativePlatform in project in Compile)
-    if (!libs.contains(currentPlatform)) {
-      log.warn("Native library for the current platform does not exist! It will not be released.")
+    libs.toSeq.sortBy(_._2).foreach{ case (file, path) =>
+      log.info(path)
     }
     SimpleReader.readLine("Are the all native libraries listed (y/n)? [n] ") match {
       case Some("y") => //do nothing
-      case _ => sys.error("Mssing native libaries. Aborting release.")
+      case _ => sys.error("Missing native libaries. Aborting release.")
     }
     st1
   })
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 031aa44..4eb4ab5 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -5,7 +5,7 @@
 resolvers += Resolver.jcenterRepo
 
 // Build, package and load native libraries
-addSbtPlugin("ch.jodersky" % "sbt-jni" % "0.4.4")
+addSbtPlugin("ch.jodersky" % "sbt-jni" % "1.1.0")
 
 /*
  * Utility plugins, can be disabled during plain build
-- 
cgit v1.2.3