📝 Resolve conflict

boostcampwm2023 · Nov 30, 2023 · d31995e · d31995e
2 parents 818be26 + 48567b5
commit d31995e
Show file tree

Hide file tree

Showing 131 changed files with 5,240 additions and 255 deletions.
diff --git a/.github/workflows/Xcode_build_test.yml b/.github/workflows/Xcode_build_test.yml
@@ -1,7 +1,7 @@
 name: Xcode_build_test
 
 env:
-  PACKAGES_JSON: '["MSCoreKit", "MSFoundation", "MSUIKit"]'
+  WORKSPACE: iOS/MusicSpot.xcworkspace
 
 on:
   pull_request:
@@ -14,7 +14,7 @@ jobs:
   prepare-matrix:
     runs-on: macos-13
     outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
+      matrix: ${{ steps.generate-matrix.outputs.matrix }}
     steps:
     - uses: actions/checkout@v4
 
@@ -24,45 +24,21 @@ jobs:
       with:
         xcode-version: '15.0.1'
 
-    - name: Install jq
-      run: brew install jq
-
     - name: Generate matrix
-      id: set-matrix
+      id: generate-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\"}"
+        for scheme in $(xcodebuild -workspace ${{ env.WORKSPACE }} -list | grep -A 100 "Schemes:" | grep -v "Schemes:" | sed '/^$/d' | sed 's/^[ \t]*//'); do
+          if [[ $scheme != *"-Package" ]] && [[ $scheme != *"Tests" ]]; then
+            if [ "$first_entry" = true ]; then
+              first_entry=false
+            else
+              matrix+=","
             fi
-          done
-          cd ..
+            matrix+="{\"scheme\":\"$scheme\"}"
+          fi
         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
 
@@ -82,11 +58,10 @@ jobs:
         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 }}
+        echo "🛠️  Building ${{ matrix.scheme }}"
         xcodebuild \
+          -workspace ${{ env.WORKSPACE }} \
           -scheme ${{ matrix.scheme }} \
           -sdk 'iphonesimulator' \
           -destination 'platform=iOS Simulator,OS=17.0.1,name=iPhone 15 Pro' \
@@ -95,12 +70,33 @@ jobs:
   prepare-test-matrix:
     runs-on: macos-13
     outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
+      matrix: ${{ steps.generate-test-matrix.outputs.matrix }}
     steps:
-      - id: set-matrix
-        run: |
-          matrix="{\"package\": $PACKAGES_JSON}"
-          echo "matrix=$matrix" >> $GITHUB_OUTPUT
+    - uses: actions/checkout@v4
+
+    - name: Setup Xcode
+      if: ${{ !env.ACT }}
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '15.0.1'
+
+    - name: Generate test matrix
+      id: generate-test-matrix
+      run: |
+        matrix="{\"include\":["
+        first_entry=true
+        for scheme in $(xcodebuild -workspace ${{ env.WORKSPACE }} -list | grep -A 100 "Schemes:" | grep -v "Schemes:" | sed '/^$/d' | sed 's/^[ \t]*//'); do
+          if [[ $scheme == *"Tests" ]]; then
+            if [ "$first_entry" = true ]; then
+              first_entry=false
+            else
+              matrix+=","
+            fi
+            matrix+="{\"scheme\":\"$scheme\"}"
+          fi
+        done
+        matrix+="]}"
+        echo "matrix=$matrix" >> $GITHUB_OUTPUT
 
   xcode-test:
     needs: prepare-test-matrix
@@ -117,12 +113,12 @@ jobs:
       with:
         xcode-version: '15.0.1'
 
-    - name: 🧪 Test ${{ matrix.package }}
+    - name: 🧪 Test ${{ matrix.scheme }}
       run: |
-        echo "🧪  Testing ${{ matrix.package }}"
-        cd iOS/${{ matrix.package }}
+        echo "🧪  Testing ${{ matrix.scheme }}"
         xcodebuild \
-          -scheme ${{ matrix.package }}-Package \
+          -workspace ${{ env.WORKSPACE }} \
+          -scheme ${{ matrix.scheme }} \
           -sdk 'iphonesimulator' \
           -destination 'platform=iOS Simulator,OS=17.0.1,name=iPhone 15 Pro' \
-          clean test
+          test
diff --git a/iOS/Features/Home/.gitignore b/iOS/Features/Home/.gitignore
@@ -0,0 +1,8 @@
+.DS_Store
+/.build
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc
diff --git a/iOS/Features/Home/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/iOS/Features/Home/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/iOS/Features/Home/.swiftpm/xcode/xcshareddata/xcschemes/NavigateMap.xcscheme b/iOS/Features/Home/.swiftpm/xcode/xcshareddata/xcschemes/NavigateMap.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 = "NavigateMap"
+               BuildableName = "NavigateMap"
+               BlueprintName = "NavigateMap"
+               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 = "NavigateMap"
+            BuildableName = "NavigateMap"
+            BlueprintName = "NavigateMap"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/iOS/Features/Home/.swiftpm/xcode/xcshareddata/xcschemes/RecordJourney.xcscheme b/iOS/Features/Home/.swiftpm/xcode/xcshareddata/xcschemes/RecordJourney.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 = "RecordJourney"
+               BuildableName = "RecordJourney"
+               BlueprintName = "RecordJourney"
+               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 = "RecordJourney"
+            BuildableName = "RecordJourney"
+            BlueprintName = "RecordJourney"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>