build: update android dev package ID and update CI

kosukesaigusa · Sep 26, 2023 · bf1b27b · bf1b27b
1 parent ef06c2e
commit bf1b27b
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 6 deletions.
diff --git a/.github/workflows/release_to_dev.yaml b/.github/workflows/release_to_dev.yaml
@@ -55,7 +55,7 @@ jobs:
             --dart-define-from-file="dev-dart-define.json" \
             -t "lib/main.dart" \
             --build-name=$(grep 'version:' pubspec.yaml | cut -d ' ' -f 2 | cut -d '+' -f 1) \
-            --build-number=$GITHUB_RUN_NUMBER \
+            --build-number=$GITHUB_RUN_NUMBER
 
       - name: Get latest 10 commit messages
         run: echo "LATEST_COMMIT_MESSAGES=$(git log -n 10 --pretty=format:'%s' | tr '\n' '; ')" >> $GITHUB_ENV

diff --git a/packages/mottai_flutter_app/android/app/build.gradle b/packages/mottai_flutter_app/android/app/build.gradle
@@ -72,7 +72,8 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationIdSuffix appIdSuffix
+        // .dev の開発版 Android アプリを削除することにした都合による特別対応
+        applicationIdSuffix  appIdSuffix == '.dev' ? '.dev2' : appIdSuffix
         resValue "string", "app_name", appName
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.

diff --git a/packages/mottai_flutter_app/android/app/src/dev/google-services.json b/packages/mottai_flutter_app/android/app/src/dev/google-services.json
@@ -13,6 +13,75 @@
         }
       },
       "oauth_client": [
+        {
+          "client_id": "709197089170-1ag90aipfrq9hsdobogbtfci0efmgaea.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.kosukesaigusa.mottai_flutter_app.dev",
+            "certificate_hash": "e40a3161ff6c8155a5461bb2f6012713653035a6"
+          }
+        },
+        {
+          "client_id": "709197089170-7r1q09vr5g5ipeh5n5p1qdndig47bet5.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.kosukesaigusa.mottai_flutter_app.dev",
+            "certificate_hash": "43737e207d9b07c8f3435b6add912af5ad7c5236"
+          }
+        },
+        {
+          "client_id": "709197089170-vr0qlak6fl65rn3e8rcbesko660eh5u7.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.kosukesaigusa.mottai_flutter_app.dev",
+            "certificate_hash": "968f3fb49f0d6f8bf0f930d8188522f588728d73"
+          }
+        },
+        {
+          "client_id": "709197089170-so0p0jb6k3hatq065fpgmij2v8e4a2s4.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAR_-jpRLOtS59zlNI1KCufmI4OOwBERkM"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "709197089170-so0p0jb6k3hatq065fpgmij2v8e4a2s4.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "709197089170-1lr8vaboc73s41u7l2vijfqs2c7udu0n.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "com.kosukesaigusa.mottaiFlutterApp.dev",
+                "app_store_id": "1611315150"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:709197089170:android:34a5db658be064737ed94b",
+        "android_client_info": {
+          "package_name": "com.kosukesaigusa.mottai_flutter_app.dev2"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "709197089170-uq4nh0sucgsseko6d55qgt20t2im54sl.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.kosukesaigusa.mottai_flutter_app.dev2",
+            "certificate_hash": "43737e207d9b07c8f3435b6add912af5ad7c5236"
+          }
+        },
         {
           "client_id": "709197089170-so0p0jb6k3hatq065fpgmij2v8e4a2s4.apps.googleusercontent.com",
           "client_type": 3
@@ -44,4 +113,4 @@
     }
   ],
   "configuration_version": "1"
-}
+}
diff --git a/packages/mottai_flutter_app/ios/Runner.xcodeproj/project.pbxproj b/packages/mottai_flutter_app/ios/Runner.xcodeproj/project.pbxproj
@@ -12,6 +12,7 @@
 		297A5A7A2A88C34A00AF0025 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 297A5A792A88C34A00AF0025 /* GoogleService-Info.plist */; };
 		34098A852A66A18D00F26932 /* Environment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34098A842A66A18D00F26932 /* Environment.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		3DC322F1EC9E3FCBFD994DE8 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 73C3BE9D4F2ACDA250F99D0D /* GoogleService-Info.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -40,6 +41,7 @@
 		34098A842A66A18D00F26932 /* Environment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Environment.swift; sourceTree = "<group>"; };
 		348BD0AD2A5EFAB200466D18 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		73C3BE9D4F2ACDA250F99D0D /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -104,6 +106,7 @@
 				97C146EF1CF9000F007C117D /* Products */,
 				5F3953F8001CD383B57592C6 /* Pods */,
 				63E4DE7E0E406F5FF319A695 /* Frameworks */,
+				73C3BE9D4F2ACDA250F99D0D /* GoogleService-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@@ -202,6 +205,7 @@
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 				297A5A7A2A88C34A00AF0025 /* GoogleService-Info.plist in Resources */,
+				3DC322F1EC9E3FCBFD994DE8 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/packages/mottai_flutter_app/ios/firebase_app_id_file.json b/packages/mottai_flutter_app/ios/firebase_app_id_file.json
@@ -4,4 +4,4 @@
   "GOOGLE_APP_ID": "1:709197089170:ios:7617a4349b5968e77ed94b",
   "FIREBASE_PROJECT_ID": "mottai-app-dev-2",
   "GCM_SENDER_ID": "709197089170"
-}
+}
diff --git a/packages/mottai_flutter_app/lib/environment/src/firebase_options_dev.dart b/packages/mottai_flutter_app/lib/environment/src/firebase_options_dev.dart
@@ -51,7 +51,7 @@ class DefaultFirebaseOptions {
 
   static const FirebaseOptions android = FirebaseOptions(
     apiKey: 'AIzaSyAR_-jpRLOtS59zlNI1KCufmI4OOwBERkM',
-    appId: '1:709197089170:android:ea115cc56387c6c37ed94b',
+    appId: '1:709197089170:android:34a5db658be064737ed94b',
     messagingSenderId: '709197089170',
     projectId: 'mottai-app-dev-2',
     storageBucket: 'mottai-app-dev-2.appspot.com',
@@ -64,7 +64,7 @@ class DefaultFirebaseOptions {
     projectId: 'mottai-app-dev-2',
     storageBucket: 'mottai-app-dev-2.appspot.com',
     androidClientId:
-        '709197089170-eoscur7kmv2s45ikpgkvdjtim6b6sbgb.apps.googleusercontent.com',
+        '709197089170-1ag90aipfrq9hsdobogbtfci0efmgaea.apps.googleusercontent.com',
     iosClientId:
         '709197089170-1lr8vaboc73s41u7l2vijfqs2c7udu0n.apps.googleusercontent.com',
     iosBundleId: 'com.kosukesaigusa.mottaiFlutterApp.dev',