Merge pull request #501 from InterestingLab/rickyhuo.v1.config

Rickyhuo.v1.config

build.sbt

@@ -1,5 +1,5 @@
 name         := "Waterdrop"
-version      := "1.4.3"
+version      := "1.5.0"
 organization := "io.github.interestinglab.waterdrop"
 
 scalaVersion := "2.11.8"

project/Build.scala

@@ -4,13 +4,16 @@ import Keys._
 object WaterDropBuild extends Build {
 
   lazy val root = Project(id="waterdrop",
-    base=file(".")) aggregate(apis, core, doctor) dependsOn(core, doctor)
+    base=file(".")) aggregate(apis, core, doctor, config) dependsOn(core, doctor)
+
+  lazy val config = Project(id="waterdrop-config",
+    base=file("waterdrop-config"))
 
   lazy val apis = Project(id="waterdrop-apis",
-    base=file("waterdrop-apis"))
+    base=file("waterdrop-apis")) dependsOn(config)
 
   lazy val core = Project(id="waterdrop-core",
-    base=file("waterdrop-core")) dependsOn(apis)
+    base=file("waterdrop-core")) dependsOn(apis, config)
 
   lazy val doctor = Project(id="waterdrop-doctor",
     base=file("doctor"))

waterdrop-apis/build.sbt

@@ -1,5 +1,5 @@
 name         := "Waterdrop-apis"
-version      := "1.4.0"
+version      := "1.5.0"
 organization := "io.github.interestinglab.waterdrop"
 
 scalaVersion := "2.11.8"
@@ -32,7 +32,6 @@ providedDeps match {
 
 // We forked and modified code of Typesafe config, the jar in unmanagedJars is packaged by InterestingLab
 // Project: https://github.com/InterestingLab/config
-unmanagedJars in Compile += file("lib/config-1.3.3-SNAPSHOT.jar")
 
 libraryDependencies ++= Seq(
 )

waterdrop-apis/src/main/scala/io/github/interestinglab/waterdrop/apis/Plugin.scala

@@ -1,6 +1,6 @@
 package io.github.interestinglab.waterdrop.apis
 
-import com.typesafe.config.Config
+import io.github.interestinglab.waterdrop.config.Config
 import org.apache.spark.internal.Logging
 import org.apache.spark.sql.SparkSession