Merge branch 'main' into Issue-789

DroidKaigi · Aug 23, 2023 · 6b410e2 · 6b410e2
2 parents c507ef9 + 281ff65
commit 6b410e2
Show file tree

Hide file tree

Showing 33 changed files with 2,517 additions and 272 deletions.
diff --git a/...s-shared/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/shared/KmpEntryPoint.kt b/...s-shared/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/shared/KmpEntryPoint.kt
@@ -10,10 +10,12 @@ import org.koin.dsl.module
 import kotlin.reflect.KClass
 
 class KmpEntryPoint {
+    private val defaultBaseUrl = "https://ssot-api-staging.an.r.appspot.com/"
+
     // Please EntryPoint.get() instead of this property
     lateinit var koinApplication: KoinApplication
+
     fun init(
-        baseUrl: String = "https://ssot-api-staging.an.r.appspot.com/",
         remoteConfigApi: RemoteConfigApi,
         authenticator: Authenticator,
     ) {
@@ -22,7 +24,7 @@ class KmpEntryPoint {
                 dataModule,
                 module {
                     single {
-                        BaseUrl(baseUrl)
+                        BaseUrl(defaultBaseUrl)
                     }
                     single {
                         remoteConfigApi

diff --git a/app-ios-shared/src/iosMain/kotlin/io/github/droidkaigi/confsched2023/shared/KmpHelper.kt b/app-ios-shared/src/iosMain/kotlin/io/github/droidkaigi/confsched2023/shared/KmpHelper.kt
@@ -0,0 +1,11 @@
+package io.github.droidkaigi.confsched2023.shared
+
+import kotlinx.cinterop.BetaInteropApi
+import kotlinx.cinterop.ObjCProtocol
+import kotlinx.cinterop.getOriginalKotlinClass
+
+@OptIn(BetaInteropApi::class)
+fun KmpEntryPoint.get(objCProtocol: ObjCProtocol): Any {
+    val kClazz = getOriginalKotlinClass(objCProtocol)!!
+    return get(kClazz)
+}
diff --git a/...ios-shared/src/iosTest/kotlin/io/github/droidkaigi/confsched2023/shared/EntryPointTest.kt b/...ios-shared/src/iosTest/kotlin/io/github/droidkaigi/confsched2023/shared/EntryPointTest.kt
@@ -21,7 +21,6 @@ class EntryPointTest {
     fun get() {
         val kmpEntryPoint = KmpEntryPoint()
         kmpEntryPoint.init(
-            baseUrl = "https://ssot-api-staging.an.r.appspot.com/",
             remoteConfigApi = object : RemoteConfigApi {
                 override suspend fun getBoolean(key: String): Boolean {
                     return true

diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj
@@ -15,6 +15,7 @@
 		D77DAF8329FAA14A007195DB /* DroidKaigi2023Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77DAF8229FAA14A007195DB /* DroidKaigi2023Tests.swift */; };
 		D77DAF8D29FAA14A007195DB /* DroidKaigi2023UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77DAF8C29FAA14A007195DB /* DroidKaigi2023UITests.swift */; };
 		D77DAF8F29FAA14A007195DB /* DroidKaigi2023UITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77DAF8E29FAA14A007195DB /* DroidKaigi2023UITestsLaunchTests.swift */; };
+		E823229C2A93E4BA005C0DBD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = E823229B2A93E4BA005C0DBD /* GoogleService-Info.plist */; };
 		E8BCCCE72A8011E8004010F7 /* Modules in Resources */ = {isa = PBXBuildFile; fileRef = E8BCCCE62A8011E8004010F7 /* Modules */; };
 		E8BCCCEC2A80123E004010F7 /* Navigation in Frameworks */ = {isa = PBXBuildFile; productRef = E8BCCCEB2A80123E004010F7 /* Navigation */; };
 		E8BCCCF12A80126D004010F7 /* ci_post_clone.sh in Resources */ = {isa = PBXBuildFile; fileRef = E8BCCCEF2A80126D004010F7 /* ci_post_clone.sh */; };
@@ -49,6 +50,7 @@
 		D77DAF8829FAA14A007195DB /* DroidKaigi2023UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DroidKaigi2023UITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		D77DAF8C29FAA14A007195DB /* DroidKaigi2023UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DroidKaigi2023UITests.swift; sourceTree = "<group>"; };
 		D77DAF8E29FAA14A007195DB /* DroidKaigi2023UITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DroidKaigi2023UITestsLaunchTests.swift; sourceTree = "<group>"; };
+		E823229B2A93E4BA005C0DBD /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		E8BCCCE62A8011E8004010F7 /* Modules */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Modules; path = ../../Modules; sourceTree = "<group>"; };
 		E8BCCCEF2A80126D004010F7 /* ci_post_clone.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = ci_post_clone.sh; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -117,6 +119,7 @@
 				D77DAF7429FAA149007195DB /* Assets.xcassets */,
 				D77DAF7629FAA149007195DB /* DroidKaigi2023.entitlements */,
 				6F7D5C062A918148008FBEB7 /* license-list.plist */,
+				E823229B2A93E4BA005C0DBD /* GoogleService-Info.plist */,
 				D77DAF7729FAA149007195DB /* Preview Content */,
 			);
 			path = DroidKaigi2023;
@@ -270,6 +273,7 @@
 				6F7D5C072A918148008FBEB7 /* license-list.plist in Resources */,
 				E8BCCCE72A8011E8004010F7 /* Modules in Resources */,
 				D77DAF7929FAA149007195DB /* Preview Assets.xcassets in Resources */,
+				E823229C2A93E4BA005C0DBD /* GoogleService-Info.plist in Resources */,
 				D77DAF7529FAA149007195DB /* Assets.xcassets in Resources */,
 				E8BCCCF12A80126D004010F7 /* ci_post_clone.sh in Resources */,
 			);

diff --git a/...gi2023/DroidKaigi2023.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...gi2023/DroidKaigi2023.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,14 @@
 {
   "pins" : [
+    {
+      "identity" : "abseil-cpp-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/abseil-cpp-binary.git",
+      "state" : {
+        "revision" : "bfc0b6f81adc06ce5121eb23f628473638d67c5c",
+        "version" : "1.2022062300.0"
+      }
+    },
     {
       "identity" : "collectionconcurrencykit",
       "kind" : "remoteSourceControl",
@@ -36,6 +45,87 @@
         "version" : "0.2.1"
       }
     },
+    {
+      "identity" : "firebase-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/firebase-ios-sdk",
+      "state" : {
+        "revision" : "df2171b0c6afb9e9d4f7e07669d558c510b9f6be",
+        "version" : "10.13.0"
+      }
+    },
+    {
+      "identity" : "googleappmeasurement",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleAppMeasurement.git",
+      "state" : {
+        "revision" : "03b9beee1a61f62d32c521e172e192a1663a5e8b",
+        "version" : "10.13.0"
+      }
+    },
+    {
+      "identity" : "googledatatransport",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleDataTransport.git",
+      "state" : {
+        "revision" : "aae45a320fd0d11811820335b1eabc8753902a40",
+        "version" : "9.2.5"
+      }
+    },
+    {
+      "identity" : "googleutilities",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleUtilities.git",
+      "state" : {
+        "revision" : "c38ce365d77b04a9a300c31061c5227589e5597b",
+        "version" : "7.11.5"
+      }
+    },
+    {
+      "identity" : "grpc-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/grpc-binary.git",
+      "state" : {
+        "revision" : "f1b366129d1125be7db83247e003fc333104b569",
+        "version" : "1.50.2"
+      }
+    },
+    {
+      "identity" : "gtm-session-fetcher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/gtm-session-fetcher.git",
+      "state" : {
+        "revision" : "d415594121c9e8a4f9d79cecee0965cf35e74dbd",
+        "version" : "3.1.1"
+      }
+    },
+    {
+      "identity" : "leveldb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/leveldb.git",
+      "state" : {
+        "revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b",
+        "version" : "1.22.2"
+      }
+    },
+    {
+      "identity" : "nanopb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/nanopb.git",
+      "state" : {
+        "revision" : "819d0a2173aff699fb8c364b6fb906f7cdb1a692",
+        "version" : "2.30909.0"
+      }
+    },
+    {
+      "identity" : "promises",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/promises.git",
+      "state" : {
+        "revision" : "e70e889c0196c76d22759eb50d6a0270ca9f1d9e",
+        "version" : "2.3.1"
+      }
+    },
     {
       "identity" : "sourcekitten",
       "kind" : "remoteSourceControl",
@@ -117,6 +207,15 @@
         "version" : "1.0.2"
       }
     },
+    {
+      "identity" : "swift-protobuf",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-protobuf.git",
+      "state" : {
+        "revision" : "ce20dc083ee485524b802669890291c0d8090170",
+        "version" : "1.22.1"
+      }
+    },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",

diff --git a/...pp/DroidKaigi2023/DroidKaigi2023.xcodeproj/xcshareddata/xcschemes/DroidKaigi2023.xcscheme b/...pp/DroidKaigi2023/DroidKaigi2023.xcodeproj/xcshareddata/xcschemes/DroidKaigi2023.xcscheme
@@ -20,146 +20,6 @@
                ReferencedContainer = "container:DroidKaigi2023.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "SessionTests"
-               BuildableName = "SessionTests"
-               BlueprintName = "SessionTests"
-               ReferencedContainer = "container:../../Modules">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "TimetableTests"
-               BuildableName = "TimetableTests"
-               BlueprintName = "TimetableTests"
-               ReferencedContainer = "container:../../Modules">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "FloorMapTests"
-               BuildableName = "FloorMapTests"
-               BlueprintName = "FloorMapTests"
-               ReferencedContainer = "container:../../Modules">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AboutTests"
-               BuildableName = "AboutTests"
-               BlueprintName = "AboutTests"
-               ReferencedContainer = "container:../../Modules">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "StampsTests"
-               BuildableName = "StampsTests"
-               BlueprintName = "StampsTests"
-               ReferencedContainer = "container:../../Modules">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ModelTests"
-               BuildableName = "ModelTests"
-               BlueprintName = "ModelTests"
-               ReferencedContainer = "container:../../Modules">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "SponsorTests"
-               BuildableName = "SponsorTests"
-               BlueprintName = "SponsorTests"
-               ReferencedContainer = "container:../../Modules">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ComponentTests"
-               BuildableName = "ComponentTests"
-               BlueprintName = "ComponentTests"
-               ReferencedContainer = "container:../../Modules">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ContributorTests"
-               BuildableName = "ContributorTests"
-               BlueprintName = "ContributorTests"
-               ReferencedContainer = "container:../../Modules">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "KMPContainerTests"
-               BuildableName = "KMPContainerTests"
-               BlueprintName = "KMPContainerTests"
-               ReferencedContainer = "container:../../Modules">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction

diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023/GoogleService-Info.plist b/app-ios/App/DroidKaigi2023/DroidKaigi2023/GoogleService-Info.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>1046519477136-gni68m3pq6059ivee422f6mfpp7h1c0h.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.1046519477136-gni68m3pq6059ivee422f6mfpp7h1c0h</string>
+	<key>ANDROID_CLIENT_ID</key>
+	<string>1046519477136-8nv86645bl6a09hr0rqrr7qso3u9n16u.apps.googleusercontent.com</string>
+	<key>API_KEY</key>
+	<string>AIzaSyDl9v9XzP31jrauM1twqkNPi-m5J3B2nrM</string>
+	<key>GCM_SENDER_ID</key>
+	<string>1046519477136</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>io.github.droidkaigi.DroidKaigi2023</string>
+	<key>PROJECT_ID</key>
+	<string>ssot-api-staging</string>
+	<key>STORAGE_BUCKET</key>
+	<string>ssot-api-staging.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false/>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false/>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true/>
+	<key>IS_GCM_ENABLED</key>
+	<true/>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true/>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:1046519477136:ios:a9459b469c5a1984a8f915</string>
+</dict>
+</plist>