You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iota.apache.org by to...@apache.org on 2016/07/11 18:47:53 UTC
incubator-iota git commit: Corrected Version -> ScalaVersion for Fey
Repository: incubator-iota
Updated Branches:
refs/heads/master f31dfc48f -> 36d489b95
Corrected Version -> ScalaVersion for Fey
Project: http://git-wip-us.apache.org/repos/asf/incubator-iota/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-iota/commit/36d489b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/36d489b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/36d489b9
Branch: refs/heads/master
Commit: 36d489b95cabcde935f2c205c4db70bb8370a369
Parents: f31dfc4
Author: tonyfaustini <to...@yahoo.com>
Authored: Mon Jul 11 11:47:46 2016 -0700
Committer: tonyfaustini <to...@yahoo.com>
Committed: Mon Jul 11 11:47:46 2016 -0700
----------------------------------------------------------------------
project/Build.scala | 2 +-
project/BuildSettings.scala | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/36d489b9/project/Build.scala
----------------------------------------------------------------------
diff --git a/project/Build.scala b/project/Build.scala
index 7c374d9..99bc430 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -32,7 +32,7 @@ object IotaBuild extends Build {
import BuildSettings._
lazy val parent = Project(
- id = "apache-incubator-iota",
+ id = "iota",
base = file("."),
aggregate = Seq(Stream, ZMQ, VirtualSensor, Fey),
settings = rootbuildSettings ++ Seq(
http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/36d489b9/project/BuildSettings.scala
----------------------------------------------------------------------
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
index 0b17f6a..1cddebe 100644
--- a/project/BuildSettings.scala
+++ b/project/BuildSettings.scala
@@ -6,7 +6,7 @@ object BuildSettings {
import Dependencies.Resolvers._
- val ParentProject = "jars_parent"
+ val ParentProject = "iota"
val Fey = "fey_core"
val Stream = "fey_stream"
val ZMQ = "fey_zmq"
@@ -41,7 +41,7 @@ object BuildSettings {
lazy val FeybuildSettings = Defaults.coreDefaultSettings ++ Seq(
name := Fey,
version := "1.0-SNAPSHOT",
- scalaVersion := Version,
+ scalaVersion := ScalaVersion,
description := "Framework of the event processing / actions engine for IOTA",
scalacOptions := Seq("-deprecation", "-unchecked", "-encoding", "utf8", "-Xlint"),
mainClass := Some("org.apache.iota.fey.Application"),