From cfecfe213047b21214a8caa50b264859254dbc2a Mon Sep 17 00:00:00 2001
From: KotlinGeekDev <kotlingeek@protonmail.com>
Date: Mon, 23 Mar 2026 19:49:24 +0100
Subject: [PATCH] Move uri-reference-kmp to version catalog. Remove swift
 bridge(was a nice run).

---
 gradle/libs.versions.toml                     |  2 ++
 quartz/build.gradle.kts                       | 22 +-----------------
 .../swift/swiftbridge/Rfc3986UriBridge.swift  | 23 -------------------
 .../src/swift/swiftbridge/UrlDetector.swift   | 21 -----------------
 4 files changed, 3 insertions(+), 65 deletions(-)
 delete mode 100644 quartz/src/swift/swiftbridge/Rfc3986UriBridge.swift
 delete mode 100644 quartz/src/swift/swiftbridge/UrlDetector.swift

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1a2b35468..899dbb406 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -58,6 +58,7 @@ torAndroid = "0.4.9.5.1"
 translate = "17.0.3"
 jetbrainsCompose = "1.10.3"
 unifiedpush = "3.0.10"
+uriReferenceKmp = "1.0"
 vico-charts-compose = "3.0.3"
 zelory = "3.0.1"
 zoomable = "2.11.1"
@@ -128,6 +129,7 @@ coil-okhttp = { group = "io.coil-kt.coil3", name = "coil-network-okhttp", versio
 coil-video = { group = "io.coil-kt.coil3", name = "coil-video", version.ref = "coil" }
 commons-imaging = { group = "org.apache.commons", name = "commons-imaging", version.ref = "commonsImaging" }
 slf4j-nop = { module = "org.slf4j:slf4j-nop", version.ref = "slf4j" }
+uri-reference-kmp = { module = "io.github.kotlingeekdev:uri-reference-kmp", version.ref = "uriReferenceKmp" }
 vlcj = { group = "uk.co.caprica", name = "vlcj", version.ref = "vlcj" }
 dev-whyoleg-cryptography-provider-apple-optimal = { module = "dev.whyoleg.cryptography:cryptography-provider-optimal", version.ref = "devWhyolegCryptography" }
 drfonfon-geohash = { group = "com.github.drfonfon", name = "android-kotlin-geohash", version.ref = "androidKotlinGeohash" }
diff --git a/quartz/build.gradle.kts b/quartz/build.gradle.kts
index 3aad8ae61..3b0eca3cf 100644
--- a/quartz/build.gradle.kts
+++ b/quartz/build.gradle.kts
@@ -1,9 +1,5 @@
-@file:OptIn(ExperimentalSpmForKmpFeature::class)
-
 import com.vanniktech.maven.publish.KotlinMultiplatform
 import com.vanniktech.maven.publish.SourcesJar
-import io.github.frankois944.spmForKmp.swiftPackageConfig
-import io.github.frankois944.spmForKmp.utils.ExperimentalSpmForKmpFeature
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
 
@@ -13,7 +9,6 @@ plugins {
     alias(libs.plugins.androidKotlinMultiplatformLibrary)
     alias(libs.plugins.serialization)
     alias(libs.plugins.vanniktech.mavenPublish)
-    alias(libs.plugins.frankois944.spmForKmp)
 }
 
 kotlin {
@@ -121,21 +116,6 @@ kotlin {
                 dependsOn(libsodiumDefFileGeneration)
             }
         }
-
-        target.swiftPackageConfig(cinteropName = "swiftbridge") {
-            minIos = "17"
-            minMacos = "14"
-            dependency {
-                remotePackageVersion(
-                    url = uri("https://github.com/swift-standards/swift-rfc-3986.git"),
-                    packageName = "swift-rfc-3986",
-                    products = {
-                        add("RFC 3986")
-                    },
-                    version = "0.1.0",
-                )
-            }
-        }
     }
 
     iosArm64 {
@@ -331,7 +311,7 @@ kotlin {
                 implementation(libs.dev.whyoleg.cryptography.provider.apple.optimal)
                 implementation("io.github.andreypfau:kotlinx-crypto-hmac:0.0.4")
                 implementation("io.github.andreypfau:kotlinx-crypto-sha2:0.0.4")
-                implementation("io.github.kotlingeekdev:uri-reference-kmp:1.0")
+                implementation(libs.uri.reference.kmp)
             }
         }
 
diff --git a/quartz/src/swift/swiftbridge/Rfc3986UriBridge.swift b/quartz/src/swift/swiftbridge/Rfc3986UriBridge.swift
deleted file mode 100644
index bafd34a5b..000000000
--- a/quartz/src/swift/swiftbridge/Rfc3986UriBridge.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// Created by NullDev on 31/12/2025.
-//
-
-import Foundation
-import RFC_3986
-
-@objcMembers public class Rfc3986UriBridge: NSObject {
-    public func normalizeUrl(url: String) throws -> String {
-        let uri = try RFC_3986.URI(url)
-        let normalized = uri.normalized()
-        return normalized.value
-    }
-
-    public func isUrlValid(url: String) -> Bool {
-        return RFC_3986.isValidURI(url)
-    }
-
-    public func hostFromUri(url: String) throws -> String {
-        let actualUri = try RFC_3986.URI(url)
-        return actualUri.host!
-    }
-}
diff --git a/quartz/src/swift/swiftbridge/UrlDetector.swift b/quartz/src/swift/swiftbridge/UrlDetector.swift
deleted file mode 100644
index e4927c516..000000000
--- a/quartz/src/swift/swiftbridge/UrlDetector.swift
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Created by NullDev on 20/01/2026.
-//
-
-import Foundation
-
-@objcMembers public class UrlDetector: NSObject {
-    public func findURLs(text: String) -> [String] {
-        var links = [String]()
-        let detector = try! NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
-        let matches = detector.matches(in: text, options: [], range: NSRange(location: 0, length: text.utf16.count))
-
-        for match in matches {
-            guard let range = Range(match.range, in: text) else { continue }
-            let url = text[range]
-            links.append(String(url))
-        }
-
-        return links
-    }
-}
\ No newline at end of file