Skip to content
This repository has been archived by the owner. It is now read-only.

Commit 6767c6d

Browse files
committed
merge util-interface back into compiler-interface
When I split zinc and util, I needed to create util-interface because some Java classes are used by util-logging. Now that these are out of zinc, we can unite them again into a single subproject.
1 parent e889846 commit 6767c6d

File tree

6 files changed

+1
-16
lines changed

6 files changed

+1
-16
lines changed

build.sbt

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
2424
)
2525

2626
lazy val compilerInterfaceRoot = (project in file("."))
27-
.aggregate(compilerInterface, utilInterface)
27+
.aggregate(compilerInterface)
2828
.settings(
2929
publish / skip := true,
3030
crossScalaVersions := Vector(),
@@ -51,7 +51,6 @@ lazy val compilerInterfaceRoot = (project in file("."))
5151
// format from which Java sources are generated by the sbt-contraband plugin.
5252
lazy val compilerInterface = (project in file("compiler-interface"))
5353
.enablePlugins(ContrabandPlugin)
54-
.dependsOn(utilInterface)
5554
.settings(
5655
commonSettings,
5756
name := "Compiler Interface",
@@ -92,20 +91,6 @@ lazy val compilerInterface = (project in file("compiler-interface"))
9291
},
9392
)
9493

95-
lazy val utilInterface = (project in file("util-interface"))
96-
.settings(
97-
commonSettings,
98-
name := "Util Interface",
99-
mimaPreviousArtifacts := Set(
100-
"1.0.0", "1.0.1", "1.0.2", "1.0.3",
101-
"1.1.0", "1.1.1", "1.1.2", "1.1.3",
102-
"1.2.0", "1.2.1"
103-
) map (version =>
104-
organization.value %% moduleName.value % version
105-
cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled)
106-
)
107-
)
108-
10994
ThisBuild / organization := "org.scala-sbt"
11095
ThisBuild / organizationName := "sbt"
11196
ThisBuild / organizationHomepage := Some(url("https://www.scala-sbt.org/"))

0 commit comments

Comments
 (0)