fix: add missing repositories for windows (#22)

* fix: add missing repositories for windows * fix: update ci docker compose command
Sphereon-Opensource · Aug 5, 2024 · 4848ba3 · 4848ba3
1 parent db8e116
commit 4848ba3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
           java-version: 17
 
       - name: Build the stack
-        run: docker-compose -f docker-compose.yaml up -d
+        run: docker compose -f docker-compose.yaml up -d
         env:
           DATASOURCE_USER: ${{ secrets.DATASOURCE_USER }}
           DATASOURCE_PASSWORD: ${{ secrets.DATASOURCE_PASSWORD }}

diff --git a/modules/openid-federation-common/build.gradle.kts b/modules/openid-federation-common/build.gradle.kts
@@ -9,9 +9,16 @@ plugins {
 
 val ktorVersion = "2.3.11"
 
+repositories {
+    mavenCentral()
+    google()
+}
+
 kotlin {
-    @OptIn(ExperimentalWasmDsl::class)
+    jvm()
 
+    // wasmJs is not available yet for ktor until v3.x is released which is still in alpha
+    // @OptIn(ExperimentalWasmDsl::class)
     js {
         browser {
             commonWebpackConfig {
@@ -29,33 +36,30 @@ kotlin {
         }
     }
 
-    // wasmJs is not available yet for ktor until v3.x is released which is still in alpha
+    // TODO Should be placed back at a later point in time: https://sphereon.atlassian.net/browse/OIDF-50
+    //    androidTarget {
+    //        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    //        compilerOptions {
+    //            jvmTarget.set(JvmTarget.JVM_11)
+    //        }
+    //    }
 
-// TODO Should be placed back at a later point in time: https://sphereon.atlassian.net/browse/OIDF-50
-//    androidTarget {
-//        @OptIn(ExperimentalKotlinGradlePluginApi::class)
-//        compilerOptions {
-//            jvmTarget.set(JvmTarget.JVM_11)
-//        }
-//    }
-//
-//    iosX64()
-//    iosArm64()
-//    iosSimulatorArm64()
-
-    jvm()
+    //    iosX64()
+    //    iosArm64()
+    //    iosSimulatorArm64()
+    //    androidTarget()
 
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("com.sphereon.oid.fed:openapi:0.1.0-SNAPSHOT")
+                api(projects.modules.openapi)
                 implementation("io.ktor:ktor-client-core:$ktorVersion")
                 implementation("io.ktor:ktor-client-logging:$ktorVersion")
                 implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
                 implementation("io.ktor:ktor-client-auth:$ktorVersion")
                 implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0")
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.1")
                 implementation(libs.kermit.logging)
             }
         }
@@ -64,6 +68,7 @@ kotlin {
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
                 implementation("io.ktor:ktor-client-mock:$ktorVersion")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0-RC")
             }
         }
         val jvmMain by getting {
@@ -138,11 +143,9 @@ kotlin {
         }
 
         val jsTest by getting {
-            dependsOn(commonTest)
             dependencies {
                 implementation(kotlin("test-js"))
                 implementation(kotlin("test-annotations-common"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0-RC")
             }
         }
     }