diff --git a/build.sc b/build.sc index b17a7d69bed..78ca8c3658f 100644 --- a/build.sc +++ b/build.sc @@ -100,11 +100,8 @@ trait Diplomacy def chiselIvy = Some(v.chiselCrossVersions(crossValue)._1) def chiselPluginIvy = Some(v.chiselCrossVersions(crossValue)._2) - // use CDE from source untill published to sonatype - def cdeModule = Some(cde) - - // no cde ivy currently published - def cdeIvy = None + // use CDE from source until published to sonatype + def cdeModule = cde def sourcecodeIvy = v.sourcecode } diff --git a/common.sc b/common.sc index e3f8445d9c3..d11edcc116a 100644 --- a/common.sc +++ b/common.sc @@ -42,23 +42,18 @@ trait RocketChipModule // should be hardfloat/common.sc#HardfloatModule def hardfloatModule: ScalaModule - // should be cde/common.sc#CDEModule - def cdeModule: ScalaModule - def diplomacyModule: ScalaModule - def diplomacyIvy: Option[Dep] - def mainargsIvy: Dep def json4sJacksonIvy: Dep - override def moduleDeps = super.moduleDeps ++ Seq(macrosModule, hardfloatModule, cdeModule, diplomacyModule) + override def moduleDeps = super.moduleDeps ++ Seq(macrosModule, hardfloatModule, diplomacyModule) override def ivyDeps = T( super.ivyDeps() ++ Agg( mainargsIvy, json4sJacksonIvy, - ) ++ diplomacyIvy + ) ) } diff --git a/dependencies/diplomacy b/dependencies/diplomacy index b4f93b7747e..edf375300d9 160000 --- a/dependencies/diplomacy +++ b/dependencies/diplomacy @@ -1 +1 @@ -Subproject commit b4f93b7747e59376e65e11d83982f5b865d7e6f6 +Subproject commit edf375300d99a4c260a214d7c1553de0040771d7