Introduce "filesystem" sourceSet and use okio 3.9.0

build-logic/src/main/kotlin/Mpp.kt

@@ -149,14 +149,17 @@ fun Project.configureMpp(
 private fun KotlinMultiplatformExtension.configureSourceSetGraph() {
   applyDefaultHierarchyTemplate {
     group("common") {
-      group("concurrent") {
-        group("native") {
-          group("apple")
-        }
-        group("jvmCommon") {
-          withJvm()
-          withAndroidTarget()
+      group("filesystem") {
+        group("concurrent") {
+          group("native") {
+            group("apple")
+          }
+          group("jvmCommon") {
+            withJvm()
+            withAndroidTarget()
+          }
         }
+        group("js")
       }
     }
   }

gradle/libraries.toml

@@ -38,7 +38,7 @@ ktor = "2.3.7"
 moshix = "0.14.1"
 node-fetch = "2.6.7"
 node-ws = "8.14.2"
-okio = "3.6.0"
+okio = "3.9.0"
 okhttp = "4.11.0"
 rx-android = "2.0.1"
 rx-java2 = "2.2.21"

libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/DefaultUpload.kt

@@ -1,12 +1,12 @@
+@file:JvmMultifileClass
+@file:JvmName("DefaultUploadKt")
 package com.apollographql.apollo3.api
 
 import okio.BufferedSink
 import okio.ByteString
-import okio.FileSystem
-import okio.Path
-import okio.buffer
-import okio.use
 import okio.utf8Size
+import kotlin.jvm.JvmMultifileClass
+import kotlin.jvm.JvmName
 
 /**
  * A default [Upload] that can upload from a wide variety of content
@@ -91,14 +91,3 @@ class DefaultUpload internal constructor(
   }
 }
 
-fun Path.toUpload(contentType: String, fileSystem: FileSystem = systemFileSystem): Upload {
-  return DefaultUpload.Builder()
-      .content { sink ->
-        fileSystem.openReadOnly(this).use {
-          sink.writeAll(it.source().buffer())
-        }
-      }
-      .contentType(contentType)
-      .contentLength(fileSystem.metadata(this).size ?: -1L)
-      .build()
-}

libraries/apollo-api/src/concurrentMain/kotlin/com/apollographql/apollo3/api/DefaultUpload.concurrent.kt

@@ -0,0 +1,23 @@
+@file:JvmMultifileClass
+@file:JvmName("DefaultUploadKt")
+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 = FileSystem.SYSTEM): Upload {
+  return DefaultUpload.Builder()
+      .content { sink ->
+        fileSystem.openReadOnly(this).use {
+          sink.writeAll(it.source().buffer())
+        }
+      }
+      .contentType(contentType)
+      .contentLength(fileSystem.metadata(this).size ?: -1L)
+      .build()
+}

libraries/apollo-api/src/appleMain/kotlin/com/apollographql/apollo3/api/systemFileSystem.kt → libraries/apollo-api/src/concurrentMain/kotlin/com/apollographql/apollo3/api/systemFileSystem.concurrent.kt

@@ -1,6 +1,7 @@
 package com.apollographql.apollo3.api
 
 import okio.FileSystem
+import okio.SYSTEM
 
 internal actual val systemFileSystem: FileSystem
   get() = FileSystem.SYSTEM

libraries/apollo-api/src/wasmJsMain/kotlin/com/apollographql/apollo3/api/-FileSystem.wasmJs.kt → libraries/apollo-api/src/wasmJsMain/kotlin/com/apollographql/apollo3/api/systemFileSystem.wasmJs.kt

@@ -3,4 +3,4 @@ package com.apollographql.apollo3.api
 import okio.FileSystem
 
 internal actual val systemFileSystem: FileSystem
-  get() = throw IllegalStateException("There is no SYSTEM filesystem on JS")
+  get() = throw IllegalStateException("There is no SYSTEM filesystem on wasmJs")

libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/api.kt

@@ -10,11 +10,7 @@ import com.apollographql.apollo3.ast.internal.LexerException
 import com.apollographql.apollo3.ast.internal.Parser
 import com.apollographql.apollo3.ast.internal.ParserException
 import com.apollographql.apollo3.ast.internal.validateSchema
-import com.apollographql.apollo3.ast.introspection.toGQLDocument
-import com.apollographql.apollo3.ast.introspection.toIntrospectionSchema
 import okio.BufferedSource
-import okio.Path
-import okio.buffer
 import okio.use
 import kotlin.jvm.JvmMultifileClass
 import kotlin.jvm.JvmName
@@ -137,18 +133,6 @@ fun String.toGQLSelections(options: ParserOptions = ParserOptions.Default): List
   return parseAsGQLSelections(options).getOrThrow()
 }
 
-fun Path.parseAsGQLDocument(options: ParserOptions = ParserOptions.Default): GQLResult<GQLDocument> {
-  return HOST_FILESYSTEM.source(this).buffer().parseAsGQLDocument(filePath = toString(), options = options)
-}
-
-fun Path.toGQLDocument(options: ParserOptions = ParserOptions.Default, allowJson: Boolean = false): GQLDocument {
-  return if (allowJson && name.endsWith(".json")) {
-    toIntrospectionSchema().toGQLDocument()
-  } else {
-    parseAsGQLDocument(options).getOrThrow()
-  }
-}
-
 /**
  * Parses the source to a [GQLDocument], validating the syntax but not the contents of the document.
  *

libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/introspection/introspection_reader.kt

@@ -30,22 +30,18 @@ import com.apollographql.apollo3.ast.GQLStringValue
 import com.apollographql.apollo3.ast.GQLType
 import com.apollographql.apollo3.ast.GQLUnionTypeDefinition
 import com.apollographql.apollo3.ast.GQLValue
-import com.apollographql.apollo3.ast.HOST_FILESYSTEM
 import com.apollographql.apollo3.ast.Schema
 import com.apollographql.apollo3.ast.SourceLocation
 import com.apollographql.apollo3.ast.parseAsGQLValue
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.json.Json
 import okio.Buffer
 import okio.BufferedSource
 import okio.ByteString.Companion.decodeHex
-import okio.Path
-import okio.buffer
 import kotlin.jvm.JvmMultifileClass
 import kotlin.jvm.JvmName
 
@@ -91,14 +87,6 @@ fun BufferedSource.toIntrospectionSchema(filePath: String? = null): Introspectio
 
 fun String.toIntrospectionSchema(): IntrospectionSchema = Buffer().writeUtf8(this).toIntrospectionSchema()
 
-@ApolloExperimental
-fun Path.toIntrospectionSchema(): IntrospectionSchema {
-  return HOST_FILESYSTEM
-      .source(this)
-      .buffer()
-      .toIntrospectionSchema(toString())
-}
-
 /**
  * Parses the [RSchema] into a [GQLDocument]
  */

libraries/apollo-ast/src/jvmMain/kotlin/com/apollographql/apollo3/ast/host.jvm.kt → libraries/apollo-ast/src/concurrentMain/kotlin/com/apollographql/apollo3/ast/host.concurrent.kt

@@ -1,6 +1,7 @@
 package com.apollographql.apollo3.ast
 
 import okio.FileSystem
+import okio.SYSTEM
 
 internal actual val HOST_FILESYSTEM: FileSystem
   get() = FileSystem.SYSTEM

libraries/apollo-ast/src/filesystemMain/kotlin/com/apollographql.apollo3.ast/api.filesystem.kt

@@ -0,0 +1,23 @@
+@file:JvmMultifileClass
+@file:JvmName("ApolloParser")
+
+package com.apollographql.apollo3.ast
+
+import com.apollographql.apollo3.ast.introspection.toGQLDocument
+import com.apollographql.apollo3.ast.introspection.toIntrospectionSchema
+import okio.Path
+import okio.buffer
+import kotlin.jvm.JvmMultifileClass
+import kotlin.jvm.JvmName
+
+fun Path.parseAsGQLDocument(options: ParserOptions = ParserOptions.Default): GQLResult<GQLDocument> {
+  return HOST_FILESYSTEM.source(this).buffer().parseAsGQLDocument(filePath = toString(), options = options)
+}
+
+fun Path.toGQLDocument(options: ParserOptions = ParserOptions.Default, allowJson: Boolean = false): GQLDocument {
+  return if (allowJson && name.endsWith(".json")) {
+    toIntrospectionSchema().toGQLDocument()
+  } else {
+    parseAsGQLDocument(options).getOrThrow()
+  }
+}

libraries/apollo-ast/src/filesystemMain/kotlin/com/apollographql.apollo3.ast/introspection/introspection_reader.filesystem.kt

@@ -0,0 +1,19 @@
+@file:JvmMultifileClass
+@file:JvmName("Introspection")
+
+package com.apollographql.apollo3.ast.introspection
+
+import com.apollographql.apollo3.annotations.ApolloExperimental
+import com.apollographql.apollo3.ast.HOST_FILESYSTEM
+import okio.Path
+import okio.buffer
+import kotlin.jvm.JvmMultifileClass
+import kotlin.jvm.JvmName
+
+@ApolloExperimental
+fun Path.toIntrospectionSchema(): IntrospectionSchema {
+  return HOST_FILESYSTEM
+      .source(this)
+      .buffer()
+      .toIntrospectionSchema(toString())
+}

libraries/apollo-ast/src/commonTest/kotlin/com/apollographql/apollo3/graphql/ast/test/introspection/IntrospectionTest.kt → libraries/apollo-ast/src/filesystemTest/kotlin/test/introspection/IntrospectionTest.kt

@@ -1,4 +1,4 @@
-package com.apollographql.apollo3.graphql.ast.test.introspection
+package test.introspection
 
 import com.apollographql.apollo3.ast.SourceAwareException
 import com.apollographql.apollo3.ast.introspection.toIntrospectionSchema
@@ -15,7 +15,7 @@ class IntrospectionTest {
   @Test
   fun parseSchema() {
     try {
-      "${CWD}/src/commonTest/kotlin/com/apollographql/apollo3/graphql/ast/test/introspection/duplicate.json"
+      "${CWD}/src/filesystemTest/kotlin/test/introspection/duplicate.json"
           .toPath()
           .toGQLDocument(allowJson = true)
           .toSchema()

libraries/apollo-ast/src/commonTest/kotlin/com/apollographql/apollo3/graphql/ast/test/validation/OperationValidationTest.kt → libraries/apollo-ast/src/filesystemTest/kotlin/test/validation/OperationValidationTest.kt

@@ -1,4 +1,4 @@
-package com.apollographql.apollo3.graphql.ast.test.validation
+package test.validation
 
 import com.apollographql.apollo3.ast.toGQLDocument
 import com.apollographql.apollo3.ast.toSchema
@@ -12,12 +12,12 @@ import kotlin.test.assertNotNull
 class OperationValidationTest {
   @Test
   fun deprecatedInputField() {
-    val schema = "${CWD}/src/commonTest/kotlin/com/apollographql/apollo3/graphql/ast/test/validation/inputTypeDeprecatedField.graphqls"
+    val schema = "${CWD}/src/filesystemTest/kotlin/test/validation/inputTypeDeprecatedField.graphqls"
         .toPath()
         .toGQLDocument()
         .toSchema()
 
-    val operations = "${CWD}/src/commonTest/kotlin/com/apollographql/apollo3/graphql/ast/test/validation/inputTypeDeprecatedField.graphql"
+    val operations = "${CWD}/src/filesystemTest/kotlin/test/validation/inputTypeDeprecatedField.graphql"
         .toPath()
         .toGQLDocument()
 

libraries/apollo-ast/src/wasmJsTest/kotlin/com/apollographql/apollo3/graphql/ast/test/cwd.wasmJs.kt

@@ -0,0 +1,4 @@
+package com.apollographql.apollo3.graphql.ast.test
+
+internal actual val CWD: String
+  get() = TODO("Not yet implemented")

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
 }

libraries/apollo-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 = "../"

libraries/apollo-testing-support/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

libraries/apollo-testing-support/src/jvmMain/kotlin/com/apollographql/apollo3/testing/readFileJvm.kt → libraries/apollo-testing-support/src/jvmMain/kotlin/com/apollographql/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