revert okhttp usage, use android.net.Uri

Author: hrach

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
           distribution: 'zulu'
           java-version: 11
       - name: Assemble & Linters
-        run: ./gradlew :demo:assembleDebug lint lintKotlin
+        run: ./gradlew :core:testDebugUnitTest :demo:assembleDebug lint lintKotlin
       - uses: yutailang0119/action-android-lint@v3.1.0
         name: App Lint errors to annotations
         if: ${{ failure() }}

core/build.gradle.kts

@@ -54,7 +54,6 @@ dependencies {
 	implementation(libs.kotlin.stdlib)
 	implementation(libs.kotlin.serialization)
 	implementation(libs.compose.navigation)
-	implementation(libs.okhttp)
 
 	testImplementation(libs.junit)
 	testImplementation(libs.roboletric)

core/src/main/kotlin/com/kiwi/navigationcompose/typed/internal/Routing.kt

@@ -1,11 +1,11 @@
 package com.kiwi.navigationcompose.typed.internal
 
+import android.net.Uri
 import androidx.annotation.MainThread
 import com.kiwi.navigationcompose.typed.Destination
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerializationStrategy
-import okhttp3.HttpUrl
 
 @ExperimentalSerializationApi
 internal fun createRouteSlug(serializer: KSerializer<*>): String =
@@ -38,12 +38,10 @@ internal fun <T : Destination> T.toRoute(): String {
 	) {
 		"Polymorphic serializer for $this is not registered. Use registerDestination<T>()."
 	}
-	val urlBuilder = HttpUrl.Builder().apply {
-		scheme("https")
-		host("a")
-		addPathSegment(createRouteSlug(serializer))
+	val urlBuilder = Uri.Builder().apply {
+		appendPath(createRouteSlug(serializer))
 	}
 	val encoder = UrlEncoder(urlBuilder)
 	encoder.encodeSerializableValue(serializer, this)
-	return urlBuilder.build().toString().substring(10)
+	return urlBuilder.build().toString().substring(1)
 }

core/src/main/kotlin/com/kiwi/navigationcompose/typed/internal/UrlEncoder.kt

@@ -1,17 +1,17 @@
 package com.kiwi.navigationcompose.typed.internal
 
+import android.net.Uri
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.AbstractEncoder
 import kotlinx.serialization.encoding.CompositeEncoder
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.SerializersModule
-import okhttp3.HttpUrl
 
 @ExperimentalSerializationApi
 internal class UrlEncoder(
-	private val url: HttpUrl.Builder,
+	private val url: Uri.Builder,
 ) : AbstractEncoder() {
 	override val serializersModule: SerializersModule by lazy { getSerializersModule() }
 
@@ -61,9 +61,9 @@ internal class UrlEncoder(
 
 	private fun appendValue(value: String) {
 		if (elementOptional) {
-			url.addQueryParameter(elementName, value)
+			url.appendQueryParameter(elementName, value)
 		} else {
-			url.addPathSegment(value)
+			url.appendPath(value)
 		}
 	}
 }

core/src/test/kotlin/com/kiwi/navigationcompose/typed/internal/RoutePatternTest.kt

@@ -34,7 +34,7 @@ internal class RoutePatternTest {
 		) : Destination
 
 		Assert.assertEquals(
-			"com.kiwi.navigationcompose.typed.internal.RoutePatternTest.test.TestData/{a}/{c}/{e}/{g}/{i}/{k}/{m}?b={b}&d={d}&f={f}&h={h}&j={j}&l={l}&n={n}",
+			"com.kiwi.navigationcompose.typed.internal.RoutePatternTest.test.TestData/{a}/{c}/{g}/{i}/{k}/{m}?b={b}&d={d}&e={e}&f={f}&h={h}&j={j}&l={l}&n={n}",
 			createRoutePattern<TestData>(),
 		)
 	}

core/src/test/kotlin/com/kiwi/navigationcompose/typed/internal/UriEncoderTest.kt

@@ -1,16 +1,20 @@
 package com.kiwi.navigationcompose.typed.internal
 
+import android.net.Uri
 import com.kiwi.navigationcompose.typed.internal.helpers.SubClass
 import com.kiwi.navigationcompose.typed.internal.helpers.SubObject
 import com.kiwi.navigationcompose.typed.internal.helpers.SubSealed
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.serializer
-import okhttp3.HttpUrl
 import org.junit.Assert
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 
 @OptIn(ExperimentalSerializationApi::class)
+@RunWith(RobolectricTestRunner::class)
+
 internal class UriEncoderTest {
 	@Test
 	fun testValues() {
@@ -33,10 +37,7 @@ internal class UriEncoderTest {
 			val n: SubSealed,
 		)
 
-		val url = HttpUrl.Builder().apply {
-			scheme("http")
-			host("example.com")
-		}
+		val url = Uri.Builder()
 		val encoder = UrlEncoder(url)
 		val testData = TestData(
 			a = 1,
@@ -57,23 +58,21 @@ internal class UriEncoderTest {
 
 		encoder.encodeSerializableValue(serializer(), testData)
 
-		val expectedUrl = HttpUrl.Builder().apply {
-			scheme("http")
-			host("example.com")
-			addPathSegment("1")
-			addPathSegment("2.23")
-			addPathSegment("3")
-			addPathSegment("true")
-			addQueryParameter("e", "value")
-			addPathSegment("4.0")
-			addPathSegment("5")
-			addPathSegment("6")
-			addPathSegment("7")
-			addPathSegment("[8,9]")
-			addPathSegment("""{"10":"11"}""")
-			addPathSegment("""{"int":12}""")
-			addPathSegment("{}")
-			addPathSegment("""{"type":"com.kiwi.navigationcompose.typed.internal.helpers.SubSealed.B","int":13}""")
+		val expectedUrl = Uri.Builder().apply {
+			appendPath("1")
+			appendPath("2.23")
+			appendPath("3")
+			appendPath("true")
+			appendQueryParameter("e", "value")
+			appendPath("4.0")
+			appendPath("5")
+			appendPath("6")
+			appendPath("7")
+			appendPath("[8,9]")
+			appendPath("""{"10":"11"}""")
+			appendPath("""{"int":12}""")
+			appendPath("{}")
+			appendPath("""{"type":"com.kiwi.navigationcompose.typed.internal.helpers.SubSealed.B","int":13}""")
 		}
 		Assert.assertEquals(expectedUrl.toString(), url.toString())
 	}
@@ -99,25 +98,20 @@ internal class UriEncoderTest {
 			val n: SubSealed? = null,
 		)
 
-		val url = HttpUrl.Builder().apply {
-			scheme("http")
-			host("example.com")
-		}
+		val url = Uri.Builder()
 		val encoder = UrlEncoder(url)
 		val testData = TestData()
 
 		encoder.encodeSerializableValue(serializer(), testData)
 
-		val expectedUrl = HttpUrl.Builder().apply {
-			scheme("http")
-			host("example.com")
-			addQueryParameter("a", "1")
-			addQueryParameter("c", "3")
-			addQueryParameter("e", "value")
-			addQueryParameter("g", "5")
-			addQueryParameter("i", "7")
-			addQueryParameter("k", """{"10":"11"}""")
-			addQueryParameter("m", "{}")
+		val expectedUrl = Uri.Builder().apply {
+			appendQueryParameter("a", "1")
+			appendQueryParameter("c", "3")
+			appendQueryParameter("e", "value")
+			appendQueryParameter("g", "5")
+			appendQueryParameter("i", "7")
+			appendQueryParameter("k", """{"10":"11"}""")
+			appendQueryParameter("m", "{}")
 		}
 		Assert.assertEquals(expectedUrl.toString(), url.toString())
 	}

gradle/libs.versions.toml

@@ -19,7 +19,6 @@ kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-j
 compose-material = { module = "androidx.compose.material:material", version.ref = "compose-main" }
 compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "compose-navigation" }
 junit = { module = "junit:junit", version = "4.13.2" }
-okhttp = { module = "com.squareup.okhttp3:okhttp", version = "4.10.0" }
 roboletric = { module = "org.robolectric:robolectric", version = "4.8.2" }
 
 [bundles]