Merge pull request #397 from hieuwu/feature/set-up-ios-chat-demo

Set up iOS for chat demo

demos/chat-demo-mpp/android/build.gradle.kts

@@ -23,11 +23,11 @@ android {
  }
  namespace = "io.github.jan.supabase.android"
  compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
  }
  kotlinOptions {
- jvmTarget = "1.8"
+ jvmTarget = "11"
  }
  buildTypes {
  getByName("release") {

demos/chat-demo-mpp/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt

@@ -4,9 +4,6 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.material3.MaterialTheme
-
-import co.touchlab.kermit.Logger
-import io.github.jan.supabase.SupabaseClient
 import io.github.jan.supabase.common.App
 import io.github.jan.supabase.common.ChatViewModel
 import io.github.jan.supabase.gotrue.handleDeeplinks

demos/chat-demo-mpp/common/build.gradle.kts

@@ -1,5 +1,4 @@
 @file:OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
-import org.jetbrains.compose.compose
 
 plugins {
  kotlin("multiplatform")
@@ -14,11 +13,21 @@ version = "1.0-SNAPSHOT"
 kotlin {
  android()
  jvm("desktop") {
- jvmToolchain(8)
+ jvmToolchain(11)
  }
  js(IR) {
  browser()
  }
+
+ listOf(
+ iosArm64(),
+ iosSimulatorArm64(),
+ ).forEach {
+ it.binaries.framework {
+ baseName = "common"
+ isStatic = true
+ }
+ }
  sourceSets {
  val commonMain by getting {
  dependencies {
@@ -56,6 +65,18 @@ kotlin {
  api(libs.ktor.js)
  }
  }
+ val iosArm64Main by getting {
+ dependsOn(commonMain)
+ dependencies {
+ api(libs.ktor.ios)
+ }
+ }
+ val iosSimulatorArm64Main by getting {
+ dependsOn(commonMain)
+ dependencies {
+ api(libs.ktor.ios)
+ }
+ }
  }
 }
 
@@ -67,7 +88,7 @@ android {
  minSdk = 26
  }
  compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
  }
 }

demos/chat-demo-mpp/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/viewModel.kt

@@ -1,6 +1,5 @@
 package io.github.jan.supabase.common.di
 
-import io.github.jan.supabase.common.ChatViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.module.Module
 

demos/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ChatViewModel.kt

@@ -26,7 +26,6 @@ expect open class MPViewModel() {
  val coroutineScope: CoroutineScope
 
 }
-
 class ChatViewModel(
  val supabaseClient: SupabaseClient,
  private val realtimeChannel: RealtimeChannel,

demos/chat-demo-mpp/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/viewModel.kt

@@ -1,6 +1,5 @@
 package io.github.jan.supabase.common.di
 
-import io.github.jan.supabase.common.ChatViewModel
 import org.koin.core.module.Module
 
 actual fun Module.viewModel() {

demos/chat-demo-mpp/common/src/iosArm64Main/kotlin/io/github/jan/supabase/common/App.kt

@@ -0,0 +1,16 @@
+package io.github.jan.supabase.common
+
+import androidx.compose.ui.window.ComposeUIViewController
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import platform.UIKit.UIViewController
+
+
+class RootComponent : KoinComponent {
+ private val viewModel: ChatViewModel by inject()
+ fun getViewModel(): ChatViewModel = viewModel
+}
+
+fun AppIos(viewModel: ChatViewModel): UIViewController = ComposeUIViewController {
+ App(viewModel = viewModel)
+}

demos/chat-demo-mpp/common/src/iosArm64Main/kotlin/io/github/jan/supabase/common/MPViewModel.kt

@@ -0,0 +1,10 @@
+package io.github.jan.supabase.common
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+
+actual open class MPViewModel actual constructor() {
+
+ actual val coroutineScope = CoroutineScope(Dispatchers.Default)
+
+}

demos/chat-demo-mpp/common/src/iosArm64Main/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt

@@ -0,0 +1,8 @@
+package io.github.jan.supabase.common.di
+
+import io.github.jan.supabase.gotrue.GoTrueConfig
+
+actual fun GoTrueConfig.platformGoTrueConfig() {
+ scheme = "io.jan.supabase"
+ host = "login"
+}

demos/chat-demo-mpp/common/src/iosArm64Main/kotlin/io/github/jan/supabase/common/di/viewModel.kt

@@ -0,0 +1,7 @@
+package io.github.jan.supabase.common.di
+
+import org.koin.core.module.Module
+
+actual fun Module.viewModel() {
+ single { createViewModule() }
+}

demos/chat-demo-mpp/common/src/iosArm64Main/kotlin/io/github/jan/supabase/common/ui/components/AlertDialog.kt

@@ -0,0 +1,7 @@
+package io.github.jan.supabase.common.ui.components
+
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun AlertDialog(text: String, close: () -> Unit) {
+}

demos/chat-demo-mpp/common/src/iosSimulatorArm64Main/kotlin/io/github/jan/supabase/common/App.kt

@@ -0,0 +1,15 @@
+package io.github.jan.supabase.common
+
+import androidx.compose.ui.window.ComposeUIViewController
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import platform.UIKit.UIViewController
+
+class RootComponent : KoinComponent {
+ private val viewModel: ChatViewModel by inject()
+ fun getViewModel(): ChatViewModel = viewModel
+}
+
+fun AppIos(viewModel: ChatViewModel): UIViewController = ComposeUIViewController {
+ App(viewModel = viewModel)
+}

demos/chat-demo-mpp/common/src/iosSimulatorArm64Main/kotlin/io/github/jan/supabase/common/MPViewModel.kt

@@ -0,0 +1,8 @@
+package io.github.jan.supabase.common
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+
+actual open class MPViewModel actual constructor() {
+ actual val coroutineScope = CoroutineScope(Dispatchers.Default)
+}

demos/chat-demo-mpp/common/src/iosSimulatorArm64Main/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt

@@ -0,0 +1,8 @@
+package io.github.jan.supabase.common.di
+
+import io.github.jan.supabase.gotrue.GoTrueConfig
+
+actual fun GoTrueConfig.platformGoTrueConfig() {
+ scheme = "io.jan.supabase"
+ host = "login"
+}

demos/chat-demo-mpp/common/src/iosSimulatorArm64Main/kotlin/io/github/jan/supabase/common/di/viewModel.kt

@@ -0,0 +1,7 @@
+package io.github.jan.supabase.common.di
+
+import org.koin.core.module.Module
+
+actual fun Module.viewModel() {
+ single { createViewModule() }
+}

demos/chat-demo-mpp/common/src/iosSimulatorArm64Main/kotlin/io/github/jan/supabase/common/ui/components/AlertDialog.kt

@@ -0,0 +1,7 @@
+package io.github.jan.supabase.common.ui.components
+
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun AlertDialog(text: String, close: () -> Unit) {
+}

demos/chat-demo-mpp/common/src/jsMain/kotlin/io/github/jan/supabase/common/di/viewModel.kt

@@ -1,6 +1,5 @@
 package io.github.jan.supabase.common.di
 
-import io.github.jan.supabase.common.ChatViewModel
 import org.koin.core.module.Module
 
 actual fun Module.viewModel() {

demos/chat-demo-mpp/gradle.properties

@@ -1,6 +1,6 @@
 kotlin.code.style=official
-kotlin.native.enableDependencyPropagation=false
 android.useAndroidX=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.gradle.jvmargs=-Xmx4096m
-kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.androidSourceSetLayoutVersion=2
+org.jetbrains.compose.experimental.uikit.enabled=true

demos/chat-demo-mpp/gradle/libs.versions.toml

@@ -1,16 +1,15 @@
 [versions]
-kotlin = "1.8.20"
+kotlin = "1.9.21"
 agp = "8.0.2"
-compose = "1.4.0"
+compose = "1.5.11"
 supabase = "1.1.0"
-koin = "3.4.1"
-ktor = "2.3.1"
+koin = "3.4.3"
+ktor = "2.3.7"
 
 androidx-core = "1.10.1"
 androidx-compat = "1.6.1"
 androidx-lifecycle = "2.6.1"
 androidx-activity = "1.7.2"
-
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
@@ -21,6 +20,7 @@ android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
+org-jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 
 [libraries]
 supabase-gotrue = { module = "io.github.jan-tennert.supabase:gotrue-kt", version.ref = "supabase" }
@@ -38,6 +38,7 @@ androidx-activity-compose = { module = "androidx.activity:activity-compose", ver
 
 ktor-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
 ktor-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
+ktor-ios = { module = "io.ktor:ktor-client-ios", version.ref = "ktor" }
 
 [bundles]
 supabase = [ "supabase-gotrue", "supabase-realtime", "supabase-postgrest" ]

demos/chat-demo-mpp/gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
  done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 # shell script including quotes and variable substitutions, so put them in