Merge pull request #3583 from chipsalliance/diplomacy-bump

bump diplomacy and switch to diplomacy/master

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
 }

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
+    )
   )
 }