Drop compose locals (#415)

* Drop compose locals * Remove actual module * Disable property naming rule --------- Co-authored-by: Davies Ashley <[email protected]>
ashdavies · Jul 28, 2023 · dcd4aad · dcd4aad
1 parent d1be8fa
commit dcd4aad
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,6 @@ stateDiagram-v2
 
     EventsApp --> AppCheckClient
     EventsApp --> Auth0Auth
-    EventsApp --> ComposeLocals
     EventsApp --> HttpClient
     EventsApp --> ImageLoader
     EventsApp --> LocalStorage

diff --git a/build-plugins/src/main/kotlin/io.ashdavies.spotless.gradle.kts b/build-plugins/src/main/kotlin/io.ashdavies.spotless.gradle.kts
@@ -9,6 +9,7 @@ spotless {
     val editorConfig = mapOf(
         "ij_kotlin_allow_trailing_comma_on_call_site" to "true",
         "ktlint_standard_function-naming" to "disabled",
+        "ktlint_standard_property-naming" to "disabled",
         "ij_kotlin_allow_trailing_comma" to "true",
         "ktlint_experimental" to "enabled",
         "ktlint_filename" to "disabled",

diff --git a/cloud-run/build.gradle.kts b/cloud-run/build.gradle.kts
@@ -31,7 +31,6 @@ kotlin {
         with(projects) {
             implementation(appCheck.appCheckSdk)
             implementation(cloudFirestore)
-            implementation(composeLocals)
             implementation(httpClient)
             implementation(eventsAggregator)
             implementation(localStorage)

diff --git a/compose-locals/build.gradle.kts b/compose-locals/build.gradle.kts
diff --git a/compose-locals/src/androidMain/AndroidManifest.xml b/compose-locals/src/androidMain/AndroidManifest.xml
diff --git a/compose-locals/src/commonMain/kotlin/io/ashdavies/compose/CompositionLocals.kt b/compose-locals/src/commonMain/kotlin/io/ashdavies/compose/CompositionLocals.kt
diff --git a/events-app/build.gradle.kts b/events-app/build.gradle.kts
@@ -14,7 +14,6 @@ kotlin {
 
         with(projects) {
             implementation(appCheck.appCheckClient)
-            implementation(composeLocals)
             implementation(httpClient)
             implementation(imageLoader)
             implementation(localStorage)

diff --git a/events-app/src/commonMain/kotlin/io/ashdavies/playground/CompositionLocals.kt b/events-app/src/commonMain/kotlin/io/ashdavies/playground/CompositionLocals.kt
@@ -3,7 +3,6 @@ package io.ashdavies.playground
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.compositionLocalOf
-import io.ashdavies.compose.noLocalProvidedFor
 import io.ashdavies.events.PlaygroundDatabase
 
 @RequiresOptIn(
@@ -14,7 +13,7 @@ import io.ashdavies.events.PlaygroundDatabase
 internal annotation class MultipleReferenceWarning
 
 internal val LocalPlaygroundDatabase = compositionLocalOf<PlaygroundDatabase> {
-    noLocalProvidedFor("LocalPlaygroundDatabase")
+    error("CompositionLocal LocalPlaygroundDatabase not present")
 }
 
 @Composable

diff --git a/firebase-compose/build.gradle.kts b/firebase-compose/build.gradle.kts
@@ -7,10 +7,6 @@ android {
 }
 
 kotlin {
-    commonMain.dependencies {
-        implementation(projects.composeLocals)
-    }
-
     androidMain.dependencies {
         with(libs.google.firebase) {
             implementation(dependencies.platform(bom))

diff --git a/firebase-compose/src/androidMain/kotlin/io/ashdavies/compose/FirebaseApp.kt b/firebase-compose/src/androidMain/kotlin/io/ashdavies/compose/FirebaseApp.kt
@@ -10,7 +10,7 @@ import com.google.android.gms.common.util.ProcessUtils
 import com.google.firebase.FirebaseApp
 
 public val LocalFirebaseAndroidApp: ProvidableCompositionLocal<FirebaseApp> = staticCompositionLocalOf {
-    noLocalProvidedFor("LocalFirebaseAndroidApp")
+    error("CompositionLocal LocalFirebaseAndroidApp not present")
 }
 
 @Composable
@@ -22,12 +22,15 @@ public fun ProvideFirebaseApp(context: Context = LocalContext.current, content:
 }
 
 private fun requireFirebaseApp(context: Context): FirebaseApp {
-    val firebaseApp = if (FirebaseApp.getApps(context).size > 0) FirebaseApp.getInstance()
-    else FirebaseApp.initializeApp(context)
+    val firebaseApp = if (FirebaseApp.getApps(context).size > 0) {
+        FirebaseApp.getInstance()
+    } else {
+        FirebaseApp.initializeApp(context)
+    }
 
     return requireNotNull(firebaseApp) {
         "Default FirebaseApp is not initialized in this " +
-                "process ${ProcessUtils.getMyProcessName()}. Make sure " +
-                "to call FirebaseApp.initializeApp(Context) first."
+            "process ${ProcessUtils.getMyProcessName()}. Make sure " +
+            "to call FirebaseApp.initializeApp(Context) first."
     }
 }
diff --git a/gallery-app/build.gradle.kts b/gallery-app/build.gradle.kts
@@ -10,7 +10,6 @@ android {
 
 kotlin {
     commonMain.dependencies {
-        implementation(projects.composeLocals)
         implementation(projects.httpClient)
         implementation(projects.imageLoader)
         implementation(projects.localStorage)

diff --git a/notion-console/build.gradle.kts b/notion-console/build.gradle.kts
@@ -14,7 +14,6 @@ application {
 kotlin {
     commonMain.dependencies {
         with(projects) {
-            implementation(composeLocals)
             implementation(localStorage)
             implementation(notionClient)
         }

diff --git a/notion-console/src/commonMain/kotlin/io/ashdavies/notion/CompositionLocals.kt b/notion-console/src/commonMain/kotlin/io/ashdavies/notion/CompositionLocals.kt
@@ -3,18 +3,17 @@ package io.ashdavies.notion
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.compositionLocalOf
-import io.ashdavies.compose.noLocalProvidedFor
 import io.ashdavies.playground.rememberDatabase
 import org.jraf.klibnotion.client.Authentication
 import org.jraf.klibnotion.client.ClientConfiguration
 import org.jraf.klibnotion.client.NotionClient
 
 internal val LocalNotionClient = compositionLocalOf<NotionClient> {
-    noLocalProvidedFor("LocalNotionClient")
+    error("CompositionLocal LocalNotionClient not present")
 }
 
 internal val LocalPlaygroundDatabase = compositionLocalOf<PlaygroundDatabase> {
-    noLocalProvidedFor("LocalPlaygroundDatabase")
+    error("CompositionLocal LocalPlaygroundDatabase not present")
 }
 
 @Composable

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -38,7 +38,6 @@ include(
     ":app-launcher:desktop",
     ":cloud-firestore",
     ":cloud-run",
-    ":compose-locals",
     ":dominion-app",
     ":events-aggregator",
     ":events-app",