From 480f4b09a1a222368609771086176caabc6aad28 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Sun, 5 Jun 2016 21:52:43 -0700
Subject: Generate documentation

---
 project/Bintray.scala.notyet | 68 --------------------------------------------
 project/FlowBuild.scala      | 49 +++++++------------------------
 project/Release.scala        |  1 -
 project/plugins.sbt          |  8 ++----
 4 files changed, 13 insertions(+), 113 deletions(-)
 delete mode 100644 project/Bintray.scala.notyet

(limited to 'project')

diff --git a/project/Bintray.scala.notyet b/project/Bintray.scala.notyet
deleted file mode 100644
index 5ed9953..0000000
--- a/project/Bintray.scala.notyet
+++ /dev/null
@@ -1,68 +0,0 @@
-package flow
-
-import sbt._
-import sbt.Keys._
-import ch.jodersky.sbt.jni.plugins.JniPackaging
-import ch.jodersky.sbt.jni.plugins.JniPackaging.autoImport._
-import bintray._
-import bintray.BintrayPlugin.autoImport._
-
-/** Custom bintray tasks. */
-object CustomBintray extends AutoPlugin {
-
-  override def requires = JniPackaging && BintrayPlugin
-  override def trigger = allRequirements
-
-  object autoImport {
-
-    val unmanagedNativeZip = taskKey[File](
-      "Packages unmanaged native libraries in a zip file."
-    )
-
-    val publishNativeZip = taskKey[Unit](
-      "Signs and publishes native zip files to a generic bintray repository."
-    )
-
-  }
-  import autoImport._
-
-  lazy val settings: Seq[Setting[_]] = Seq(
-
-    unmanagedNativeZip := {
-      val out = target.value / (name.value + "-native.zip")
-
-      val files: Seq[File] = unmanagedNativeDirectories.value flatMap {dir =>
-        (dir ** "*").get.filter(_.isFile)
-      }
-      val baseDirectories: Seq[File] = unmanagedNativeDirectories.value
-
-      val mappings: Seq[(File,String)] = files pair Path.relativeTo(baseDirectories)
-
-      IO.zip(mappings, out)
-      out
-    },
-
-
-    publishNativeZip := {
-      val credsFile = bintrayCredentialsFile.value
-      val btyOrg = bintrayOrganization.value
-      val repoName = "generic"
-
-      val zip = unmanagedNativeZip.value
-
-      Bintray.withRepo(credsFile, btyOrg, repoName, prompt = false) { repo =>
-        repo.upload(
-          "flow",
-          version.value,
-          zip.name,
-          zip,
-          streams.value.log
-        )
-      }
-    }
-
-  )
-
-  override def projectSettings = inConfig(Compile)(settings)
-
-}
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala
index 05f2161..8600e49 100644
--- a/project/FlowBuild.scala
+++ b/project/FlowBuild.scala
@@ -30,50 +30,23 @@ object FlowBuild extends Build {
     }
   )
 
-  lazy val root: Project = (
-    Project("root", file("."))
+  lazy val root = (project in file(".")).
     aggregate(core, native, stream)
-    settings(commonSettings: _*)
-    settings(
-      publishArtifact := false,
-      publish := (),
-      publishLocal := (),
-      publishTo := Some(Resolver.file("Unused transient repository", target.value / "unusedrepo")) // make sbt-pgp happy
-    )
-  )
 
-  lazy val core = Project(
-    id = "flow-core",
-    base = file("flow-core")
-  )
+  lazy val core = (project in file("flow-core"))
 
-  lazy val native = Project(
-    id = "flow-native",
-    base = file("flow-native")
-  )
+  lazy val native = (project in file("flow-native"))
 
-  lazy val stream = Project(
-    id = "flow-stream",
-    base = file("flow-stream"),
-    dependencies = Seq(core)
-  )
+  lazy val stream = (project in file("flow-stream")).
+    dependsOn(core)
 
-  lazy val samplesTerminal = Project(
-    id = "samples-terminal",
-    base = file("flow-samples") / "terminal",
-    dependencies = Seq(core, native % Runtime)
-  )
+  lazy val samplesTerminal = (project in file("flow-samples") / "terminal").
+    dependsOn(core, native % Runtime)
 
-  lazy val samplesTerminalStream = Project(
-    id = "samples-terminal-stream",
-    base = file("flow-samples") / "terminal-stream",
-    dependencies = Seq(stream, native % Runtime)
-  )
+  lazy val samplesTerminalStream = (project in file("flow-samples") / "terminal-stream").
+    dependsOn(stream, native % Runtime)
 
-  lazy val samplesWatcher = Project(
-    id = "samples-watcher",
-    base = file("flow-samples") / "watcher",
-    dependencies = Seq(core, native % Runtime)
-  )
+  lazy val samplesWatcher = (project in file("flow-samples") / "watcher").
+    dependsOn(core, native % Runtime)
 
 }
diff --git a/project/Release.scala b/project/Release.scala
index aef3ec8..3a1a670 100644
--- a/project/Release.scala
+++ b/project/Release.scala
@@ -68,7 +68,6 @@ object Release {
       //Push all changes (commits and tags) to GitHub
       pushChanges
 
-      //TODO: release artifact on bintray
     )
   )
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index ff1f6d5..031aa44 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -10,15 +10,11 @@ addSbtPlugin("ch.jodersky" % "sbt-jni" % "0.4.4")
 /*
  * Utility plugins, can be disabled during plain build
  */
-
 // Generate documentation for all sources
 addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3")
 
-// Build website
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.2")
-
-// Integrate website with GitHub pages
-addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.4")
+// Generate website content
+addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.0.0")
 
 // Automate release process
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.0")
-- 
cgit v1.2.3