Merge branch 'iOS/release' into iOS/story/SpotScene

boostcampwm2023 · Nov 27, 2023 · bd451d6 · bd451d6
2 parents ecc3de1 + 24d8601
commit bd451d6
Show file tree

Hide file tree

Showing 24 changed files with 935 additions and 173 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/Xcode_build_test.yml b/.github/workflows/Xcode_build_test.yml
@@ -0,0 +1,128 @@
+name: Xcode_build_test
+
+env:
+  PACKAGES_JSON: '["MSCoreKit", "MSFoundation", "MSUIKit"]'
+
+on:
+  pull_request:
+    branches:
+      - 'iOS/release'
+      - 'iOS/epic/**'
+    types: [assigned, labeled, opened, synchronize, reopened]
+
+jobs:
+  prepare-matrix:
+    runs-on: macos-13
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup Xcode
+      if: ${{ !env.ACT }}
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '15.0.1'
+
+    - name: Install jq
+      run: brew install jq
+
+    - name: Generate matrix
+      id: set-matrix
+      run: |
+        cd iOS
+        matrix="{\"include\":["
+        packages=$(echo $PACKAGES_JSON | jq -r '.[]')
+        first_entry=true
+        for package in $packages; do
+          cd $package
+          for scheme in $(xcodebuild -list | grep -E '^[[:space:]]*Schemes:' -A 10 | tail -n +2 | grep -v '^$'); do
+            if [[ $scheme != *"-Package" ]] && [[ $scheme != *"Tests" ]]; then
+              if [ "$first_entry" = true ]; then
+                first_entry=false
+              else
+                matrix+=","
+              fi
+              matrix+="{\"package\":\"$package\", \"scheme\":\"$scheme\"}"
+            fi
+          done
+          cd ..
+        done
+        # cd Features
+        # for package in JourneyList SaveJourney; do
+        #   cd $package
+        #     for scheme in $(xcodebuild -list | grep -E '^[[:space:]]*Schemes:' -A 10 | tail -n +2 | grep -v '^$'); do
+        #     if [[ $scheme != *"-Package" ]]; then
+        #       if [ "$first_entry" = true ]; then
+        #         first_entry=false
+        #       else
+        #         matrix+=","
+        #       fi
+        #       matrix+="{\"package\":\"$package\", \"scheme\":\"$scheme\"}"
+        #     fi
+        #   done
+        #   cd ..
+        # done
+        matrix+="]}"
+        echo "matrix=$matrix" >> $GITHUB_OUTPUT
+
+  xcode-build:
+    needs: prepare-matrix
+    runs-on: macos-13
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.prepare-matrix.outputs.matrix)}}
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup Xcode
+      if: ${{ !env.ACT }}
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '15.0.1'
+
+    - name: 🛠️ Build ${{ matrix.scheme }}
+      if: ${{ !contains(matrix.scheme, 'Tests') }}
+      run: |
+        echo "🛠️  Building ${{ matrix.package }} - Scheme: ${{ matrix.scheme }}"
+        cd iOS/${{ matrix.package }}
+        xcodebuild \
+          -scheme ${{ matrix.scheme }} \
+          -sdk 'iphonesimulator' \
+          -destination 'platform=iOS Simulator,OS=17.0.1,name=iPhone 15 Pro' \
+          clean build
+
+  prepare-test-matrix:
+    runs-on: macos-13
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - id: set-matrix
+        run: |
+          matrix="{\"package\": $PACKAGES_JSON}"
+          echo "matrix=$matrix" >> $GITHUB_OUTPUT
+
+  xcode-test:
+    needs: prepare-test-matrix
+    runs-on: macos-13
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.prepare-test-matrix.outputs.matrix)}}
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup Xcode
+      if: ${{ !env.ACT }}
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '15.0.1'
+
+    - name: 🧪 Test ${{ matrix.package }}
+      run: |
+        echo "🧪  Testing ${{ matrix.package }}"
+        cd iOS/${{ matrix.package }}
+        xcodebuild \
+          -scheme ${{ matrix.package }}-Package \
+          -sdk 'iphonesimulator' \
+          -destination 'platform=iOS Simulator,OS=17.0.1,name=iPhone 15 Pro' \
+          clean test
diff --git a/iOS/Features/JourneyList/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/iOS/Features/JourneyList/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/iOS/Features/SaveJourney/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/iOS/Features/SaveJourney/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/iOS/MSCoreKit/.swiftpm/xcode/xcshareddata/xcschemes/MSCacheStorage.xcscheme b/iOS/MSCoreKit/.swiftpm/xcode/xcshareddata/xcschemes/MSCacheStorage.xcscheme
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "MSCacheStorage"
+               BuildableName = "MSCacheStorage"
+               BlueprintName = "MSCacheStorage"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "MSCacheStorage"
+            BuildableName = "MSCacheStorage"
+            BlueprintName = "MSCacheStorage"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/iOS/MSCoreKit/.swiftpm/xcode/xcshareddata/xcschemes/MSCacheStorageTests.xcscheme b/iOS/MSCoreKit/.swiftpm/xcode/xcshareddata/xcschemes/MSCacheStorageTests.xcscheme
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "MSCacheStorageTests"
+               BuildableName = "MSCacheStorageTests"
+               BlueprintName = "MSCacheStorageTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/...hareddata/xcschemes/MSFoundation.xcscheme → ...xcshareddata/xcschemes/MSFetcher.xcscheme b/...hareddata/xcschemes/MSFoundation.xcscheme → ...xcshareddata/xcschemes/MSFetcher.xcscheme
@@ -14,9 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "MSFoundation"
-               BuildableName = "MSFoundation"
-               BlueprintName = "MSFoundation"
+               BlueprintIdentifier = "MSFetcher"
+               BuildableName = "MSFetcher"
+               BlueprintName = "MSFetcher"
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
@@ -49,9 +49,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "MSFoundation"
-            BuildableName = "MSFoundation"
-            BlueprintName = "MSFoundation"
+            BlueprintIdentifier = "MSFetcher"
+            BuildableName = "MSFetcher"
+            BlueprintName = "MSFetcher"
             ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>

diff --git a/iOS/MSCoreKit/.swiftpm/xcode/xcshareddata/xcschemes/MSFetcherTests.xcscheme b/iOS/MSCoreKit/.swiftpm/xcode/xcshareddata/xcschemes/MSFetcherTests.xcscheme
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "MSFetcherTests"
+               BuildableName = "MSFetcherTests"
+               BlueprintName = "MSFetcherTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>