From aeb6c0da406586d059f21b5d314333a29b4f038d Mon Sep 17 00:00:00 2001
From: JingZhang Chen <iRoiocam@gmail.com>
Date: Fri, 26 Jan 2024 10:15:24 +0800
Subject: [PATCH] Fix JDK9 plugin when using OSGi

---
 project/Jdk9.scala | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/project/Jdk9.scala b/project/Jdk9.scala
index b40b29c535..6573e2088b 100644
--- a/project/Jdk9.scala
+++ b/project/Jdk9.scala
@@ -52,7 +52,10 @@ object Jdk9 extends AutoPlugin {
     // so we add them to the fullClasspath instead.
     //    Compile / packageBin / mappings
     //      ++= (CompileJdk9 / products).value.flatMap(Path.allSubpaths),
-    Compile / fullClasspath ++= (CompileJdk9 / exportedProducts).value)
+    // After sbt-osgi 0.9.5, there not use fullClasspath as package source, so we have to
+    // add jdk9 products to dependencyClasspathAsJars instead.
+    //    Compile / fullClasspath ++= (CompileJdk9 / exportedProducts).value)
+    Compile / dependencyClasspathAsJars ++= (CompileJdk9 / exportedProducts).value)
 
   lazy val testSettings = Seq((Test / test) := {
     (Test / test).value