Merge branch 'master' into presence-enabled

jan-tennert · jan-tennert · commit 36d4ff661326 · 2025-07-07T20:31:29.000+02:00
# Conflicts:
#	Realtime/src/commonTest/kotlin/RealtimeTestUtils.kt
diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthImpl.kt b/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthImpl.kt
@@ -53,7 +53,6 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
-import kotlinx.datetime.Clock
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonObjectBuilder
 import kotlinx.serialization.json.buildJsonObject
@@ -63,6 +62,7 @@ import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import kotlinx.serialization.json.put
 import kotlin.coroutines.coroutineContext
+import kotlin.time.Clock
 import kotlin.time.Duration.Companion.seconds
 
 private const val SESSION_REFRESH_THRESHOLD = 0.8
diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaChallenge.kt b/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaChallenge.kt
@@ -1,8 +1,8 @@
 package io.github.jan.supabase.auth.mfa
 
-import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlin.time.Instant
 
 /**
  * A challenge to verify the user's identity.
diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/UserInfo.kt b/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/UserInfo.kt
@@ -1,10 +1,10 @@
 @file:Suppress("UndocumentedPublicClass", "UndocumentedPublicFunction", "UndocumentedPublicProperty")
 package io.github.jan.supabase.auth.user
 
-import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
+import kotlin.time.Instant
 
 @Serializable
 data class UserInfo(
diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/UserSession.kt b/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/UserSession.kt
@@ -1,11 +1,11 @@
 @file:Suppress("UndocumentedPublicClass", "UndocumentedPublicFunction", "UndocumentedPublicProperty")
 package io.github.jan.supabase.auth.user
 
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlin.time.Clock
 import kotlin.time.Duration.Companion.seconds
+import kotlin.time.Instant
 
 @Serializable
 data class UserSession(
diff --git a/Auth/src/commonTest/kotlin/AdminApiTest.kt b/Auth/src/commonTest/kotlin/AdminApiTest.kt
@@ -16,7 +16,6 @@ import io.github.jan.supabase.testing.toJsonElement
 import io.ktor.client.engine.mock.respond
 import io.ktor.http.HttpMethod
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Clock
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.boolean
 import kotlinx.serialization.json.buildJsonObject
@@ -26,6 +25,7 @@ import kotlinx.serialization.json.jsonPrimitive
 import kotlinx.serialization.json.put
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Clock
 
 class AdminApiTest {
 
diff --git a/Auth/src/commonTest/kotlin/MfaApiTest.kt b/Auth/src/commonTest/kotlin/MfaApiTest.kt
@@ -20,14 +20,14 @@ import io.ktor.client.engine.mock.respond
 import io.ktor.http.HttpMethod
 import io.ktor.util.encodeBase64
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Clock
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import kotlinx.serialization.json.put
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
+import kotlin.time.Clock
 
 class MfaApiTest {
 
diff --git a/Functions/src/commonMain/kotlin/io/github/jan/supabase/functions/Functions.kt b/Functions/src/commonMain/kotlin/io/github/jan/supabase/functions/Functions.kt
@@ -60,7 +60,7 @@ class Functions(override val config: Config, override val supabaseClient: Supaba
 
     /**
      * Invokes a remote edge function. The authorization token is automatically added to the request.
-     * @param function The function to invoke
+     * @param function The function to invoke. If name of the function is renamed, use the slug after URL
      * @param builder The request builder to configure the request
      * @param region The region where the function is invoked
      * @throws RestException or one of its subclasses if receiving an error response
@@ -77,7 +77,7 @@ class Functions(override val config: Config, override val supabaseClient: Supaba
     /**
      * Invokes a remote edge function. The authorization token is automatically added to the request.
      * Note, if you want to serialize [body] to json, you need to add the [HttpHeaders.ContentType] header yourself.
-     * @param function The function to invoke
+     * @param function The function to invoke. If name of the function is renamed, use the slug after URL
      * @param body The body of the request
      * @param headers Headers to add to the request
      * @param region The region where the function is invoked
@@ -93,7 +93,7 @@ class Functions(override val config: Config, override val supabaseClient: Supaba
 
     /**
      * Invokes a remote edge function. The authorization token is automatically added to the request.
-     * @param function The function to invoke
+     * @param function The function to invoke. If name of the function is renamed, use the slug after URL
      * @param headers Headers to add to the request
      * @param region The region where the function is invoked
      * @throws RestException or one of its subclasses if receiving an error response
@@ -107,7 +107,7 @@ class Functions(override val config: Config, override val supabaseClient: Supaba
 
     /**
      * Builds an [EdgeFunction] which can be invoked multiple times
-     * @param function The function name
+     * @param function The function name. If name of the function is renamed, use the slug after URL
      * @param headers Headers to add to the requests when invoking the function
      * @param region The region where the function is invoked
      */
diff --git a/Postgrest/src/commonTest/kotlin/PostgrestFilterBuilderTest.kt b/Postgrest/src/commonTest/kotlin/PostgrestFilterBuilderTest.kt
@@ -5,12 +5,12 @@ import io.github.jan.supabase.postgrest.query.filter.PostgrestFilterBuilder
 import io.ktor.http.decodeURLQueryComponent
 import io.ktor.http.formUrlEncode
 import io.ktor.http.parametersOf
-import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFails
+import kotlin.time.Instant
 
 @Serializable
 data class TestData(@SerialName("created_at") val createdAt: Instant)
diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PostgresAction.kt b/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PostgresAction.kt
@@ -3,9 +3,9 @@ package io.github.jan.supabase.realtime
 import io.github.jan.supabase.SupabaseSerializer
 import io.github.jan.supabase.decode
 import io.github.jan.supabase.plugins.SerializableData
-import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
+import kotlin.time.Instant
 
 /**
  * Contains information about a column
diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeImpl.kt b/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeImpl.kt
@@ -30,14 +30,14 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.datetime.Clock
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import kotlinx.serialization.json.longOrNull
 import kotlin.coroutines.coroutineContext
 import kotlin.io.encoding.ExperimentalEncodingApi
+import kotlin.time.Clock
 
 @PublishedApi internal class RealtimeImpl(override val supabaseClient: SupabaseClient, override val config: Realtime.Config) : Realtime {
 
diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/data/PostgresActionData.kt b/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/data/PostgresActionData.kt
@@ -1,10 +1,10 @@
 package io.github.jan.supabase.realtime.data
 
 import io.github.jan.supabase.realtime.Column
-import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
+import kotlin.time.Instant
 
 @Serializable
 internal data class PostgresActionData(
diff --git a/Realtime/src/commonTest/kotlin/CallbackManagerTest.kt b/Realtime/src/commonTest/kotlin/CallbackManagerTest.kt
@@ -6,14 +6,14 @@ import io.github.jan.supabase.realtime.PostgresJoinConfig
 import io.github.jan.supabase.realtime.Presence
 import io.github.jan.supabase.realtime.RealtimeCallback
 import io.github.jan.supabase.serializer.KotlinXSerializer
-import kotlinx.datetime.Clock
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.put
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import kotlin.time.Clock
 
 class CallbackManagerTest {
 
diff --git a/Realtime/src/commonTest/kotlin/RealtimeChannelTest.kt b/Realtime/src/commonTest/kotlin/RealtimeChannelTest.kt
@@ -28,7 +28,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Clock
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.boolean
@@ -44,6 +43,7 @@ import kotlin.test.Test
 import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
+import kotlin.time.Clock
 
 val EXAMPLE_JWT = buildString {
     append("test.")
diff --git a/Realtime/src/commonTest/kotlin/RealtimeExtTest.kt b/Realtime/src/commonTest/kotlin/RealtimeExtTest.kt
@@ -14,14 +14,14 @@ import io.github.jan.supabase.serializer.KotlinXSerializer
 import io.github.jan.supabase.testing.pathAfterVersion
 import io.ktor.client.engine.mock.respond
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Clock
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.encodeToJsonElement
 import kotlinx.serialization.json.jsonObject
 import kotlin.test.Test
 import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
+import kotlin.time.Clock
 
 @Serializable
 data class DummyData(val key: Int, val content: String = "")
diff --git a/Realtime/src/commonTest/kotlin/RealtimeTest.kt b/Realtime/src/commonTest/kotlin/RealtimeTest.kt
@@ -5,12 +5,12 @@ import io.github.jan.supabase.realtime.channel
 import io.github.jan.supabase.realtime.realtime
 import io.ktor.util.encodeBase64
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Clock
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.put
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
+import kotlin.time.Clock
 
 class RealtimeTest {
 
diff --git a/Realtime/src/commonTest/kotlin/RealtimeTestUtils.kt b/Realtime/src/commonTest/kotlin/RealtimeTestUtils.kt
@@ -13,7 +13,6 @@ import kotlinx.coroutines.channels.SendChannel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
-import kotlinx.datetime.Clock
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
@@ -22,6 +21,7 @@ import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.json.encodeToJsonElement
 import kotlinx.serialization.json.put
+import kotlin.time.Clock
 import kotlin.test.assertEquals
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.seconds
diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/Bucket.kt b/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/Bucket.kt
@@ -1,9 +1,9 @@
 package io.github.jan.supabase.storage
 
 
-import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlin.time.Instant
 
 /**
  * Represents a storage bucket
diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FileObject.kt b/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FileObject.kt
@@ -1,14 +1,17 @@
+@file:OptIn(ExperimentalTime::class)
+
 package io.github.jan.supabase.storage
 
 import io.github.jan.supabase.SupabaseSerializer
 import io.github.jan.supabase.decode
 import io.github.jan.supabase.serializer.KotlinXSerializer
 import io.ktor.http.ContentType
-import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import kotlinx.serialization.json.JsonObject
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
 /**
  * Represents a file or a folder in a bucket. If the item is a folder, everything except [name] is null.
diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableCache.kt b/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableCache.kt
@@ -2,8 +2,8 @@
 package io.github.jan.supabase.storage.resumable
 
 import io.github.jan.supabase.annotations.SupabaseInternal
-import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
+import kotlin.time.Instant
 
 /**
  * Represents a cache entry for a resumable upload
diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableClient.kt b/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableClient.kt
@@ -26,9 +26,9 @@ import io.ktor.utils.io.discard
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
-import kotlinx.datetime.Clock
 import kotlin.io.encoding.Base64
 import kotlin.io.encoding.ExperimentalEncodingApi
+import kotlin.time.Clock
 import kotlin.time.Duration.Companion.days
 
 /**
diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableUpload.kt b/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableUpload.kt
@@ -35,7 +35,6 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlin.math.min
-import kotlin.time.ExperimentalTime
 
 /**
  * Represents a resumable upload. Can be paused, resumed or cancelled.
@@ -108,7 +107,6 @@ internal class ResumableUploadImpl(
         removeFromCache()
     }
 
-    @OptIn(ExperimentalTime::class)
     override suspend fun startOrResumeUploading() {
         if(paused) paused = false
         if(!::dataStream.isInitialized) dataStream = createDataStream(offset)
diff --git a/Storage/src/commonTest/kotlin/BucketApiTest.kt b/Storage/src/commonTest/kotlin/BucketApiTest.kt
@@ -24,8 +24,6 @@ import io.ktor.http.HttpMethod
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.headersOf
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Clock
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonObject
@@ -43,6 +41,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
+import kotlin.time.Clock
 import kotlin.time.Duration.Companion.seconds
 
 class BucketApiTest {
diff --git a/Storage/src/commonTest/kotlin/StorageTest.kt b/Storage/src/commonTest/kotlin/StorageTest.kt
@@ -13,14 +13,14 @@ import io.github.jan.supabase.testing.toJsonElement
 import io.ktor.client.engine.mock.respond
 import io.ktor.http.HttpMethod
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Clock
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.boolean
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Clock
 
 class StorageTest {
 
diff --git a/Supabase/build.gradle.kts b/Supabase/build.gradle.kts
@@ -48,6 +48,7 @@ kotlin {
                 api(libs.kermit)
                 api(libs.bundles.ktor.client)
                 api(libs.kotlinx.atomicfu)
+                api(libs.kotlinx.serialization.json)
             }
         }
         commonTest {
diff --git a/buildSrc/src/main/kotlin/KotlinPlugin.kt b/buildSrc/src/main/kotlin/KotlinPlugin.kt
@@ -7,6 +7,7 @@ fun KotlinMultiplatformExtension.defaultConfig() {
         languageSettings.optIn("kotlin.RequiresOptIn")
         languageSettings.optIn("io.github.jan.supabase.annotations.SupabaseInternal")
         languageSettings.optIn("io.github.jan.supabase.annotations.SupabaseExperimental")
+        languageSettings.optIn("kotlin.time.ExperimentalTime")
     }
     compilerOptions.freeCompilerArgs.add("-Xexpect-actual-classes")
     applyDefaultHierarchyTemplate()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/net/MessageApi.kt b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/net/MessageApi.kt
