Remove internal package object

mzuehlke · Apr 9, 2022 · 9ea90ef · 9ea90ef
1 parent ee265eb
commit 9ea90ef
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/munit/js/src/main/scala/munit/internal/PlatformCompat.scala b/munit/js/src/main/scala/munit/internal/PlatformCompat.scala
@@ -75,4 +75,8 @@ object PlatformCompat {
   private var myClassLoader: ClassLoader = _
   def setThisClassLoader(loader: ClassLoader): Unit = myClassLoader = loader
   def getThisClassLoader: ClassLoader = myClassLoader
+
+  type InvocationTargetException = munit.internal.InvocationTargetException
+  type UndeclaredThrowableException =
+    munit.internal.UndeclaredThrowableException
 }
diff --git a/munit/jvm/src/main/scala/munit/internal/PlatformCompat.scala b/munit/jvm/src/main/scala/munit/internal/PlatformCompat.scala
@@ -69,4 +69,8 @@ object PlatformCompat {
   def isJS: Boolean = false
   def isNative: Boolean = false
   def getThisClassLoader: ClassLoader = this.getClass().getClassLoader()
+
+  type InvocationTargetException = java.lang.reflect.InvocationTargetException
+  type UndeclaredThrowableException =
+    java.lang.reflect.UndeclaredThrowableException
 }
diff --git a/munit/jvm/src/main/scala/munit/internal/package.scala b/munit/jvm/src/main/scala/munit/internal/package.scala
diff --git a/munit/native/src/main/scala/munit/internal/PlatformCompat.scala b/munit/native/src/main/scala/munit/internal/PlatformCompat.scala
@@ -56,4 +56,8 @@ object PlatformCompat {
   private var myClassLoader: ClassLoader = _
   def setThisClassLoader(loader: ClassLoader): Unit = myClassLoader = loader
   def getThisClassLoader: ClassLoader = myClassLoader
+
+  type InvocationTargetException = java.lang.reflect.InvocationTargetException
+  type UndeclaredThrowableException =
+    java.lang.reflect.UndeclaredThrowableException
 }
diff --git a/munit/native/src/main/scala/munit/internal/package.scala b/munit/native/src/main/scala/munit/internal/package.scala
diff --git a/munit/shared/src/main/scala/munit/MUnitRunner.scala b/munit/shared/src/main/scala/munit/MUnitRunner.scala
@@ -1,9 +1,9 @@
 package munit
 
 import munit.internal.FutureCompat._
-import munit.internal.InvocationTargetException
+import munit.internal.PlatformCompat.InvocationTargetException
 import munit.internal.PlatformCompat
-import munit.internal.UndeclaredThrowableException
+import munit.internal.PlatformCompat.UndeclaredThrowableException
 import munit.internal.console.Printers
 import munit.internal.console.StackTraces
 import munit.internal.junitinterface.Configurable