Collapse cloud backend structure (#368)

Co-authored-by: Davies Ashley <[email protected]>
ashdavies · Jul 9, 2023 · 632ca51 · 632ca51
1 parent b1f0173
commit 632ca51
Show file tree

Hide file tree

Showing 76 changed files with 15 additions and 15 deletions.
diff --git a/app-check/app-check-client/build.gradle.kts b/app-check/app-check-client/build.gradle.kts
@@ -11,7 +11,7 @@ kotlin {
         with(projects) {
             implementation(appCheck.appCheckCommon)
             implementation(firebaseCompose)
-            implementation(cloudBackend.httpClient)
+            implementation(httpClient)
         }
 
         with(libs.ktor.client) {

diff --git a/app-check/app-check-sdk/build.gradle.kts b/app-check/app-check-sdk/build.gradle.kts
@@ -6,7 +6,7 @@ dependencies {
     api(projects.appCheck.appCheckCommon)
     api(libs.ktor.client.core)
 
-    implementation(projects.cloudBackend.httpClient)
+    implementation(projects.httpClient)
 
     implementation(libs.auth.java.jwt)
     implementation(libs.auth.jwks.rsa)

diff --git a/...-backend/cloud-firestore/build.gradle.kts → cloud-firestore/build.gradle.kts b/...-backend/cloud-firestore/build.gradle.kts → cloud-firestore/build.gradle.kts
diff --git a/...in/kotlin/io/ashdavies/cloud/ApiFuture.kt → ...in/kotlin/io/ashdavies/cloud/ApiFuture.kt b/...in/kotlin/io/ashdavies/cloud/ApiFuture.kt → ...in/kotlin/io/ashdavies/cloud/ApiFuture.kt
diff --git a/...lin/io/ashdavies/cloud/CollectionQuery.kt → ...lin/io/ashdavies/cloud/CollectionQuery.kt b/...lin/io/ashdavies/cloud/CollectionQuery.kt → ...lin/io/ashdavies/cloud/CollectionQuery.kt
diff --git a/...in/io/ashdavies/cloud/CollectionReader.kt → ...in/io/ashdavies/cloud/CollectionReader.kt b/...in/io/ashdavies/cloud/CollectionReader.kt → ...in/io/ashdavies/cloud/CollectionReader.kt
diff --git a/...in/io/ashdavies/cloud/CollectionWriter.kt → ...in/io/ashdavies/cloud/CollectionWriter.kt b/...in/io/ashdavies/cloud/CollectionWriter.kt → ...in/io/ashdavies/cloud/CollectionWriter.kt
diff --git a/...in/io/ashdavies/cloud/DocumentProvider.kt → ...in/io/ashdavies/cloud/DocumentProvider.kt b/...in/io/ashdavies/cloud/DocumentProvider.kt → ...in/io/ashdavies/cloud/DocumentProvider.kt
diff --git a/...kotlin/io/ashdavies/cloud/QueryBuilder.kt → ...kotlin/io/ashdavies/cloud/QueryBuilder.kt b/...kotlin/io/ashdavies/cloud/QueryBuilder.kt → ...kotlin/io/ashdavies/cloud/QueryBuilder.kt
diff --git a/...ckend/cloud-run/.openapi-generator-ignore → cloud-run/.openapi-generator-ignore b/...ckend/cloud-run/.openapi-generator-ignore → cloud-run/.openapi-generator-ignore
diff --git a/cloud-backend/cloud-run/build.gradle.kts → cloud-run/build.gradle.kts b/cloud-backend/cloud-run/build.gradle.kts → cloud-run/build.gradle.kts
@@ -23,10 +23,10 @@ kotlin {
     jvmMain.dependencies {
         with(projects) {
             implementation(appCheck.appCheckSdk)
-            implementation(cloudBackend.cloudFirestore)
+            implementation(cloudFirestore)
             implementation(composeLocals)
+            implementation(httpClient)
             implementation(eventsAggregator)
-            implementation(cloudBackend.httpClient)
             implementation(localStorage)
         }
 

diff --git a/...lin/io/ashdavies/cloud/ApplicationTest.kt → ...lin/io/ashdavies/cloud/ApplicationTest.kt b/...lin/io/ashdavies/cloud/ApplicationTest.kt → ...lin/io/ashdavies/cloud/ApplicationTest.kt
diff --git a/...n/kotlin/io/ashdavies/cloud/Annotation.kt → ...n/kotlin/io/ashdavies/cloud/Annotation.kt b/...n/kotlin/io/ashdavies/cloud/Annotation.kt → ...n/kotlin/io/ashdavies/cloud/Annotation.kt
diff --git a/...vmMain/kotlin/io/ashdavies/cloud/Cloud.kt → ...vmMain/kotlin/io/ashdavies/cloud/Cloud.kt b/...vmMain/kotlin/io/ashdavies/cloud/Cloud.kt → ...vmMain/kotlin/io/ashdavies/cloud/Cloud.kt
diff --git a/...mMain/kotlin/io/ashdavies/cloud/Events.kt → ...mMain/kotlin/io/ashdavies/cloud/Events.kt b/...mMain/kotlin/io/ashdavies/cloud/Events.kt → ...mMain/kotlin/io/ashdavies/cloud/Events.kt
diff --git a/...ain/kotlin/io/ashdavies/cloud/Firebase.kt → ...ain/kotlin/io/ashdavies/cloud/Firebase.kt b/...ain/kotlin/io/ashdavies/cloud/Firebase.kt → ...ain/kotlin/io/ashdavies/cloud/Firebase.kt
diff --git a/...vmMain/kotlin/io/ashdavies/cloud/Hello.kt → ...vmMain/kotlin/io/ashdavies/cloud/Hello.kt b/...vmMain/kotlin/io/ashdavies/cloud/Hello.kt → ...vmMain/kotlin/io/ashdavies/cloud/Hello.kt
diff --git a/...jvmMain/kotlin/io/ashdavies/cloud/Main.kt → ...jvmMain/kotlin/io/ashdavies/cloud/Main.kt b/...jvmMain/kotlin/io/ashdavies/cloud/Main.kt → ...jvmMain/kotlin/io/ashdavies/cloud/Main.kt
diff --git a/...oud-run/src/jvmMain/resources/logback.xml → cloud-run/src/jvmMain/resources/logback.xml b/...oud-run/src/jvmMain/resources/logback.xml → cloud-run/src/jvmMain/resources/logback.xml
diff --git a/...n/resources/templates/data_class.mustache → ...n/resources/templates/data_class.mustache b/...n/resources/templates/data_class.mustache → ...n/resources/templates/data_class.mustache
diff --git a/...ces/templates/data_class_opt_var.mustache → ...ces/templates/data_class_opt_var.mustache b/...ces/templates/data_class_opt_var.mustache → ...ces/templates/data_class_opt_var.mustache
diff --git a/...ces/templates/data_class_req_var.mustache → ...ces/templates/data_class_req_var.mustache b/...ces/templates/data_class_req_var.mustache → ...ces/templates/data_class_req_var.mustache
diff --git a/...n/resources/templates/enum_class.mustache → ...n/resources/templates/enum_class.mustache b/...n/resources/templates/enum_class.mustache → ...n/resources/templates/enum_class.mustache
diff --git a/...vmMain/resources/templates/model.mustache → ...vmMain/resources/templates/model.mustache b/...vmMain/resources/templates/model.mustache → ...vmMain/resources/templates/model.mustache
diff --git a/dominion-app/build.gradle.kts b/dominion-app/build.gradle.kts
@@ -10,7 +10,7 @@ android {
 kotlin {
     commonMain.dependencies {
         implementation(projects.appCheck.appCheckClient)
-        implementation(projects.cloudBackend.httpClient)
+        implementation(projects.httpClient)
         implementation(projects.imageLoader)
 
         implementation(libs.arkivanov.parcelable)

diff --git a/events-aggregator/build.gradle.kts b/events-aggregator/build.gradle.kts
@@ -4,9 +4,9 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.cloudBackend.cloudFirestore)
-    implementation(projects.cloudBackend.microYaml)
+    implementation(projects.cloudFirestore)
     implementation(projects.localStorage)
+    implementation(projects.microYaml)
 
     testImplementation(libs.ktor.client.core)
 }
diff --git a/events-app/build.gradle.kts b/events-app/build.gradle.kts
@@ -15,7 +15,7 @@ kotlin {
         with(projects) {
             implementation(appCheck.appCheckClient)
             implementation(composeLocals)
-            implementation(cloudBackend.httpClient)
+            implementation(httpClient)
             implementation(imageLoader)
             implementation(localStorage)
         }

diff --git a/cloud-backend/google-cloud/.gitignore → google-cloud/.gitignore b/cloud-backend/google-cloud/.gitignore → google-cloud/.gitignore
diff --git a/cloud-backend/google-cloud/build.gradle.kts → google-cloud/build.gradle.kts b/cloud-backend/google-cloud/build.gradle.kts → google-cloud/build.gradle.kts
diff --git a/...oud/src/main/resources/gcloud_build_image → ...oud/src/main/resources/gcloud_build_image b/...oud/src/main/resources/gcloud_build_image → ...oud/src/main/resources/gcloud_build_image
diff --git a/...e-cloud/src/main/resources/openapi-v2.yml → ...e-cloud/src/main/resources/openapi-v2.yml b/...e-cloud/src/main/resources/openapi-v2.yml → ...e-cloud/src/main/resources/openapi-v2.yml
diff --git a/...oogle-cloud/src/main/terraform/backend.tf → google-cloud/src/main/terraform/backend.tf b/...oogle-cloud/src/main/terraform/backend.tf → google-cloud/src/main/terraform/backend.tf
diff --git a/...d/google-cloud/src/main/terraform/main.tf → google-cloud/src/main/terraform/main.tf b/...d/google-cloud/src/main/terraform/main.tf → google-cloud/src/main/terraform/main.tf
diff --git a/...oogle-cloud/src/main/terraform/modules.tf → google-cloud/src/main/terraform/modules.tf b/...oogle-cloud/src/main/terraform/modules.tf → google-cloud/src/main/terraform/modules.tf
diff --git a/...rraform/modules/github/repository/main.tf → ...rraform/modules/github/repository/main.tf b/...rraform/modules/github/repository/main.tf → ...rraform/modules/github/repository/main.tf
diff --git a/...form/modules/github/repository/outputs.tf → ...form/modules/github/repository/outputs.tf b/...form/modules/github/repository/outputs.tf → ...form/modules/github/repository/outputs.tf
diff --git a/...rm/modules/github/repository/variables.tf → ...rm/modules/github/repository/variables.tf b/...rm/modules/github/repository/variables.tf → ...rm/modules/github/repository/variables.tf
diff --git a/...orm/modules/github/repository/versions.tf → ...orm/modules/github/repository/versions.tf b/...orm/modules/github/repository/versions.tf → ...orm/modules/github/repository/versions.tf
diff --git a/...rm/modules/google/cloud-run-build/main.tf → ...rm/modules/google/cloud-run-build/main.tf b/...rm/modules/google/cloud-run-build/main.tf → ...rm/modules/google/cloud-run-build/main.tf
diff --git a/...modules/google/cloud-run-build/outputs.tf → ...modules/google/cloud-run-build/outputs.tf b/...modules/google/cloud-run-build/outputs.tf → ...modules/google/cloud-run-build/outputs.tf
diff --git a/...dules/google/cloud-run-build/variables.tf → ...dules/google/cloud-run-build/variables.tf b/...dules/google/cloud-run-build/variables.tf → ...dules/google/cloud-run-build/variables.tf
diff --git a/...odules/google/cloud-run-build/versions.tf → ...odules/google/cloud-run-build/versions.tf b/...odules/google/cloud-run-build/versions.tf → ...odules/google/cloud-run-build/versions.tf
diff --git a/...modules/google/cloud-run-endpoint/main.tf → ...modules/google/cloud-run-endpoint/main.tf b/...modules/google/cloud-run-endpoint/main.tf → ...modules/google/cloud-run-endpoint/main.tf
diff --git a/...ules/google/cloud-run-endpoint/outputs.tf → ...ules/google/cloud-run-endpoint/outputs.tf b/...ules/google/cloud-run-endpoint/outputs.tf → ...ules/google/cloud-run-endpoint/outputs.tf
diff --git a/...es/google/cloud-run-endpoint/variables.tf → ...es/google/cloud-run-endpoint/variables.tf b/...es/google/cloud-run-endpoint/variables.tf → ...es/google/cloud-run-endpoint/variables.tf
diff --git a/...les/google/cloud-run-endpoint/versions.tf → ...les/google/cloud-run-endpoint/versions.tf b/...les/google/cloud-run-endpoint/versions.tf → ...les/google/cloud-run-endpoint/versions.tf
diff --git a/...orm/modules/google/github-api-key/main.tf → ...orm/modules/google/github-api-key/main.tf b/...orm/modules/google/github-api-key/main.tf → ...orm/modules/google/github-api-key/main.tf
diff --git a/.../modules/google/github-api-key/outputs.tf → .../modules/google/github-api-key/outputs.tf b/.../modules/google/github-api-key/outputs.tf → .../modules/google/github-api-key/outputs.tf
diff --git a/...odules/google/github-api-key/variables.tf → ...odules/google/github-api-key/variables.tf b/...odules/google/github-api-key/variables.tf → ...odules/google/github-api-key/variables.tf
diff --git a/...modules/google/github-api-key/versions.tf → ...modules/google/github-api-key/versions.tf b/...modules/google/github-api-key/versions.tf → ...modules/google/github-api-key/versions.tf
diff --git a/...oogle-cloud/src/main/terraform/outputs.tf → google-cloud/src/main/terraform/outputs.tf b/...oogle-cloud/src/main/terraform/outputs.tf → google-cloud/src/main/terraform/outputs.tf
diff --git a/...gle-cloud/src/main/terraform/providers.tf → google-cloud/src/main/terraform/providers.tf b/...gle-cloud/src/main/terraform/providers.tf → google-cloud/src/main/terraform/providers.tf
diff --git a/...gle-cloud/src/main/terraform/variables.tf → google-cloud/src/main/terraform/variables.tf b/...gle-cloud/src/main/terraform/variables.tf → google-cloud/src/main/terraform/variables.tf
diff --git a/...ogle-cloud/src/main/terraform/versions.tf → google-cloud/src/main/terraform/versions.tf b/...ogle-cloud/src/main/terraform/versions.tf → google-cloud/src/main/terraform/versions.tf
diff --git a/cloud-backend/google-cloud/tf.sh → google-cloud/tf.sh b/cloud-backend/google-cloud/tf.sh → google-cloud/tf.sh
diff --git a/...end/http-client/.openapi-generator-ignore → http-client/.openapi-generator-ignore b/...end/http-client/.openapi-generator-ignore → http-client/.openapi-generator-ignore
diff --git a/cloud-backend/http-client/build.gradle.kts → http-client/build.gradle.kts b/cloud-backend/http-client/build.gradle.kts → http-client/build.gradle.kts
diff --git a/...lient/src/androidMain/AndroidManifest.xml → ...lient/src/androidMain/AndroidManifest.xml b/...lient/src/androidMain/AndroidManifest.xml → ...lient/src/androidMain/AndroidManifest.xml
diff --git a/...Main/kotlin/io/ashdavies/http/Software.kt → ...Main/kotlin/io/ashdavies/http/Software.kt b/...Main/kotlin/io/ashdavies/http/Software.kt → ...Main/kotlin/io/ashdavies/http/Software.kt
diff --git a/...idMain/kotlin/io/ashdavies/http/System.kt → ...idMain/kotlin/io/ashdavies/http/System.kt b/...idMain/kotlin/io/ashdavies/http/System.kt → ...idMain/kotlin/io/ashdavies/http/System.kt
diff --git a/...in/kotlin/io/ashdavies/http/ApiBuilder.kt → ...in/kotlin/io/ashdavies/http/ApiBuilder.kt b/...in/kotlin/io/ashdavies/http/ApiBuilder.kt → ...in/kotlin/io/ashdavies/http/ApiBuilder.kt
diff --git a/...n/kotlin/io/ashdavies/http/Environment.kt → ...n/kotlin/io/ashdavies/http/Environment.kt b/...n/kotlin/io/ashdavies/http/Environment.kt → ...n/kotlin/io/ashdavies/http/Environment.kt
diff --git a/...in/kotlin/io/ashdavies/http/HttpClient.kt → ...in/kotlin/io/ashdavies/http/HttpClient.kt b/...in/kotlin/io/ashdavies/http/HttpClient.kt → ...in/kotlin/io/ashdavies/http/HttpClient.kt
diff --git a/...n/kotlin/io/ashdavies/http/HttpRequest.kt → ...n/kotlin/io/ashdavies/http/HttpRequest.kt b/...n/kotlin/io/ashdavies/http/HttpRequest.kt → ...n/kotlin/io/ashdavies/http/HttpRequest.kt
diff --git a/...n/kotlin/io/ashdavies/http/LegacyEvent.kt → ...n/kotlin/io/ashdavies/http/LegacyEvent.kt b/...n/kotlin/io/ashdavies/http/LegacyEvent.kt → ...n/kotlin/io/ashdavies/http/LegacyEvent.kt
diff --git a/...onMain/kotlin/io/ashdavies/http/Result.kt → ...onMain/kotlin/io/ashdavies/http/Result.kt b/...onMain/kotlin/io/ashdavies/http/Result.kt → ...onMain/kotlin/io/ashdavies/http/Result.kt
diff --git a/...Main/kotlin/io/ashdavies/http/Software.kt → ...Main/kotlin/io/ashdavies/http/Software.kt b/...Main/kotlin/io/ashdavies/http/Software.kt → ...Main/kotlin/io/ashdavies/http/Software.kt
diff --git a/...monMain/kotlin/io/ashdavies/http/State.kt → ...monMain/kotlin/io/ashdavies/http/State.kt b/...monMain/kotlin/io/ashdavies/http/State.kt → ...monMain/kotlin/io/ashdavies/http/State.kt
diff --git a/...onMain/kotlin/io/ashdavies/http/System.kt → ...onMain/kotlin/io/ashdavies/http/System.kt b/...onMain/kotlin/io/ashdavies/http/System.kt → ...onMain/kotlin/io/ashdavies/http/System.kt
diff --git a/...Main/kotlin/io/ashdavies/http/Software.kt → ...Main/kotlin/io/ashdavies/http/Software.kt b/...Main/kotlin/io/ashdavies/http/Software.kt → ...Main/kotlin/io/ashdavies/http/Software.kt
diff --git a/...vmMain/kotlin/io/ashdavies/http/System.kt → ...vmMain/kotlin/io/ashdavies/http/System.kt b/...vmMain/kotlin/io/ashdavies/http/System.kt → ...vmMain/kotlin/io/ashdavies/http/System.kt
diff --git a/image-loader/build.gradle.kts b/image-loader/build.gradle.kts
@@ -8,7 +8,7 @@ android {
 
 kotlin {
     commonMain.dependencies {
-        implementation(projects.cloudBackend.httpClient)
+        implementation(projects.httpClient)
         implementation(libs.ktor.client.core)
     }
 }
diff --git a/cloud-backend/micro-yaml/build.gradle.kts → micro-yaml/build.gradle.kts b/cloud-backend/micro-yaml/build.gradle.kts → micro-yaml/build.gradle.kts
diff --git a/...mmonMain/kotlin/io/ashdavies/yaml/Yaml.kt → ...mmonMain/kotlin/io/ashdavies/yaml/Yaml.kt b/...mmonMain/kotlin/io/ashdavies/yaml/Yaml.kt → ...mmonMain/kotlin/io/ashdavies/yaml/Yaml.kt
diff --git a/ratings-app/build.gradle.kts b/ratings-app/build.gradle.kts
@@ -10,7 +10,7 @@ android {
 kotlin {
     commonMain.dependencies {
         with(projects) {
-            implementation(cloudBackend.httpClient)
+            implementation(httpClient)
             implementation(imageLoader)
             implementation(notionClient)
         }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -36,18 +36,18 @@ include(
     ":app-launcher:android",
     ":app-launcher:common",
     ":app-launcher:desktop",
-    ":cloud-backend:cloud-firestore",
-    ":cloud-backend:cloud-run",
-    ":cloud-backend:google-cloud",
-    ":cloud-backend:http-client",
-    ":cloud-backend:micro-yaml",
+    ":cloud-firestore",
+    ":cloud-run",
     ":compose-locals",
     ":dominion-app",
     ":events-aggregator",
     ":events-app",
     ":firebase-compose",
+    ":google-cloud",
+    ":http-client",
     ":image-loader",
     ":local-storage",
+    ":micro-yaml",
     ":notion-client",
     ":notion-console",
     ":parcelable-support",