From ed12ebc5ccf225904067bfd0d6a033ef5c54fcf5 Mon Sep 17 00:00:00 2001
From: Adrien Piquerez <adrien.piquerez@gmail.com>
Date: Wed, 27 Mar 2024 14:40:45 +0100
Subject: [PATCH] fix test/scala-instance-classloader

---
 .../tests/scala-instance-classloader/build.sbt    | 15 ++++++++-------
 .../tests/scala-instance-classloader/pending      |  1 -
 .../tests/scala-instance-classloader/test         |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 sbt-app/src/sbt-test/tests/scala-instance-classloader/pending
 create mode 100644 sbt-app/src/sbt-test/tests/scala-instance-classloader/test

diff --git a/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt b/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt
index 6dde312bb..ce5ebab94 100644
--- a/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt
+++ b/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt
@@ -11,19 +11,20 @@ lazy val root = (project in file("."))
     libraryDependencies += {
       "org.scala-lang" % "scala-compiler" % scalaVersion.value % OtherScala.name 
     },
-    OtherScala / managedClasspath := Classpaths.managedJars(OtherScala, classpathTypes.value, update.value),
+    OtherScala / managedClasspath := 
+      Classpaths.managedJars(OtherScala, classpathTypes.value, update.value, fileConverter.value),
 
     // Hack in the scala instance
     scalaInstance := {
-      val rawJars = (OtherScala / managedClasspath).value.map(_.data)
+      val converter = fileConverter.value
+      val rawJars = (OtherScala / managedClasspath).value.map(c => converter.toPath(c.data).toFile)
       val scalaHome = (target.value / "scala-home")
-      def removeVersion(name: String): String =
-        name.replaceAll("\\-2.12.11", "")
+      val sv = scalaVersion.value
+      def removeVersion(name: String): String = name.replaceAll(s"\\-$sv", "")
       for(jar <- rawJars) {
-        val tjar = scalaHome / s"lib/${removeVersion(jar.getName)}"
-        IO.copyFile(jar, tjar)
+        IO.copyFile(jar, scalaHome / s"lib" / removeVersion(jar.getName))
       }
-      IO.listFiles(scalaHome).foreach(f => System.err.println(s" * $f}"))
+      IO.listFiles(scalaHome / "lib").foreach(f => System.err.println(s" * $f"))
       ScalaInstance(scalaHome, appConfiguration.value.provider.scalaProvider.launcher)
     },
 
diff --git a/sbt-app/src/sbt-test/tests/scala-instance-classloader/pending b/sbt-app/src/sbt-test/tests/scala-instance-classloader/pending
deleted file mode 100644
index a270b7b48..000000000
--- a/sbt-app/src/sbt-test/tests/scala-instance-classloader/pending
+++ /dev/null
@@ -1 +0,0 @@
-> test
\ No newline at end of file
diff --git a/sbt-app/src/sbt-test/tests/scala-instance-classloader/test b/sbt-app/src/sbt-test/tests/scala-instance-classloader/test
new file mode 100644
index 000000000..dfffb838b
--- /dev/null
+++ b/sbt-app/src/sbt-test/tests/scala-instance-classloader/test
@@ -0,0 +1 @@
+> test