From dc149578f78392479a80848232398cb2b9b150a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=E8=97=A4=E6=B1=B0=E4=B8=80?= Date: Thu, 19 Sep 2024 17:30:46 +0900 Subject: [PATCH 1/8] =?UTF-8?q?firebase=20crashlytics=E3=81=AE=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 6148 bytes .gitignore | 3 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 -- TimeWatcherExternalResouce/Package.resolved | 15 --- TimeWatcherPrj/.DS_Store | Bin 6148 -> 6148 bytes .../TimeWatcher.xcodeproj/project.pbxproj | 95 ++++++++++++++++-- .../AccentColor.colorset/Contents.json | 38 +++++++ .../View/RootView/TimeWatcherApp.swift | 12 +++ .../Intent/TimerResetIntent.swift | 1 + .../Intent/TimerStartIntent.swift | 1 + .../Intent/TimerStopIntent.swift | 1 + 11 files changed, 143 insertions(+), 31 deletions(-) delete mode 100644 TimeWatcherExternalResouce/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 TimeWatcherExternalResouce/Package.resolved create mode 100644 TimeWatcherPrj/TimeWatcher/Asset.xcassets/AccentColor.colorset/Contents.json diff --git a/.DS_Store b/.DS_Store index 1a0836cd7fbb26df432a37155196a2c5cbfa1fa6..9f6a00176ef322c45a0eea64a7db163209478c1f 100644 GIT binary patch delta 113 zcmZoMXfc@J&&awlU^gQp>tr6LU}om|B9r$pc}!l##Kq=tORs>*Z}Kjt5Dp0Qm?Kb) z+vFH#ULEEK3_!rg5WDF$4f{R!VVlPEvk;4&&xR<|3BO I>>Pjj0q>(8vH$=8 delta 74 zcmZoMXfc@J&&aYdU^gQp%VZv=U}h$r#gq3ic}!l##Ko4R6n1B|*W_JHAsi6qF-M>p ax5+Wgyi805n-?;tu}o|*+sw}KmmdIZXBYPX diff --git a/.gitignore b/.gitignore index c125072..e4d8b5a 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,6 @@ fastlane/report.xml fastlane/Preview.html fastlane/screenshots/**/*.png fastlane/test_output + +# firebase +GoogleService-Info.plist \ No newline at end of file diff --git a/TimeWatcherExternalResouce/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/TimeWatcherExternalResouce/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/TimeWatcherExternalResouce/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/TimeWatcherExternalResouce/Package.resolved b/TimeWatcherExternalResouce/Package.resolved deleted file mode 100644 index 3c4a3e5..0000000 --- a/TimeWatcherExternalResouce/Package.resolved +++ /dev/null @@ -1,15 +0,0 @@ -{ - "originHash" : "d2a35cb95b14456eca1d9d32351c61310bdfd62a2b29e781ab4a779012b7912d", - "pins" : [ - { - "identity" : "swiftgenplugin", - "kind" : "remoteSourceControl", - "location" : "https://github.com/SwiftGen/SwiftGenPlugin", - "state" : { - "revision" : "879b85a470cacd70c19e22eb7e11a3aed66f4068", - "version" : "6.6.2" - } - } - ], - "version" : 3 -} diff --git a/TimeWatcherPrj/.DS_Store b/TimeWatcherPrj/.DS_Store index 93e4b6fec19d13faf36865bd9ed7e20e753e1522..a8a07c40f29bf087c1f35ec85c51f3b259e8534a 100644 GIT binary patch delta 90 zcmZoMXfc@J&&awlU^gQxD+2=q_hbPkG0v3Y+TQTu6Ggkcuvn!Z* o*lH%s31Rn}e1^$j@-85k&ntZoBZzCqcwn<2^G%k`>>Pjj0i)|1s{jB1 delta 75 zcmZoMXfc@J&&aYdU^gQp%jAztdXr Bool { + + FirebaseApp.configure() + return true + } +} @main @MainActor struct TimeWatcherApp: App { + @UIApplicationDelegateAdaptor(AppDelegate.self) var delegate + // Deep Linkで開かれた際の情報を持つViewModel private var openUrlViewModel = OpenUrlViewModel() diff --git a/TimeWatcherPrj/TimeWatcherWidget/Intent/TimerResetIntent.swift b/TimeWatcherPrj/TimeWatcherWidget/Intent/TimerResetIntent.swift index fd3087c..4a5373c 100644 --- a/TimeWatcherPrj/TimeWatcherWidget/Intent/TimerResetIntent.swift +++ b/TimeWatcherPrj/TimeWatcherWidget/Intent/TimerResetIntent.swift @@ -15,6 +15,7 @@ struct TimerResetIntent: AppIntent { private(set) var timeWatch: TimeWatch private let liveActivityManager: LiveActivityManaging + @preconcurrency @MainActor init() { diff --git a/TimeWatcherPrj/TimeWatcherWidget/Intent/TimerStartIntent.swift b/TimeWatcherPrj/TimeWatcherWidget/Intent/TimerStartIntent.swift index a20b54f..74dade1 100644 --- a/TimeWatcherPrj/TimeWatcherWidget/Intent/TimerStartIntent.swift +++ b/TimeWatcherPrj/TimeWatcherWidget/Intent/TimerStartIntent.swift @@ -15,6 +15,7 @@ struct TimerStartIntent: AppIntent, TimerControlable { private(set) var timeWatch: TimeWatch private(set) var dateDependency: DateDependency + @preconcurrency @MainActor init() { diff --git a/TimeWatcherPrj/TimeWatcherWidget/Intent/TimerStopIntent.swift b/TimeWatcherPrj/TimeWatcherWidget/Intent/TimerStopIntent.swift index 4c063ef..688bef6 100644 --- a/TimeWatcherPrj/TimeWatcherWidget/Intent/TimerStopIntent.swift +++ b/TimeWatcherPrj/TimeWatcherWidget/Intent/TimerStopIntent.swift @@ -15,6 +15,7 @@ struct TimerStopIntent: AppIntent, TimerControlable { private(set) var liveActivityManager: LiveActivityManaging private(set) var dateDependency: DateDependency + @preconcurrency @MainActor init() { From d38d575cad5dcbd15868898d29bc8af148104f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=E8=97=A4=E6=B1=B0=E4=B8=80?= Date: Sat, 5 Oct 2024 17:50:25 +0900 Subject: [PATCH 2/8] =?UTF-8?q?Crashlytics=E3=81=AE=E6=9C=89=E5=8A=B9?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 6148 bytes TimeWatcherPrj/.DS_Store | Bin 6148 -> 6148 bytes .../TimeWatcher.xcodeproj/project.pbxproj | 17 ++++++++++++++--- .../TimeWatcher/GoogleService-Info.plist | 12 ++++++------ TimeWatcherPrj/TimeWatcher/Info.plist | 1 - 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.DS_Store b/.DS_Store index 223256161155e1a4d55067d32d137a2010b6bb20..0edc174cb7b2f03d6a9809a6f17f5bf0e2a3f751 100644 GIT binary patch delta 53 zcmZoMXffEZk%{Sg&17C?kIBE8xL8AehUZM2%*7na0cJ%UbDSK@b1{cSTORAGE_BUCKET timewatcher-3f867.appspot.com IS_ADS_ENABLED - + IS_ANALYTICS_ENABLED - + IS_APPINVITE_ENABLED - + IS_GCM_ENABLED - + IS_SIGNIN_ENABLED - + GOOGLE_APP_ID 1:737878122807:ios:ea84628955a8adc8153ab2 - \ No newline at end of file + diff --git a/TimeWatcherPrj/TimeWatcher/Info.plist b/TimeWatcherPrj/TimeWatcher/Info.plist index 9c71438..bc11256 100644 --- a/TimeWatcherPrj/TimeWatcher/Info.plist +++ b/TimeWatcherPrj/TimeWatcher/Info.plist @@ -6,4 +6,3 @@ - From 0adbd7a750a70928fef27f8a7931f79de47bccc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=E8=97=A4=E6=B1=B0=E4=B8=80?= Date: Mon, 7 Oct 2024 13:36:36 +0900 Subject: [PATCH 3/8] =?UTF-8?q?CI=E7=92=B0=E5=A2=83=E3=82=92=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E3=81=AEXcode=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d4c142..4a4e616 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,14 +7,14 @@ on: workflow_dispatch: env: - DEVELOPER_DIR: /Applications/Xcode_15.0.app + DEVELOPER_DIR: /Applications/Xcode_16.0.app WORKSPACE_PATH: TimerWatcherWorkspace.xcworkspace TARGET_SCHEME_NAME: TimeWatcher TARGET_TEST_PLAN_NAME: TimeWatcher jobs: build: - runs-on: macos-13 + runs-on: macos-latest steps: # チェックアウト(リポジトリからソースコードを取得) @@ -25,6 +25,10 @@ jobs: - name: Show Xcode list run: ls /Applications | grep 'Xcode' + # Xcodeのバージョン指定 + - name: Select Xcode version + run: sudo xcode-select -s ${{ env.DEVELOPER_DIR }} + # Xcodeのバージョン出力 - name: Show Xcode version run: xcodebuild -version From 94f22c9136ef9a4eac615bcc62d192f8551fffd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=E8=97=A4=E6=B1=B0=E4=B8=80?= Date: Mon, 7 Oct 2024 16:23:09 +0900 Subject: [PATCH 4/8] =?UTF-8?q?GoogleService-Info.plist=E3=81=AE=E3=82=B7?= =?UTF-8?q?=E3=83=BC=E3=82=AF=E3=83=AC=E3=83=83=E3=83=88=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 7 +++++ .../TimeWatcher/GoogleService-Info.plist | 30 ------------------- 2 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 TimeWatcherPrj/TimeWatcher/GoogleService-Info.plist diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a4e616..00cb99f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,7 @@ env: WORKSPACE_PATH: TimerWatcherWorkspace.xcworkspace TARGET_SCHEME_NAME: TimeWatcher TARGET_TEST_PLAN_NAME: TimeWatcher + GOOGLE_SERVICE_INFO_PLIST_PATH: TimeWatcherPrj/TimeWatcher/GoogleService-Info.plist jobs: build: @@ -55,6 +56,12 @@ jobs: path: SourcePackages key: ${{ runner.os }}-spm-${{ hashFiles('*.xcodeproj/project.xcworkspace/ xcshareddata/swiftpm/Package.resolved') }} restore-keys: ${{ runner.os }}-spm- + + # GoogleService-Info.plistの復元 + - name: Decode GoogleService-Info.plist + run: | + base64 -d ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_CONTENT }} > ${{ env.GOOGLE_SERVICE_INFO_PLIST_PATH }} + # ビルド - name: Xcode virify run: set -o pipefail && diff --git a/TimeWatcherPrj/TimeWatcher/GoogleService-Info.plist b/TimeWatcherPrj/TimeWatcher/GoogleService-Info.plist deleted file mode 100644 index fec6724..0000000 --- a/TimeWatcherPrj/TimeWatcher/GoogleService-Info.plist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - API_KEY - AIzaSyAwkh-a9aOe63RdSso7ABtd4CakYJlaIyk - GCM_SENDER_ID - 737878122807 - PLIST_VERSION - 1 - BUNDLE_ID - taichi.satou.TimeWatcher - PROJECT_ID - timewatcher-3f867 - STORAGE_BUCKET - timewatcher-3f867.appspot.com - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:737878122807:ios:ea84628955a8adc8153ab2 - - From fa9ed0c4190463045ea3e46fe0603fb282bd82ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=E8=97=A4=E6=B1=B0=E4=B8=80?= Date: Mon, 7 Oct 2024 16:25:58 +0900 Subject: [PATCH 5/8] =?UTF-8?q?Decode=20GoogleService-Info.plist=E3=81=AE?= =?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00cb99f..9bdbc85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: # GoogleService-Info.plistの復元 - name: Decode GoogleService-Info.plist run: | - base64 -d ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_CONTENT }} > ${{ env.GOOGLE_SERVICE_INFO_PLIST_PATH }} + base64 -D ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_CONTENT }} -o ${{ env.GOOGLE_SERVICE_INFO_PLIST_PATH }} # ビルド - name: Xcode virify From a7fb9738a147ba32015626c2dad543f3320de813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=E8=97=A4=E6=B1=B0=E4=B8=80?= Date: Mon, 7 Oct 2024 16:30:30 +0900 Subject: [PATCH 6/8] =?UTF-8?q?Decode=20GoogleService-Info.plist=E3=81=AE?= =?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E4=BF=AE=E6=AD=A32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bdbc85..e583fa4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: # GoogleService-Info.plistの復元 - name: Decode GoogleService-Info.plist run: | - base64 -D ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_CONTENT }} -o ${{ env.GOOGLE_SERVICE_INFO_PLIST_PATH }} + echo ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_CONTENT }} | base64 -o ${{ env.GOOGLE_SERVICE_INFO_PLIST_PATH }} -D # ビルド - name: Xcode virify From 25a43afd38e0130d528daac767680e893e656364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=E8=97=A4=E6=B1=B0=E4=B8=80?= Date: Mon, 7 Oct 2024 20:13:43 +0900 Subject: [PATCH 7/8] =?UTF-8?q?CD=E3=81=AB=E3=82=82GoogleService-Info.plis?= =?UTF-8?q?t=E5=8F=96=E5=BE=97=E3=82=B9=E3=83=86=E3=83=83=E3=83=97?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cdBeta.yml | 6 ++++++ .github/workflows/cdRelease.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/cdBeta.yml b/.github/workflows/cdBeta.yml index df07e5d..18d2abe 100644 --- a/.github/workflows/cdBeta.yml +++ b/.github/workflows/cdBeta.yml @@ -51,6 +51,12 @@ jobs: path: SourcePackages key: ${{ runner.os }}-spm-${{ hashFiles('*.xcodeproj/project.xcworkspace/ xcshareddata/swiftpm/Package.resolved') }} restore-keys: ${{ runner.os }}-spm- + + # GoogleService-Info.plistの復元 + - name: Decode GoogleService-Info.plist + run: | + echo ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_CONTENT }} | base64 -o ${{ env.GOOGLE_SERVICE_INFO_PLIST_PATH }} -D + # TestFlight用にデプロイ - name: deploy run: set -o pipefail && diff --git a/.github/workflows/cdRelease.yml b/.github/workflows/cdRelease.yml index 5605ba2..bd777b9 100644 --- a/.github/workflows/cdRelease.yml +++ b/.github/workflows/cdRelease.yml @@ -51,6 +51,12 @@ jobs: path: SourcePackages key: ${{ runner.os }}-spm-${{ hashFiles('*.xcodeproj/project.xcworkspace/ xcshareddata/swiftpm/Package.resolved') }} restore-keys: ${{ runner.os }}-spm- + + # GoogleService-Info.plistの復元 + - name: Decode GoogleService-Info.plist + run: | + echo ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_CONTENT }} | base64 -o ${{ env.GOOGLE_SERVICE_INFO_PLIST_PATH }} -D + # TestFlight用にデプロイ - name: deploy run: set -o pipefail && From c954727171731c83d7ac11ca28f237e5462a63af Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 13 Mar 2026 14:11:31 +0000 Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E3=81=99=E3=81=B9=E3=81=A6=E3=81=AE?= =?UTF-8?q?=E3=83=96=E3=83=A9=E3=83=B3=E3=83=81=E3=81=AEPR=E3=81=A7CI?= =?UTF-8?q?=E3=81=8C=E3=83=88=E3=83=AA=E3=82=AC=E3=83=BC=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b75b0d4..7239900 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,8 +2,6 @@ name: CI_Time_Watcher on: pull_request: - branches: - - "*" workflow_dispatch: env: