diff --git a/.github/workflows/Xcode_build_test.yml b/.github/workflows/Xcode_build_test.yml index f8a64e6..f4c2e3b 100644 --- a/.github/workflows/Xcode_build_test.yml +++ b/.github/workflows/Xcode_build_test.yml @@ -18,7 +18,7 @@ jobs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Xcode if: ${{ !env.ACT }} @@ -46,8 +46,23 @@ jobs: 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 + echo "matrix=$matrix" >> $GITHUB_OUTPUT build-and-test: needs: prepare-matrix @@ -57,7 +72,7 @@ jobs: matrix: ${{fromJson(needs.prepare-matrix.outputs.matrix)}} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Xcode if: ${{ !env.ACT }} @@ -72,7 +87,8 @@ jobs: cd iOS/${{ matrix.package }} xcodebuild \ -scheme ${{ matrix.scheme }} \ - -destination 'platform=iOS Simulator,name=iPhone 15 Pro' \ + -sdk 'iphonesimulator' \ + -destination 'platform=iOS Simulator,OS=17.0.1,name=iPhone 15 Pro' \ clean build - name: 🧪 Test ${{ matrix.scheme }} @@ -80,6 +96,9 @@ jobs: run: | echo "🧪 Testing ${{ matrix.package }} - Scheme: ${{ matrix.scheme }}" cd iOS/${{ matrix.package }} - xcodebuild clean test \ + xcodebuild \ -scheme ${{ matrix.scheme }} \ - -destination 'platform=iOS Simulator,name=iPhone 15 Pro' + -sdk 'iphonesimulator' \ + -destination 'platform=iOS Simulator,OS=17.0.1,name=iPhone 15 Pro' \ + -only-testing:${{ matrix.scheme }} \ + clean test diff --git a/iOS/MSCoreKit/Package.swift b/iOS/MSCoreKit/Package.swift index eb15905..35d96cc 100644 --- a/iOS/MSCoreKit/Package.swift +++ b/iOS/MSCoreKit/Package.swift @@ -47,13 +47,13 @@ let package = Package( // Tests .testTarget(name: .persistentStorage.testTarget, - dependencies: [.target(name: .persistentStorage)]), + dependencies: ["MSPersistentStorage"]), .testTarget(name: .networking.testTarget, - dependencies: [.target(name: .networking)]), + dependencies: ["MSNetworking"]), .testTarget(name: .fetcher.testTarget, - dependencies: [.target(name: .fetcher)]), + dependencies: ["MSFetcher"]), .testTarget(name: .cache.testTarget, - dependencies: [.target(name: .cache)]) + dependencies: ["MSCacheStorage"]) ], swiftLanguageVersions: [.v5] )