Replace com.soywiz.io with korlibs.io in core

islandoftex · Sep 28, 2023 · 0577b7b · 0577b7b
1 parent 1fd3094
commit 0577b7b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/core/src/commonMain/kotlin/org/islandoftex/arara/core/files/Database.kt b/core/src/commonMain/kotlin/org/islandoftex/arara/core/files/Database.kt
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 package org.islandoftex.arara.core.files
 
-import com.soywiz.korio.async.runBlockingNoJs
-import com.soywiz.korio.file.std.localVfs
+import korlibs.io.async.runBlockingNoJs
+import korlibs.io.file.std.localVfs
 import kotlinx.serialization.Serializable
 import net.mamoe.yamlkt.Yaml
 import org.islandoftex.arara.api.AraraException

diff --git a/core/src/commonMain/kotlin/org/islandoftex/arara/core/files/FileHandling.kt b/core/src/commonMain/kotlin/org/islandoftex/arara/core/files/FileHandling.kt
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BSD-3-Clause
 package org.islandoftex.arara.core.files
 
-import com.soywiz.korio.async.runBlockingNoJs
-import com.soywiz.korio.file.std.localVfs
-import com.soywiz.korio.lang.IOException
-import com.soywiz.korio.util.checksum.CRC32
-import com.soywiz.korio.util.checksum.checksum
+import korlibs.io.async.runBlockingNoJs
+import korlibs.io.file.std.localVfs
+import korlibs.io.lang.IOException
+import korlibs.io.util.checksum.CRC32
+import korlibs.io.util.checksum.checksum
 import org.islandoftex.arara.api.AraraException
 import org.islandoftex.arara.api.files.MPPPath
 import org.islandoftex.arara.core.localization.LanguageController

diff --git a/core/src/commonMain/kotlin/org/islandoftex/arara/core/files/FileSearching.kt b/core/src/commonMain/kotlin/org/islandoftex/arara/core/files/FileSearching.kt
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: BSD-3-Clause
 package org.islandoftex.arara.core.files
 
-import com.soywiz.korio.async.runBlockingNoJs
-import com.soywiz.korio.file.baseName
-import com.soywiz.korio.file.extension
-import com.soywiz.korio.file.std.LocalVfs
+import korlibs.io.async.runBlockingNoJs
+import korlibs.io.file.baseName
+import korlibs.io.file.extension
+import korlibs.io.file.std.LocalVfs
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.map

diff --git a/core/src/commonMain/kotlin/org/islandoftex/arara/core/rules/Directives.kt b/core/src/commonMain/kotlin/org/islandoftex/arara/core/rules/Directives.kt
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 package org.islandoftex.arara.core.rules
 
-import com.soywiz.korio.util.endExclusive
+import korlibs.io.util.endExclusiveClamped
 import org.islandoftex.arara.api.AraraException
 import org.islandoftex.arara.api.files.FileType
 import org.islandoftex.arara.api.files.MPPPath
@@ -50,7 +50,7 @@ object Directives {
         for ((i, text) in lines.withIndex()) {
             val validLineMatch = validLineStartPattern.find(text)
             if (validLineMatch != null) {
-                val line = text.substring(validLineMatch.range.endExclusive)
+                val line = text.substring(validLineMatch.range.endExclusiveClamped)
                 map[i + 1] = hooks.processPotentialDirective(i + 1, line)
             } else if (parseOnlyHeader && !checkLinePattern(validLinePattern, text)) {
                 // if we should only look within the file's header and reached

diff --git a/core/src/commonMain/kotlin/org/islandoftex/arara/core/session/Session.kt b/core/src/commonMain/kotlin/org/islandoftex/arara/core/session/Session.kt
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 package org.islandoftex.arara.core.session
 
-import com.soywiz.korio.lang.Environment
+import korlibs.io.lang.Environment
 import org.islandoftex.arara.api.AraraException
 import org.islandoftex.arara.api.configuration.LoggingOptions
 import org.islandoftex.arara.api.configuration.UserInterfaceOptions

diff --git a/core/src/jvmMain/kotlin/org/islandoftex/arara/core/session/Environment.kt b/core/src/jvmMain/kotlin/org/islandoftex/arara/core/session/Environment.kt
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: BSD-3-Clause
 package org.islandoftex.arara.core.session
 
-import com.soywiz.korio.async.async
-import com.soywiz.korio.async.runBlockingNoJs
-import com.soywiz.korio.file.baseName
-import com.soywiz.korio.file.std.localVfs
-import com.soywiz.korio.lang.Environment
-import com.soywiz.korio.util.OS
+import korlibs.io.async.async
+import korlibs.io.async.runBlockingNoJs
+import korlibs.io.file.baseName
+import korlibs.io.file.std.localVfs
+import korlibs.io.lang.Environment
+import korlibs.io.util.OS
 import kotlinx.coroutines.awaitAll
 import mu.KotlinLogging
 import org.islandoftex.arara.api.AraraException