Remove unnecessary package name usage (#319)

05nelsonm · Jan 5, 2024 · dcd20ec · dcd20ec
1 parent c88eaaa
commit dcd20ec
Show file tree

Hide file tree

Showing 27 changed files with 472 additions and 470 deletions.
diff --git a/library/runtime-api/api/runtime-api.api b/library/runtime-api/api/runtime-api.api
diff --git a/...n/kmp/tor/runtime/api/config/TorConfig.kt → ...ewnelson/kmp/tor/runtime/api/TorConfig.kt b/...n/kmp/tor/runtime/api/config/TorConfig.kt → ...ewnelson/kmp/tor/runtime/api/TorConfig.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Matthew Nelson
+ * Copyright (c) 2024 Matthew Nelson
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,25 +15,23 @@
  **/
 @file:Suppress("ClassName", "FunctionName")
 
-package io.matthewnelson.kmp.tor.runtime.api.config
+package io.matthewnelson.kmp.tor.runtime.api
 
 import io.matthewnelson.kmp.file.*
 import io.matthewnelson.kmp.tor.core.api.annotation.InternalKmpTorApi
 import io.matthewnelson.kmp.tor.core.api.annotation.KmpTorDsl
 import io.matthewnelson.kmp.tor.core.resource.immutableSetOf
 import io.matthewnelson.kmp.tor.core.resource.toImmutableMap
 import io.matthewnelson.kmp.tor.core.resource.toImmutableSet
-import io.matthewnelson.kmp.tor.runtime.api.ThisBlock
-import io.matthewnelson.kmp.tor.runtime.api.apply
 import io.matthewnelson.kmp.tor.runtime.api.address.IPAddress
 import io.matthewnelson.kmp.tor.runtime.api.address.IPAddress.V4.Companion.toIPAddressV4
 import io.matthewnelson.kmp.tor.runtime.api.address.IPAddress.V6.Companion.toIPAddressV6
 import io.matthewnelson.kmp.tor.runtime.api.address.Port
-import io.matthewnelson.kmp.tor.runtime.api.config.TorConfig.Keyword.Attribute
-import io.matthewnelson.kmp.tor.runtime.api.config.TorConfig.LineItem.Companion.toLineItem
-import io.matthewnelson.kmp.tor.runtime.api.config.TorConfig.Setting.Companion.filterByAttribute
-import io.matthewnelson.kmp.tor.runtime.api.config.TorConfig.Setting.Companion.filterByKeyword
-import io.matthewnelson.kmp.tor.runtime.api.config.builders.*
+import io.matthewnelson.kmp.tor.runtime.api.TorConfig.Keyword.Attribute
+import io.matthewnelson.kmp.tor.runtime.api.TorConfig.LineItem.Companion.toLineItem
+import io.matthewnelson.kmp.tor.runtime.api.TorConfig.Setting.Companion.filterByAttribute
+import io.matthewnelson.kmp.tor.runtime.api.TorConfig.Setting.Companion.filterByKeyword
+import io.matthewnelson.kmp.tor.runtime.api.builder.*
 import io.matthewnelson.kmp.tor.runtime.api.internal.IsAndroidHost
 import io.matthewnelson.kmp.tor.runtime.api.internal.IsUnixLikeHost
 import io.matthewnelson.kmp.tor.runtime.api.internal.toByte

diff --git a/...son/kmp/tor/runtime/api/event/TorEvent.kt → ...hewnelson/kmp/tor/runtime/api/TorEvent.kt b/...son/kmp/tor/runtime/api/event/TorEvent.kt → ...hewnelson/kmp/tor/runtime/api/TorEvent.kt
@@ -15,12 +15,11 @@
  **/
 @file:Suppress("SpellCheckingInspection")
 
-package io.matthewnelson.kmp.tor.runtime.api.event
+package io.matthewnelson.kmp.tor.runtime.api
 
 import io.matthewnelson.kmp.tor.core.api.annotation.InternalKmpTorApi
 import io.matthewnelson.kmp.tor.core.resource.SynchronizedObject
 import io.matthewnelson.kmp.tor.core.resource.synchronized
-import io.matthewnelson.kmp.tor.runtime.api.ItBlock
 import kotlin.jvm.JvmField
 
 /**

diff --git a/...i/config/builders/IsolationFlagBuilder.kt → ...ntime/api/builder/IsolationFlagBuilder.kt b/...i/config/builders/IsolationFlagBuilder.kt → ...ntime/api/builder/IsolationFlagBuilder.kt
@@ -15,7 +15,7 @@
  **/
 @file:Suppress("FunctionName", "PropertyName")
 
-package io.matthewnelson.kmp.tor.runtime.api.config.builders
+package io.matthewnelson.kmp.tor.runtime.api.builder
 
 import io.matthewnelson.kmp.tor.core.api.annotation.InternalKmpTorApi
 import io.matthewnelson.kmp.tor.core.api.annotation.KmpTorDsl

diff --git a/...e/api/config/builders/SocksFlagBuilder.kt → ...r/runtime/api/builder/SocksFlagBuilder.kt b/...e/api/config/builders/SocksFlagBuilder.kt → ...r/runtime/api/builder/SocksFlagBuilder.kt
@@ -15,12 +15,12 @@
  **/
 @file:Suppress("FunctionName", "PropertyName")
 
-package io.matthewnelson.kmp.tor.runtime.api.config.builders
+package io.matthewnelson.kmp.tor.runtime.api.builder
 
 import io.matthewnelson.kmp.tor.core.api.annotation.KmpTorDsl
 import io.matthewnelson.kmp.tor.runtime.api.ThisBlock
 import io.matthewnelson.kmp.tor.runtime.api.apply
-import io.matthewnelson.kmp.tor.runtime.api.config.TorConfig
+import io.matthewnelson.kmp.tor.runtime.api.TorConfig
 import kotlin.jvm.JvmField
 import kotlin.jvm.JvmSynthetic
 

diff --git a/...ime/api/config/builders/TCPPortBuilder.kt → ...tor/runtime/api/builder/TCPPortBuilder.kt b/...ime/api/config/builders/TCPPortBuilder.kt → ...tor/runtime/api/builder/TCPPortBuilder.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config.builders
+package io.matthewnelson.kmp.tor.runtime.api.builder
 
 import io.matthewnelson.kmp.tor.core.api.annotation.InternalKmpTorApi
 import io.matthewnelson.kmp.tor.core.api.annotation.KmpTorDsl
 import io.matthewnelson.kmp.tor.runtime.api.ThisBlock
 import io.matthewnelson.kmp.tor.runtime.api.address.Port
 import io.matthewnelson.kmp.tor.runtime.api.apply
-import io.matthewnelson.kmp.tor.runtime.api.config.TorConfig
+import io.matthewnelson.kmp.tor.runtime.api.TorConfig
 import kotlin.jvm.JvmField
 import kotlin.jvm.JvmName
 import kotlin.jvm.JvmSynthetic

diff --git a/...me/api/config/builders/UnixFlagBuilder.kt → ...or/runtime/api/builder/UnixFlagBuilder.kt b/...me/api/config/builders/UnixFlagBuilder.kt → ...or/runtime/api/builder/UnixFlagBuilder.kt
@@ -15,13 +15,13 @@
  **/
 @file:Suppress("FunctionName", "PropertyName")
 
-package io.matthewnelson.kmp.tor.runtime.api.config.builders
+package io.matthewnelson.kmp.tor.runtime.api.builder
 
 import io.matthewnelson.kmp.tor.core.api.annotation.InternalKmpTorApi
 import io.matthewnelson.kmp.tor.core.api.annotation.KmpTorDsl
 import io.matthewnelson.kmp.tor.runtime.api.ThisBlock
 import io.matthewnelson.kmp.tor.runtime.api.apply
-import io.matthewnelson.kmp.tor.runtime.api.config.TorConfig
+import io.matthewnelson.kmp.tor.runtime.api.TorConfig
 import kotlin.jvm.JvmField
 import kotlin.jvm.JvmSynthetic
 

diff --git a/.../api/config/builders/UnixSocketBuilder.kt → .../runtime/api/builder/UnixSocketBuilder.kt b/.../api/config/builders/UnixSocketBuilder.kt → .../runtime/api/builder/UnixSocketBuilder.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config.builders
+package io.matthewnelson.kmp.tor.runtime.api.builder
 
 import io.matthewnelson.kmp.file.*
 import io.matthewnelson.kmp.tor.core.api.annotation.InternalKmpTorApi

diff --git a/...pi/config/AutomapHostsSuffixesUnitTest.kt → ...ntime/api/AutomapHostsSuffixesUnitTest.kt b/...pi/config/AutomapHostsSuffixesUnitTest.kt → ...ntime/api/AutomapHostsSuffixesUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Matthew Nelson
+ * Copyright (c) 2024 Matthew Nelson
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config
+package io.matthewnelson.kmp.tor.runtime.api
 
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...runtime/api/config/ControlPortUnitTest.kt → ...mp/tor/runtime/api/ControlPortUnitTest.kt b/...runtime/api/config/ControlPortUnitTest.kt → ...mp/tor/runtime/api/ControlPortUnitTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config
+package io.matthewnelson.kmp.tor.runtime.api
 
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...p/tor/runtime/api/config/HSDirUnitTest.kt → ...lson/kmp/tor/runtime/api/HSDirUnitTest.kt b/...p/tor/runtime/api/config/HSDirUnitTest.kt → ...lson/kmp/tor/runtime/api/HSDirUnitTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config
+package io.matthewnelson.kmp.tor.runtime.api
 
 import io.matthewnelson.kmp.file.toFile
 import io.matthewnelson.kmp.tor.runtime.api.address.Port.Companion.toPort

diff --git a/...config/HSNumIntroductionPointsUnitTest.kt → ...me/api/HSNumIntroductionPointsUnitTest.kt b/...config/HSNumIntroductionPointsUnitTest.kt → ...me/api/HSNumIntroductionPointsUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Matthew Nelson
+ * Copyright (c) 2024 Matthew Nelson
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config
+package io.matthewnelson.kmp.tor.runtime.api
 
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...r/runtime/api/config/HSVersionUnitTest.kt → .../kmp/tor/runtime/api/HSVersionUnitTest.kt b/...r/runtime/api/config/HSVersionUnitTest.kt → .../kmp/tor/runtime/api/HSVersionUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Matthew Nelson
+ * Copyright (c) 2024 Matthew Nelson
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config
+package io.matthewnelson.kmp.tor.runtime.api
 
 import kotlin.test.Test
 import kotlin.test.assertFailsWith

diff --git a/...tor/runtime/api/config/KeywordUnitTest.kt → ...on/kmp/tor/runtime/api/KeywordUnitTest.kt b/...tor/runtime/api/config/KeywordUnitTest.kt → ...on/kmp/tor/runtime/api/KeywordUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Matthew Nelson
+ * Copyright (c) 2024 Matthew Nelson
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config
+package io.matthewnelson.kmp.tor.runtime.api
 
 import io.matthewnelson.kmp.file.File
 import io.matthewnelson.kmp.file.resolve
 import io.matthewnelson.kmp.file.toFile
 import io.matthewnelson.kmp.tor.runtime.api.address.Port.Companion.toPort
-import io.matthewnelson.kmp.tor.runtime.api.config.TorConfig.Setting.Companion.filterByAttribute
-import io.matthewnelson.kmp.tor.runtime.api.config.TorConfig.Setting.Companion.filterByKeyword
+import io.matthewnelson.kmp.tor.runtime.api.TorConfig.Setting.Companion.filterByAttribute
+import io.matthewnelson.kmp.tor.runtime.api.TorConfig.Setting.Companion.filterByKeyword
 import io.matthewnelson.kmp.tor.runtime.api.internal.UnixSocketsNotSupportedMessage
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...or/runtime/api/config/LineItemUnitTest.kt → ...n/kmp/tor/runtime/api/LineItemUnitTest.kt b/...or/runtime/api/config/LineItemUnitTest.kt → ...n/kmp/tor/runtime/api/LineItemUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Matthew Nelson
+ * Copyright (c) 2024 Matthew Nelson
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config
+package io.matthewnelson.kmp.tor.runtime.api
 
-import io.matthewnelson.kmp.tor.runtime.api.config.TorConfig.LineItem.Companion.toLineItem
+import io.matthewnelson.kmp.tor.runtime.api.TorConfig.LineItem.Companion.toLineItem
 import kotlin.test.Test
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
@@ -28,7 +28,8 @@ class LineItemUnitTest {
 
         assertNull(TorConfig.__ControlPort.toLineItem("   "))
         assertNull(TorConfig.__ControlPort.toLineItem(null))
-        assertNull(TorConfig.__ControlPort.toLineItem("""auto
+        assertNull(
+            TorConfig.__ControlPort.toLineItem("""auto
 
         """.trimMargin()))
     }
@@ -38,7 +39,8 @@ class LineItemUnitTest {
         assertNotNull(TorConfig.__ControlPort.toLineItem("auto", mutableSetOf("extra")))
 
         assertNull(TorConfig.__ControlPort.toLineItem("auto", mutableSetOf("    ")))
-        assertNull(TorConfig.__ControlPort.toLineItem("auto", mutableSetOf("""extra
+        assertNull(
+            TorConfig.__ControlPort.toLineItem("auto", mutableSetOf("""extra
 
         """.trimIndent())))
     }

diff --git a/...tor/runtime/api/config/SettingUnitTest.kt → ...on/kmp/tor/runtime/api/SettingUnitTest.kt b/...tor/runtime/api/config/SettingUnitTest.kt → ...on/kmp/tor/runtime/api/SettingUnitTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config
+package io.matthewnelson.kmp.tor.runtime.api
 
 import io.matthewnelson.kmp.file.toFile
 import io.matthewnelson.kmp.tor.runtime.api.address.Port.Companion.toPort

diff --git a/...r/runtime/api/config/SocksPortUnitTest.kt → .../kmp/tor/runtime/api/SocksPortUnitTest.kt b/...r/runtime/api/config/SocksPortUnitTest.kt → .../kmp/tor/runtime/api/SocksPortUnitTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config
+package io.matthewnelson.kmp.tor.runtime.api
 
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...r/runtime/api/config/TorConfigUnitTest.kt → .../kmp/tor/runtime/api/TorConfigUnitTest.kt b/...r/runtime/api/config/TorConfigUnitTest.kt → .../kmp/tor/runtime/api/TorConfigUnitTest.kt
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config
+package io.matthewnelson.kmp.tor.runtime.api
 
 import io.matthewnelson.kmp.file.toFile
 import io.matthewnelson.kmp.tor.runtime.api.address.Port.Proxy.Companion.toPortProxy
-import io.matthewnelson.kmp.tor.runtime.api.config.TorConfig.Setting.Companion.filterByKeyword
+import io.matthewnelson.kmp.tor.runtime.api.TorConfig.Setting.Companion.filterByKeyword
 import io.matthewnelson.kmp.tor.runtime.api.internal.toByte
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...r/runtime/api/config/TransPortUnitTest.kt → .../kmp/tor/runtime/api/TransPortUnitTest.kt b/...r/runtime/api/config/TransPortUnitTest.kt → .../kmp/tor/runtime/api/TransPortUnitTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config
+package io.matthewnelson.kmp.tor.runtime.api
 
 import io.matthewnelson.kmp.tor.runtime.api.internal.IsUnixLikeHost
 import kotlin.test.Test

diff --git a/...runtime/api/config/VirtualAddrUnitTest.kt → ...mp/tor/runtime/api/VirtualAddrUnitTest.kt b/...runtime/api/config/VirtualAddrUnitTest.kt → ...mp/tor/runtime/api/VirtualAddrUnitTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config
+package io.matthewnelson.kmp.tor.runtime.api
 
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/.../builders/IsolationFlagBuilderUnitTest.kt → ...i/builder/IsolationFlagBuilderUnitTest.kt b/.../builders/IsolationFlagBuilderUnitTest.kt → ...i/builder/IsolationFlagBuilderUnitTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config.builders
+package io.matthewnelson.kmp.tor.runtime.api.builder
 
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...nfig/builders/SocksFlagBuilderUnitTest.kt → ...e/api/builder/SocksFlagBuilderUnitTest.kt b/...nfig/builders/SocksFlagBuilderUnitTest.kt → ...e/api/builder/SocksFlagBuilderUnitTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config.builders
+package io.matthewnelson.kmp.tor.runtime.api.builder
 
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...onfig/builders/UnixFlagBuilderUnitTest.kt → ...me/api/builder/UnixFlagBuilderUnitTest.kt b/...onfig/builders/UnixFlagBuilderUnitTest.kt → ...me/api/builder/UnixFlagBuilderUnitTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config.builders
+package io.matthewnelson.kmp.tor.runtime.api.builder
 
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/...fig/builders/UnixSocketBuilderBaseTest.kt → .../api/builder/UnixSocketBuilderBaseTest.kt b/...fig/builders/UnixSocketBuilderBaseTest.kt → .../api/builder/UnixSocketBuilderBaseTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-package io.matthewnelson.kmp.tor.runtime.api.config.builders
+package io.matthewnelson.kmp.tor.runtime.api.builder
 
 import io.matthewnelson.kmp.file.SysPathSep
 import io.matthewnelson.kmp.file.path

diff --git a/...otlin/io/matthewnelson/kmp/tor/runtime/api/config/builders/UnixSocketBuilderJsUnitTest.kt b/...otlin/io/matthewnelson/kmp/tor/runtime/api/config/builders/UnixSocketBuilderJsUnitTest.kt
@@ -15,6 +15,7 @@
  **/
 package io.matthewnelson.kmp.tor.runtime.api.config.builders
 
+import io.matthewnelson.kmp.tor.runtime.api.builder.UnixSocketBuilderBaseTest
 import io.matthewnelson.kmp.tor.runtime.api.internal.UnixSocketsNotSupportedMessage
 import kotlin.test.Test
 

diff --git a/...tlin/io/matthewnelson/kmp/tor/runtime/api/config/builders/UnixSocketBuilderJvmUnitTest.kt b/...tlin/io/matthewnelson/kmp/tor/runtime/api/config/builders/UnixSocketBuilderJvmUnitTest.kt
@@ -15,6 +15,7 @@
  **/
 package io.matthewnelson.kmp.tor.runtime.api.config.builders
 
+import io.matthewnelson.kmp.tor.runtime.api.builder.UnixSocketBuilderBaseTest
 import io.matthewnelson.kmp.tor.runtime.api.internal.UnixSocketsNotSupportedMessage
 import kotlin.test.Test
 

diff --git a/...lin/io/matthewnelson/kmp/tor/runtime/api/config/builders/UnixSocketBuilderUnixUnitTest.kt b/...lin/io/matthewnelson/kmp/tor/runtime/api/config/builders/UnixSocketBuilderUnixUnitTest.kt
@@ -15,6 +15,7 @@
  **/
 package io.matthewnelson.kmp.tor.runtime.api.config.builders
 
+import io.matthewnelson.kmp.tor.runtime.api.builder.UnixSocketBuilderBaseTest
 import kotlin.test.Test
 
 class UnixSocketBuilderUnixUnitTest: UnixSocketBuilderBaseTest() {