diff --git a/.github/workflows/iOS-Sample.yml b/.github/workflows/iOS-Sample.yml index 236fe9c5b..041b2f9a4 100644 --- a/.github/workflows/iOS-Sample.yml +++ b/.github/workflows/iOS-Sample.yml @@ -1,48 +1,47 @@ name: Build iOS apps -on: [push, pull_request] -jobs: +on: [push, pull_request] +jobs: build-sample-objc: runs-on: macos-latest defaults: run: working-directory: iOS/Sample - + steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: pod install --repo-update - - name: Build Sample app - run: | - IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$") && echo $IPHONESIMULATOR - xcodebuild build -workspace Sample.xcworkspace -scheme Sample -sdk $IPHONESIMULATOR -arch x86_64 - + - uses: actions/checkout@v2 + - name: Install dependencies + run: pod install --repo-update + - name: Build Sample app + run: | + IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$") && echo $IPHONESIMULATOR + xcodebuild build -workspace Sample.xcworkspace -scheme Sample -sdk $IPHONESIMULATOR EXCLUDED_ARCHS=arm64 + build-sample-swift: runs-on: macos-latest defaults: run: working-directory: iOS/SampleSwift - + steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: pod install --repo-update - - name: Build SampleSwift app - run: | - IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$") && echo $IPHONESIMULATOR - xcodebuild build -workspace SampleSwift.xcworkspace -scheme SampleSwift -sdk $IPHONESIMULATOR -arch x86_64 - + - uses: actions/checkout@v2 + - name: Install dependencies + run: pod install --repo-update + - name: Build SampleSwift app + run: | + IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$") && echo $IPHONESIMULATOR + xcodebuild build -workspace SampleSwift.xcworkspace -scheme SampleSwift -sdk $IPHONESIMULATOR + build-tutorial: runs-on: macos-latest defaults: run: working-directory: iOS/Tutorial - - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: pod install --repo-update - - name: Build Tutorial app - run: | - IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$") && echo $IPHONESIMULATOR - xcodebuild build -workspace Tutorial.xcworkspace -scheme Tutorial -sdk $IPHONESIMULATOR -arch x86_64 + steps: + - uses: actions/checkout@v2 + - name: Install dependencies + run: pod install --repo-update + - name: Build Tutorial app + run: | + IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$") && echo $IPHONESIMULATOR + xcodebuild build -workspace Tutorial.xcworkspace -scheme Tutorial -sdk $IPHONESIMULATOR -arch x86_64 diff --git a/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj b/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj index 4c8e6440e..77f5d1aad 100644 --- a/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj +++ b/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj @@ -376,10 +376,6 @@ OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", - "-l\"event\"", - "-l\"event_core\"", - "-l\"event_extra\"", - "-l\"event_pthreads\"", "-l\"stdc++\"", "-framework", "\"CFNetwork\"", @@ -411,10 +407,6 @@ OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", - "-l\"event\"", - "-l\"event_core\"", - "-l\"event_extra\"", - "-l\"event_pthreads\"", "-l\"stdc++\"", "-framework", "\"CFNetwork\"",