Merge pull request #636 from supabase-community/move-chat-demo

Move chat demo to root project & improve chat demo

.github/labeler.yml

@@ -32,7 +32,7 @@ tests:
 
 samples:
   - changed-files:
-      - any-glob-to-any-file: samples/**
+      - any-glob-to-any-file: sample/**
 
 serializers:
   - changed-files:

.github/workflows/build.yml

@@ -27,4 +27,4 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           cache-read-only: false
       - name: Test supabase-kt
-        run: ./gradlew build test --stacktrace --configuration-cache --scan
+        run: ./gradlew -DLibrariesOnly=true build test --stacktrace --configuration-cache --scan

.github/workflows/detekt.yml

@@ -26,4 +26,4 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/development' }}
       - name: Analyze code using detekt
-        run: ./gradlew detektAll --stacktrace --configuration-cache
+        run: ./gradlew -DLibrariesOnly=true detektAll --stacktrace --configuration-cache

.github/workflows/dokka.yml

@@ -43,7 +43,7 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           cache-read-only: true
       - name: Build multi-module GH pages
-        run: ./gradlew dokkaHtmlMultiModule
+        run: ./gradlew -DLibrariesOnly=true dokkaHtmlMultiModule
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - name: Upload artifact

.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           cache-read-only: true
       - name: Publish
-        run: ./gradlew publishAllPublicationsToMavenCentral
+        run: ./gradlew -DLibrariesOnly=true publishAllPublicationsToMavenCentral
       - name: Close and release
         if: inputs.close_and_release
-        run: ./gradlew releaseRepository --configuration-cache
+        run: ./gradlew -DLibrariesOnly=true releaseRepository --configuration-cache

.github/workflows/test.yml

@@ -33,4 +33,4 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           cache-read-only: true
       - name: Test supabase-kt
-        run: ./gradlew ${{ matrix.command }} --stacktrace --configuration-cache
+        run: ./gradlew -DLibrariesOnly=true ${{ matrix.command }} --stacktrace --configuration-cache

GoTrue/build.gradle.kts

@@ -66,4 +66,4 @@ kotlin {
     }
 }
 
-configureAndroidTarget()
+configureLibraryAndroidTarget()

Postgrest/build.gradle.kts

@@ -28,4 +28,4 @@ kotlin {
     }
 }
 
-configureAndroidTarget()
+configureLibraryAndroidTarget()

README.md

@@ -115,7 +115,7 @@ val iosMain by getting {
 
 # Samples
 
-- [Chat Demo (Desktop/Android/iOS/Browser)](https://github.com/supabase-community/supabase-kt/tree/master/demos/chat-demo-mpp)
+- [Chat Demo (Desktop/Android/iOS/Browser)](/sample/chat-demo-mpp)
 - [File Upload Demo (Desktop/Android)](https://github.com/supabase-community/supabase-kt/tree/master/demos/file-upload)
 - [Android Native Google login & in-app OAuth (Android)](https://github.com/supabase-community/supabase-kt/tree/master/demos/android-login)
 - [Multi-Factor Authentication (Desktop/Android/Browser)](https://github.com/supabase-community/supabase-kt/tree/master/demos/multi-factor-authentication)

Realtime/build.gradle.kts

@@ -24,4 +24,4 @@ kotlin {
     }
 }
 
-configureAndroidTarget()
+configureLibraryAndroidTarget()

Storage/build.gradle.kts

@@ -39,4 +39,4 @@ kotlin {
     }
 }
 
-configureAndroidTarget()
+configureLibraryAndroidTarget()

build.gradle.kts

@@ -114,4 +114,4 @@ kotlin {
     }
 }
 
-configureAndroidTarget()
+configureLibraryAndroidTarget()

buildSrc/build.gradle.kts

@@ -14,4 +14,5 @@ dependencies {
     implementation(libs.detekt.gradle)
     implementation(libs.dokka.gradle)
     implementation(libs.publishing.gradle)
+    implementation(libs.compose.gradle)
 }

buildSrc/src/main/kotlin/Android.kt

@@ -1,24 +1,54 @@
 import com.android.build.gradle.LibraryExtension
+import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.get
 
-fun Project.configureAndroidTarget() {
+fun Project.configureLibraryAndroidTarget(
+    namespace: String? = null,
+    minSdk: Int = 21,
+    javaVersion: JavaVersion = JavaVersion.VERSION_1_8
+) {
     extensions.configure(LibraryExtension::class) {
         compileSdk = 34
         sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-        namespace = "${extra["base-group"].toString().replace("-", ".")}.${this@configureAndroidTarget.name.replace("-", "")}.library"
+        this.namespace = namespace ?: "${extra["base-group"].toString().replace("-", ".")}.${this@configureLibraryAndroidTarget.name.replace("-", "")}.library"
         defaultConfig {
-            minSdk = 21
+            this.minSdk = minSdk
         }
         lint {
             abortOnError = false
         }
         compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_1_8
-            targetCompatibility = JavaVersion.VERSION_1_8
+            sourceCompatibility = javaVersion
+            targetCompatibility = javaVersion
         }
     }
+}
+
+fun Project.configureApplicationAndroidTarget() {
+    extensions.configure(BaseAppModuleExtension::class) {
+        compileSdk = 34
+        defaultConfig {
+            applicationId = "io.github.jan.supabase.android"
+            minSdk = 26
+            versionCode = 1
+            versionName = "1.0-SNAPSHOT"
+        }
+        namespace = "io.github.jan.supabase.android"
+        compileOptions {
+            sourceCompatibility = JavaVersion.VERSION_11
+            targetCompatibility = JavaVersion.VERSION_11
+        }
+        buildTypes {
+            getByName("release") {
+                isMinifyEnabled = false
+            }
+        }
+        /*kotlinOptions {
+            jvmTarget = "11"
+        }*/
+    }
 }

buildSrc/src/main/kotlin/Sample.kt

@@ -0,0 +1,36 @@
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.jetbrains.compose.desktop.DesktopExtension
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
+
+enum class SupabaseModule(val module: String) {
+    GOTRUE("gotrue-kt"),
+    STORAGE("storage-kt"),
+    REALTIME("realtime-kt"),
+    FUNCTIONS("functions-kt"),
+    POSTGREST("postgrest-kt"),
+    COMPOSE_AUTH("plugins:compose-auth"),
+    COMPOSE_AUTH_UI("plugins:compose-auth-ui"),
+}
+
+fun KotlinDependencyHandler.addModules(vararg modules: SupabaseModule) {
+    modules.forEach {
+        api(project(":${it.module}"))
+    }
+}
+
+fun Project.configureComposeDesktop(
+    name: String,
+) {
+    extensions.configure(DesktopExtension::class) {
+        application {
+            mainClass = "MainKt"
+            nativeDistributions {
+                targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
+                packageName = name
+                packageVersion = "1.0.0"
+            }
+        }
+    }
+}