use okio in apollo-testing-support

apollographql · Mar 13, 2024 · 052fa50 · 052fa50
1 parent c6e1a84
commit 052fa50
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 32 deletions.
diff --git a/libraries/apollo-api/build.gradle.kts b/libraries/apollo-api/build.gradle.kts
@@ -15,12 +15,6 @@ kotlin {
         api(project(":apollo-annotations"))
       }
     }
-
-    findByName("jsMain")?.apply {
-      dependencies {
-        implementation(libs.okio.nodefilesystem)
-      }
-    }
   }
 }
 
diff --git a/...l/apollo3/api/DefaultUpload.filesystem.kt → ...l/apollo3/api/DefaultUpload.concurrent.kt b/...l/apollo3/api/DefaultUpload.filesystem.kt → ...l/apollo3/api/DefaultUpload.concurrent.kt
@@ -4,12 +4,13 @@ package com.apollographql.apollo3.api
 
 import okio.FileSystem
 import okio.Path
+import okio.SYSTEM
 import okio.buffer
 import okio.use
 import kotlin.jvm.JvmMultifileClass
 import kotlin.jvm.JvmName
 
-fun Path.toUpload(contentType: String, fileSystem: FileSystem = systemFileSystem): Upload {
+fun Path.toUpload(contentType: String, fileSystem: FileSystem = FileSystem.SYSTEM): Upload {
   return DefaultUpload.Builder()
       .content { sink ->
         fileSystem.openReadOnly(this).use {

diff --git a/libraries/apollo-api/src/jsMain/kotlin/com/apollographql/apollo3/api/systemFileSystem.kt b/libraries/apollo-api/src/jsMain/kotlin/com/apollographql/apollo3/api/systemFileSystem.kt
@@ -1,7 +1,6 @@
 package com.apollographql.apollo3.api
 
 import okio.FileSystem
-import okio.NodeJsFileSystem
 
 internal actual val systemFileSystem: FileSystem
-  get() = NodeJsFileSystem
+  get() = throw IllegalStateException("There is no SYSTEM filesystem on JS")
diff --git a/libraries/apollo-testing-support/api/apollo-testing-support.api b/libraries/apollo-testing-support/api/apollo-testing-support.api
@@ -37,8 +37,10 @@ public final class com/apollographql/apollo3/testing/MockserverKt {
 	public static synthetic fun enqueueData$default (Lcom/apollographql/apollo3/mockserver/MockServer;Ljava/util/Map;Lcom/apollographql/apollo3/api/CustomScalarAdapters;JIILjava/lang/Object;)V
 }
 
-public final class com/apollographql/apollo3/testing/ReadFileJvmKt {
-	public static final fun getHostFileSystem ()Lokio/FileSystem;
+public final class com/apollographql/apollo3/testing/ReadFile_concurrentKt {
+}
+
+public final class com/apollographql/apollo3/testing/ReadFile_jvmKt {
 	public static final fun getTestsPath ()Ljava/lang/String;
 	public static final fun shouldUpdateTestFixtures ()Z
 }

diff --git a/...-testing-support/src/appleMain/kotlin/com/apollographql/apollo3/testing/readFile.apple.kt b/...-testing-support/src/appleMain/kotlin/com/apollographql/apollo3/testing/readFile.apple.kt
@@ -0,0 +1,5 @@
+package com.apollographql.apollo3.testing
+
+actual fun shouldUpdateTestFixtures(): Boolean = false
+
+actual val testsPath: String = "../"
diff --git a/...o-testing-support/src/appleMain/kotlin/com/apollographql/apollo3/testing/readFileApple.kt b/...o-testing-support/src/appleMain/kotlin/com/apollographql/apollo3/testing/readFileApple.kt
diff --git a/...upport/src/concurrentMain/kotlin/com/apollographql/apollo3/testing/readFile.concurrent.kt b/...upport/src/concurrentMain/kotlin/com/apollographql/apollo3/testing/readFile.concurrent.kt
@@ -0,0 +1,12 @@
+package com.apollographql.apollo3.testing
+
+import com.apollographql.apollo3.annotations.ApolloExperimental
+import okio.FileSystem
+import okio.SYSTEM
+
+/**
+ * The host filesystem
+ */
+@ApolloExperimental
+actual val HostFileSystem: FileSystem
+  get() = FileSystem.SYSTEM
diff --git a/...ollographql/apollo3/testing/readFileJs.kt → ...llographql/apollo3/testing/readFile.js.kt b/...ollographql/apollo3/testing/readFileJs.kt → ...llographql/apollo3/testing/readFile.js.kt
diff --git a/...llographql/apollo3/testing/readFileJvm.kt → ...lographql/apollo3/testing/readFile.jvm.kt b/...llographql/apollo3/testing/readFileJvm.kt → ...lographql/apollo3/testing/readFile.jvm.kt
@@ -1,14 +1,5 @@
 package com.apollographql.apollo3.testing
 
-import okio.FileSystem
-import okio.IOException
-import okio.Path.Companion.toPath
-import okio.buffer
-import java.io.File
-import java.io.FileNotFoundException
-
-actual val HostFileSystem = FileSystem.SYSTEM
-
 actual fun shouldUpdateTestFixtures(): Boolean {
   if (System.getenv("updateTestFixtures") != null) {
     return true