Skip to content

Commit

Permalink
Fix dependencies on library-manager (#12419)
Browse files Browse the repository at this point in the history
* Fix deps on `library-manager`

Only tests should depend on logging setup, for test purposes.
Fixes ClassNotFoundException:
```
[info] LibraryDownloadTest:
[info] DownloadingLibraryCache
SLF4J(I): Attempting to load provider "org.enso.logging.service.logback.test.provider.TestLogProvider" specified via "slf4j.provider" system propertyTests 0s
SLF4J(E): Failed to instantiate the specified SLF4JServiceProvider (org.enso.logging.service.logback.test.provider.TestLogProvider)
SLF4J(E): Reported exception:
java.lang.ClassNotFoundException: org.enso.logging.service.logback.test.provider.TestLogProvider
	at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:641)
	at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:188)
	at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:526)
	at org.slf4j.LoggerFactory.loadExplicitlySpecified(LoggerFactory.java:226)
	at org.slf4j.LoggerFactory.findServiceProviders(LoggerFactory.java:122)
```

* Drop `library-manager-test`

Replaced by setting dependencies between projects appropriately using
classifiers.
  • Loading branch information
hubertp authored Mar 5, 2025
1 parent 0ba5341 commit 048dea5
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 41 deletions.
51 changes: 10 additions & 41 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ lazy val enso = (project in file("."))
`language-server-deps-wrapper`,
launcher,
`library-manager`,
`library-manager-test`,
`locking-test-helper`,
`logging-config`,
`logging-service`,
Expand Down Expand Up @@ -2499,7 +2498,7 @@ lazy val `language-server` = (project in file("engine/language-server"))
.dependsOn(filewatcher)
.dependsOn(testkit % Test)
.dependsOn(`logging-service-logback` % "test->test")
.dependsOn(`library-manager-test` % Test)
.dependsOn(`library-manager` % "test->test")
.dependsOn(`runtime-version-manager-test` % Test)
.dependsOn(`ydoc-polyfill`)

Expand Down Expand Up @@ -4478,7 +4477,7 @@ lazy val `edition-updater` = project
.dependsOn(editions)
.dependsOn(downloader)
.dependsOn(`distribution-manager`)
.dependsOn(`library-manager-test` % Test)
.dependsOn(`library-manager` % "test->test")

lazy val `edition-uploader` = project
.in(file("lib/scala/edition-uploader"))
Expand Down Expand Up @@ -4518,50 +4517,20 @@ lazy val `library-manager` = project
(`logging-utils` / Compile / exportedModule).value,
(`scala-libs-wrapper` / Compile / exportedModule).value,
(`scala-yaml` / Compile / exportedModule).value
)
),
commands += WithDebugCommand.withDebug,
Test / javaOptions ++= testLogProviderOptions,
Test / test := (Test / test).tag(simpleLibraryServerTag).value,
Test / fork := true
)
.dependsOn(`version-output`) // Note [Default Editions]
.dependsOn(editions)
.dependsOn(cli)
.dependsOn(`distribution-manager`)
.dependsOn(downloader)
.dependsOn(testkit % Test)

lazy val `library-manager-test` = project
.in(file("lib/scala/library-manager-test"))
.enablePlugins(JPMSPlugin)
.configs(Test)
.settings(
frgaalJavaCompilerSetting,
scalaModuleDependencySetting,
compileOrder := CompileOrder.ScalaThenJava,
Test / fork := true,
commands += WithDebugCommand.withDebug,
Test / javaOptions ++= testLogProviderOptions,
Test / test := (Test / test).tag(simpleLibraryServerTag).value,
libraryDependencies ++= Seq(
"com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion,
"org.scalatest" %% "scalatest" % scalatestVersion % Test
),
Compile / internalModuleDependencies := Seq(
(`library-manager` / Compile / exportedModule).value,
(`cli` / Compile / exportedModule).value,
(`distribution-manager` / Compile / exportedModule).value,
(`library-manager` / Compile / exportedModule).value,
(`process-utils` / Compile / exportedModule).value,
(`pkg` / Compile / exportedModule).value,
(`semver` / Compile / exportedModule).value,
(`downloader` / Compile / exportedModule).value,
(`editions` / Compile / exportedModule).value,
(`version-output` / Compile / exportedModule).value,
(`testkit` / Compile / exportedModule).value
)
)
.dependsOn(`library-manager`)
.dependsOn(`process-utils`)
.dependsOn(`logging-utils`)
.dependsOn(testkit)
.dependsOn(`logging-service-logback` % Test)
.dependsOn(testkit % "test->test")
.dependsOn(`process-utils` % "test->compile")
.dependsOn(`logging-service-logback` % "test->test")

lazy val `connected-lock-manager` = project
.in(file("lib/scala/connected-lock-manager"))
Expand Down

0 comments on commit 048dea5

Please sign in to comment.