refactor: Move scala.scalanative.runtime.Proxy to inner package `ja…

…valib` (#3864)
scala-native · Apr 3, 2024 · 5f3e83d · 5f3e83d
1 parent 658a273
commit 5f3e83d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/javalib/src/main/scala/java/lang/Runtime.scala b/javalib/src/main/scala/java/lang/Runtime.scala
@@ -10,6 +10,7 @@ import scala.scalanative.windows.SysInfoApi._
 import scala.scalanative.windows.SysInfoApiOps._
 import scala.scalanative.unsafe._
 import scala.scalanative.meta.LinktimeInfo._
+import scala.scalanative.runtime.javalib.Proxy
 
 class Runtime private () {
   import Runtime._
@@ -31,7 +32,7 @@ class Runtime private () {
   }
 
   private def handleSignal(sig: CInt): Unit = {
-    scalanative.runtime.Proxy.disableGracefullShutdown()
+    Proxy.disableGracefullShutdown()
     Runtime.getRuntime().runHooks()
     exit(128 + sig)
   }

diff --git a/javalib/src/main/scala/java/lang/System.scala b/javalib/src/main/scala/java/lang/System.scala
@@ -6,7 +6,8 @@ import java.util.{Collections, HashMap, Map, Properties, WindowsHelperMethods}
 import scala.scalanative.posix.pwdOps._
 import scala.scalanative.posix.{pwd, unistd}
 import scala.scalanative.meta.LinktimeInfo.isWindows
-import scala.scalanative.runtime.{Proxy, Intrinsics, Platform}
+import scala.scalanative.runtime.{Intrinsics, Platform}
+import scala.scalanative.runtime.javalib.Proxy
 import scala.scalanative.ffi.time
 import scala.scalanative.unsafe._
 import scala.scalanative.unsigned._

diff --git a/javalib/src/main/scala/java/lang/Thread.scala b/javalib/src/main/scala/java/lang/Thread.scala
@@ -15,7 +15,8 @@ import scala.scalanative.runtime.NativeThread.{State => _, _}
 import scala.scalanative.runtime.NativeThread.State._
 import scala.scalanative.libc.stdatomic.{AtomicLongLong, atomic_thread_fence}
 import scala.scalanative.libc.stdatomic.memory_order._
-import scala.scalanative.runtime.{UnsupportedFeature, Proxy}
+import scala.scalanative.runtime.UnsupportedFeature
+import scala.scalanative.runtime.javalib.Proxy
 import scala.concurrent.duration._
 import scala.scalanative.concurrent.NativeExecutionContext
 

diff --git a/javalib/src/main/scala/java/lang/ThreadGroup.scala b/javalib/src/main/scala/java/lang/ThreadGroup.scala
@@ -6,7 +6,9 @@ import java.lang.Thread.UncaughtExceptionHandler
 import java.lang.ref.WeakReference
 
 import scala.annotation.tailrec
-import scala.scalanative.runtime.{NativeThread, Proxy}
+import scala.scalanative.runtime.NativeThread
+import scala.scalanative.runtime.javalib.Proxy
+
 class ThreadGroup(
     final val parent: ThreadGroup,
     final val name: String,

diff --git a/javalib/src/main/scala/java/lang/ref/WeakReferenceRegistry.scala b/javalib/src/main/scala/java/lang/ref/WeakReferenceRegistry.scala
@@ -3,15 +3,14 @@ package java.lang.ref
 import scala.scalanative.unsafe._
 import scala.scalanative.meta.LinktimeInfo.isWeakReferenceSupported
 import scala.scalanative.meta.LinktimeInfo.isMultithreadingEnabled
-import scala.scalanative.runtime.Proxy
+import scala.scalanative.runtime.javalib.Proxy
 import scala.scalanative.libc.stdatomic._
 import scala.scalanative.runtime.fromRawPtr
 import scala.scalanative.runtime.Intrinsics.classFieldRawPtr
 import scala.scalanative.annotation.alwaysinline
 import scala.util.control.NonFatal
 import java.util.concurrent.locks.LockSupport
 import scala.annotation.tailrec
-import scala.scalanative.runtime.Proxy.GCWeakReferencesCollectedCallback
 
 /* Should always be treated as a module by the compiler.
  * _gc_modified_postGCControlField is explicitly acccessed

diff --git a/...ala/scala/scalanative/runtime/Proxy.scala → ...a/scalanative/runtime/javalib/Proxy.scala b/...ala/scala/scalanative/runtime/Proxy.scala → ...a/scalanative/runtime/javalib/Proxy.scala
@@ -1,5 +1,6 @@
 package scala.scalanative
 package runtime
+package javalib
 
 import scala.scalanative.annotation.alwaysinline
 import scala.concurrent.duration.FiniteDuration