Fixes #65 (#73)

Remove ktor-http Dependency from ksoup-core by Implementing String.resolveOrNull in Pure Kotlin
fleeksoft · Sep 11, 2024 · 6cf3b52 · 6cf3b52
1 parent 18dffa0
commit 6cf3b52
Show file tree

Hide file tree

Showing 16 changed files with 194 additions and 503 deletions.
diff --git a/ksoup-engine-common/src/com/fleeksoft/ksoup/engine/KsoupEngine.kt b/ksoup-engine-common/src/com/fleeksoft/ksoup/engine/KsoupEngine.kt
@@ -5,7 +5,6 @@ import com.fleeksoft.ksoup.io.FileSource
 import com.fleeksoft.ksoup.io.SourceReader
 
 interface KsoupEngine {
-    fun urlResolveOrNull(base: String, relUrl: String): String?
 
     fun openSourceReader(content: String, charset: Charset? = null): SourceReader
 

diff --git a/ksoup-engine-korlibs/src/com/fleeksoft/ksoup/engine/KsoupEngineImpl.kt b/ksoup-engine-korlibs/src/com/fleeksoft/ksoup/engine/KsoupEngineImpl.kt
@@ -2,12 +2,8 @@ package com.fleeksoft.ksoup.engine
 
 import com.fleeksoft.ksoup.io.*
 import korlibs.io.lang.Charsets
-import korlibs.io.net.URL
 
 object KsoupEngineImpl : KsoupEngine {
-    override fun urlResolveOrNull(base: String, relUrl: String): String? {
-        return URL.resolveOrNull(base = base, access = relUrl)
-    }
 
     override fun openSourceReader(content: String, charset: Charset?): SourceReader {
         return SourceReader.from(charset?.toByteArray(content) ?: content.encodeToByteArray())

diff --git a/ksoup-engine-kotlinx/module.yaml b/ksoup-engine-kotlinx/module.yaml
@@ -10,5 +10,4 @@ aliases:
 dependencies:
   - ../ksoup-engine-common
   - $libs.kotlinx.io: exported
-  - $libs.ktor.io
-  - $libs.ktor.http
+  - $libs.ktor.io
diff --git a/ksoup-engine-kotlinx/src/com/fleeksoft/ksoup/engine/KsoupEngineImpl.kt b/ksoup-engine-kotlinx/src/com/fleeksoft/ksoup/engine/KsoupEngineImpl.kt
@@ -6,10 +6,6 @@ import io.ktor.utils.io.charsets.*
 
 object KsoupEngineImpl : KsoupEngine {
 
-    override fun urlResolveOrNull(base: String, relUrl: String): String? {
-        return URLUtil.urlResolveOrNull(base = base, relUrl = relUrl)
-    }
-
     override fun openSourceReader(content: String, charset: Charset?): SourceReader {
         return SourceReader.from(charset?.toByteArray(content) ?: content.encodeToByteArray())
     }

diff --git a/ksoup-engine-kotlinx/src/com/fleeksoft/ksoup/engine/URLUtil.kt b/ksoup-engine-kotlinx/src/com/fleeksoft/ksoup/engine/URLUtil.kt
diff --git a/ksoup-engine-ktor2/module.yaml b/ksoup-engine-ktor2/module.yaml
@@ -10,5 +10,4 @@ aliases:
 dependencies:
   - ../ksoup-engine-common
   - $libs.kotlinx.io: exported
-  - $libs.ktor2.io
-  - $libs.ktor2.http
+  - $libs.ktor2.io
diff --git a/ksoup-engine-ktor2/src/com/fleeksoft/ksoup/engine/KsoupEngineImpl.kt b/ksoup-engine-ktor2/src/com/fleeksoft/ksoup/engine/KsoupEngineImpl.kt
@@ -6,10 +6,6 @@ import io.ktor.utils.io.charsets.*
 
 object KsoupEngineImpl : KsoupEngine {
 
-    override fun urlResolveOrNull(base: String, relUrl: String): String? {
-        return URLUtil.urlResolveOrNull(base = base, relUrl = relUrl)
-    }
-
     override fun openSourceReader(content: String, charset: Charset?): SourceReader {
         return SourceReader.from(charset?.toByteArray(content) ?: content.encodeToByteArray())
     }

diff --git a/ksoup-engine-ktor2/src/com/fleeksoft/ksoup/engine/URLUtil.kt b/ksoup-engine-ktor2/src/com/fleeksoft/ksoup/engine/URLUtil.kt
diff --git a/ksoup-engine-okio/module.yaml b/ksoup-engine-okio/module.yaml
@@ -12,7 +12,6 @@ dependencies:
   - ../ksoup-engine-common
   - $libs.okio: exported
   - $libs.ktor2.io
-  - $libs.ktor2.http
 
 dependencies@js:
   - $libs.okio.nodefilesystem
diff --git a/ksoup-engine-okio/src/com/fleeksoft/ksoup/engine/KsoupEngineImpl.kt b/ksoup-engine-okio/src/com/fleeksoft/ksoup/engine/KsoupEngineImpl.kt
@@ -6,10 +6,6 @@ import io.ktor.utils.io.charsets.*
 
 object KsoupEngineImpl : KsoupEngine {
 
-    override fun urlResolveOrNull(base: String, relUrl: String): String? {
-        return URLUtil.urlResolveOrNull(base = base, relUrl = relUrl)
-    }
-
     override fun openSourceReader(content: String, charset: Charset?): SourceReader {
         return SourceReader.from(charset?.toByteArray(content) ?: content.encodeToByteArray())
     }