Skip to content

Commit 817e279

Browse files
committed
wip
1 parent 8b17db9 commit 817e279

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

project/Build.scala

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,9 +1177,10 @@ object Build {
11771177
(Compile / run).toTask(" -usejavacp").value
11781178
},
11791179
)
1180-
1180+
11811181
lazy val `scala3-repl-embedded` = project.in(file("repl-embedded"))
11821182
.dependsOn(`scala3-repl`)
1183+
.settings(publishSettings)
11831184
.settings(
11841185
name := "scala3-repl-embedded",
11851186
moduleName := "scala3-repl-embedded",
@@ -1200,10 +1201,12 @@ object Build {
12001201
ShadeRule.rename("com.**" -> "dotty.tools.repl.shaded.com.@1").inAll,
12011202
ShadeRule.rename("io.**" -> "dotty.tools.repl.shaded.io.@1").inAll,
12021203
ShadeRule.rename("coursier.**" -> "dotty.tools.repl.shaded.coursier.@1").inAll,
1204+
ShadeRule.rename("coursierapi.**" -> "dotty.tools.repl.shaded.coursierapi.@1").inAll,
12031205
ShadeRule.rename("dependency.**" -> "dotty.tools.repl.shaded.dependency.@1").inAll,
12041206
ShadeRule.rename("pprint.**" -> "dotty.tools.repl.shaded.pprint.@1").inAll,
12051207
ShadeRule.rename("fansi.**" -> "dotty.tools.repl.shaded.fansi.@1").inAll,
12061208
ShadeRule.rename("sourcecode.**" -> "dotty.tools.repl.shaded.sourcecode.@1").inAll,
1209+
ShadeRule.rename("xsbti.**" -> "dotty.tools.repl.shaded.xsbti.@1").inAll,
12071210
),
12081211
// Merge strategy for assembly
12091212
assembly / assemblyMergeStrategy := {
@@ -1216,6 +1219,18 @@ object Build {
12161219
},
12171220
// Don't run tests for assembly
12181221
assembly / test := {},
1222+
// Publishing configuration: publish the assembly jar instead of regular jar
1223+
Compile / packageBin := assembly.value,
1224+
Compile / packageBin / artifact := {
1225+
val art = (Compile / packageBin / artifact).value
1226+
art.withClassifier(None)
1227+
},
1228+
Compile / packageDoc / publishArtifact := false,
1229+
Compile / packageSrc / publishArtifact := true,
1230+
Test / publishArtifact := false,
1231+
publish / skip := false,
1232+
// Make assembly jar depend on packageBin in Compile scope
1233+
assembly := (assembly dependsOn (Compile / compile)).value,
12191234
)
12201235

12211236
// ==============================================================================================

repl-embedded/src/scala/tools/repl/EmbeddedReplMain.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class UnshadingClassLoader(parent: ClassLoader) extends ClassLoader(parent) {
1717
private val SHADED_PREFIX = "dotty.tools.repl.shaded."
1818

1919
// Packages that were shaded
20-
private val SHADED_PACKAGES = Seq("dotty.", "org.", "com.", "io.", "coursier.", "dependency.", "pprint.", "fansi.", "sourcecode.")
20+
private val SHADED_PACKAGES = Seq("dotty.", "org.", "com.", "io.", "coursier.", "coursierapi.", "dependency.", "pprint.", "fansi.", "sourcecode.", "xsbti.")
2121

2222
override def loadClass(name: String, resolve: Boolean): Class[?] = {
2323
// Check if this is a class from a package we shaded (and not already in the shaded package)

0 commit comments

Comments
 (0)