chore: packages rename

Sphereon-Opensource · Jun 21, 2024 · 8268263 · 8268263
1 parent ee9ba4a
commit 8268263
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 126 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: adopt-hotspot
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2

diff --git a/...es/url-encoder-ktor-http/build.gradle.kts → ...openid-federation-common/build.gradle.kts b/...es/url-encoder-ktor-http/build.gradle.kts → ...openid-federation-common/build.gradle.kts
@@ -47,10 +47,9 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation(project(":modules:url-encoder"))
                 implementation("io.ktor:ktor-client-core:2.3.11")
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0-RC")
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.0-RC")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.0")
             }
         }
         val commonTest by getting {
@@ -127,7 +126,7 @@ tasks.register("printSdkLocation") {
 }
 
 android {
-    namespace = "com.sphereon.kmp.genesis.shared"
+    namespace = "com.sphereon.oid.fed.common"
     compileSdk = libs.versions.android.compileSdk.get().toInt()
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11

diff --git a/...com/sphereon/utils/mime/JsonUrlEncoder.kt → ...eon/oid/fed/common/mime/JsonUrlEncoder.kt b/...com/sphereon/utils/mime/JsonUrlEncoder.kt → ...eon/oid/fed/common/mime/JsonUrlEncoder.kt
@@ -1,4 +1,4 @@
-package com.sphereon.utils.mime
+package com.sphereon.oid.fed.common.mime
 
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.encodeToString

diff --git a/...sphereon/utils/mime/JsonUrlEncoderKtor.kt → ...oid/fed/common/mime/JsonUrlEncoderKtor.kt b/...sphereon/utils/mime/JsonUrlEncoderKtor.kt → ...oid/fed/common/mime/JsonUrlEncoderKtor.kt
@@ -1,4 +1,4 @@
-package com.sphereon.utils.mime
+package com.sphereon.oid.fed.common.mime
 
 import io.ktor.http.*
 import kotlinx.serialization.json.JsonElement

diff --git a/...sphereon.utils.mime/JsonUrlEncoderTest.kt → ...oid/fed/common/mime/JsonUrlEncoderTest.kt b/...sphereon.utils.mime/JsonUrlEncoderTest.kt → ...oid/fed/common/mime/JsonUrlEncoderTest.kt
@@ -1,4 +1,4 @@
-package com.sphereon.utils.mime
+package com.sphereon.oid.fed.common.mime
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json

diff --git a/...reon.utils.mime/JsonUrlEncoderTestKtor.kt → ...fed/common/mime/JsonUrlEncoderTestKtor.kt b/...reon.utils.mime/JsonUrlEncoderTestKtor.kt → ...fed/common/mime/JsonUrlEncoderTestKtor.kt
@@ -1,5 +1,10 @@
-package com.sphereon.utils.mime
+package com.sphereon.oid.fed.common.mime
 
+import com.sphereon.oid.fed.common.mime.appendUrlEncodedValue
+import com.sphereon.oid.fed.common.mime.fromUrlEncodedJsonValuesToJsonElements
+import com.sphereon.oid.fed.common.mime.fromUrlEncodedValues
+import com.sphereon.oid.fed.common.mime.getUrlEncodedJsonValueToJsonElement
+import com.sphereon.oid.fed.common.mime.getUrlEncodedValue
 import io.ktor.http.*
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement

diff --git a/modules/url-encoder/build.gradle.kts b/modules/url-encoder/build.gradle.kts
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -28,5 +28,4 @@ dependencyResolutionManagement {
     }
 }
 
-include(":modules:url-encoder")
-include(":modules:url-encoder-ktor-http")
+include(":modules:openid-federation-common")