fix(example): add Ksp Ktorfit plugin to test sourceSets (#404)

* fix(example): add Ksp Ktorfit plugin to test sourceSets, fix commonTest to support all platforms
Foso · Aug 31, 2023 · dfa15d7 · dfa15d7
1 parent 498bd91
commit dfa15d7
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 63 deletions.
diff --git a/example/MultiplatformExample/gradle.properties b/example/MultiplatformExample/gradle.properties
@@ -6,5 +6,4 @@ kotlin.code.style=official
 android.useAndroidX=true
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
-kotlin.native.binary.memoryModel=experimental
 kotlin.mpp.androidSourceSetLayoutVersion=2
diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts
@@ -11,29 +11,20 @@ version = "1.0"
 val ktorVersion = "2.3.3"
 val ktorfitVersion = "1.6.0"
 
-configure<de.jensklingenberg.ktorfit.gradle.KtorfitGradleConfiguration> {
+ktorfit {
     version = ktorfitVersion
+    logging = true
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
-    }
-}
 kotlin {
-    android()
+    jvmToolchain(8)
+    targetHierarchy.default()
+
+    jvm()
+    androidTarget()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
-    jvm(){
-        compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
-        }
-    }
     macosX64()
     js(IR) {
         this.nodejs()
@@ -67,43 +58,11 @@ kotlin {
                 implementation(kotlin("test"))
             }
         }
-        val androidMain by getting {
-            dependencies {
-                //implementation("io.ktor:ktor-client-cio-jvm:$ktorVersion")
-            }
-        }
-        val jvmMain by getting {
-            dependencies {
-
-
-            }
-        }
-        val jsMain by getting {
-            dependencies {
-
-            }
-        }
-        val iosX64Main by getting
-        val iosArm64Main by getting
-        val iosSimulatorArm64Main by getting
-        val iosMain by creating {
-            dependsOn(commonMain)
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
-            dependencies{
-               // implementation("io.ktor:ktor-client-ios:$ktorVersion")
-            }
-        }
-        val iosX64Test by getting
-        val iosArm64Test by getting
-        val iosSimulatorArm64Test by getting
-        val iosTest by creating {
-            dependsOn(commonTest)
-            iosX64Test.dependsOn(this)
-            iosArm64Test.dependsOn(this)
-            iosSimulatorArm64Test.dependsOn(this)
-        }
+        val androidMain by getting
+        val jvmMain by getting
+        val jsMain by getting
+        val iosMain by getting
+        val macosX64Main by getting
     }
 }
 
@@ -117,11 +76,22 @@ android {
 }
 
 dependencies {
-    add("kspCommonMainMetadata", "de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfitVersion")
-    add("kspJvm", "de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfitVersion")
-    add("kspAndroid", "de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfitVersion")
-    add("kspIosX64", "de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfitVersion")
-    add("kspJs", "de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfitVersion")
-    add("kspIosSimulatorArm64", "de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfitVersion")
+    with("de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfitVersion") {
+        add("kspCommonMainMetadata", this)
+        add("kspJvm", this)
+        add("kspJvmTest", this)
+        add("kspAndroid", this)
+        add("kspAndroidTest", this)
+        add("kspIosX64", this)
+        add("kspIosX64Test", this)
+        add("kspIosArm64", this)
+        add("kspIosArm64Test", this)
+        add("kspIosSimulatorArm64", this)
+        add("kspIosSimulatorArm64Test", this)
+        add("kspMacosX64", this)
+        add("kspMacosX64Test", this)
+        add("kspJs", this)
+        add("kspJsTest", this)
+    }
 }
 
diff --git a/.../MultiplatformExample/shared/src/commonTest/kotlin/com/example/ktorfittest/KtorfitTest.kt b/.../MultiplatformExample/shared/src/commonTest/kotlin/com/example/ktorfittest/KtorfitTest.kt
@@ -0,0 +1,19 @@
+package com.example.ktorfittest
+
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class KtorfitTest {
+    @Test
+    fun test() {
+        GlobalScope.launch {
+            ktorfit.create<TestApi>()
+                .getPersonByIdResponse(3)
+                .collect {
+                    assertEquals(it.name, "R2-D2")
+                }
+        }
+    }
+}
diff --git a/example/MultiplatformExample/shared/src/commonTest/kotlin/com/example/ktorfittest/TestApi.kt b/example/MultiplatformExample/shared/src/commonTest/kotlin/com/example/ktorfittest/TestApi.kt
@@ -0,0 +1,15 @@
+package com.example.ktorfittest
+
+import de.jensklingenberg.ktorfit.http.GET
+import de.jensklingenberg.ktorfit.http.Path
+import kotlinx.coroutines.flow.Flow
+
+interface TestApi {
+    companion object {
+        const val baseUrl = "https://swapi.dev/api/"
+    }
+
+    @GET("people/{id}/")
+    suspend fun getPersonByIdResponse(@Path("id") peopleId: Int): Flow<Person>
+}
+
diff --git a/example/MultiplatformExample/shared/src/jsMain/kotlin/com/example/ktorfittest/Platform.kt b/example/MultiplatformExample/shared/src/jsMain/kotlin/com/example/ktorfittest/Platform.kt
@@ -2,5 +2,5 @@ package com.example.ktorfittest
 
 actual class Platform actual constructor() {
     actual val platform: String
-        get() = "JVM"
+        get() = "JS"
 }
diff --git a/...e/MultiplatformExample/shared/src/macosX64Main/kotlin/com/example/ktorfittest/Platform.kt b/...e/MultiplatformExample/shared/src/macosX64Main/kotlin/com/example/ktorfittest/Platform.kt
@@ -1,7 +1,6 @@
 package com.example.ktorfittest
 
-import platform.UIKit.UIDevice
 
 actual class Platform actual constructor() {
-    actual val platform: String = UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion
+    actual val platform: String = "macOS"
 }