AMP-63100 Swift V2 example

.github/workflows/ampli-merge-check.ios.yml

@@ -19,8 +19,12 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v2
 
-      - name: (iOS Swift) Check the Data branch is merged before merging the Git branch
-        working-directory: ./ios/swift/AmpliSwiftSampleApp
+      - name: (iOS Swift V1) Check the Data branch is merged before merging the Git branch
+        working-directory: ./ios/swift/v1/AmpliSwiftSampleApp
+        run: ampli status --is-merged -t ${{secrets.AMPLI_TOKEN}}
+
+      - name: (iOS Swift V2) Check the Data branch is merged before merging the Git branch
+        working-directory: ./ios/swift/v2/AmpliSwiftSampleApp
         run: ampli status --is-merged -t ${{secrets.AMPLI_TOKEN}}
 
       - name: (iOS Objective-C) Check the Data branch is merged before merging the Git branch

.github/workflows/ci-build-ios-test.yml → .github/workflows/ci-build-ios-v1-test.yml

@@ -1,10 +1,10 @@
-name: CI - iOS Tests
+name: CI - iOS V1 Tests
 
 on:
   pull_request:
     paths:
       - 'ios/objective-c/**'
-      - 'ios/swift/**'
+      - 'ios/swift/v1/**'
 
 jobs:
   test:
@@ -31,12 +31,12 @@ jobs:
         uses: actions/cache@v2
         with:
           path: |
-            ./ios/swift/AmpliSwiftSampleApp/Pods
-            ./ios/swift/AmpliSwiftSampleApp/vendor/bundle
+            ./ios/swift/v1/AmpliSwiftSampleApp/Pods
+            ./ios/swift/v1/AmpliSwiftSampleApp/vendor/bundle
           key: ${{ runner.os }}-ruby-${{ matrix.ruby-version }}-gems-${{ hashFiles('**/Gemfile.lock') }}-pods-${{ hashFiles('**/Podfile.lock') }}
 
       - name: Install Cocoapods For Swift
-        working-directory: ./ios/swift/AmpliSwiftSampleApp
+        working-directory: ./ios/swift/v1/AmpliSwiftSampleApp
         if: steps.cache-gems-pods.outputs.cache-hit != 'true'
         run: |
           gem install bundler
@@ -45,7 +45,7 @@ jobs:
           pod install
 
       - name: Swfit iOS Tests
-        working-directory: ./ios/swift/AmpliSwiftSampleApp
+        working-directory: ./ios/swift/v1/AmpliSwiftSampleApp
         run: |
           pod install
           xcodebuild test \

.github/workflows/ci-build-ios-v2-test.yml

@@ -0,0 +1,54 @@
+name: CI - iOS V2 Tests
+
+on:
+  pull_request:
+    paths:
+      - 'ios/swift/v2/**'
+
+jobs:
+  test:
+    name: Test
+    runs-on: macos-12
+    strategy:
+      matrix:
+        ruby-version: ["2.7.x"]
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+
+      - name: Set Xcode 14.2
+        run: |
+          sudo xcode-select -switch /Applications/Xcode_14.2.app
+
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+
+      - name: Cache Bundle Gems and Cocoapods For Swift
+        id: cache-gems-pods
+        uses: actions/cache@v2
+        with:
+          path: |
+            ./ios/swift/v2/AmpliSwiftSampleApp/Pods
+            ./ios/swift/v2/AmpliSwiftSampleApp/vendor/bundle
+          key: ${{ runner.os }}-ruby-${{ matrix.ruby-version }}-gems-${{ hashFiles('**/Gemfile.lock') }}-pods-${{ hashFiles('**/Podfile.lock') }}
+
+      - name: Install Cocoapods For Swift
+        working-directory: ./ios/swift/v2/AmpliSwiftSampleApp
+        if: steps.cache-gems-pods.outputs.cache-hit != 'true'
+        run: |
+          gem install bundler
+          bundle config path vendor/bundle
+          bundle install
+          pod install
+
+      - name: Swfit iOS Tests
+        working-directory: ./ios/swift/v2/AmpliSwiftSampleApp
+        run: |
+          pod install
+          xcodebuild test \
+            -workspace AmpliSwiftSampleApp.xcworkspace \
+            -scheme AmpliSwiftSampleAppTests \
+            -sdk iphonesimulator \
+            -destination 'platform=iOS Simulator,name=iPhone 14,OS=16.2'

README.md

@@ -15,10 +15,13 @@ See subproject README's for details on each platform.
 #### [node/typescript](node/typescript)
 #### [nextjs/typescript](node/nextjs/ampli-app)
 
-## iOS
-####  [ios/swift](ios/swift/AmpliSwiftSampleApp)
+## iOS V1
+####  [ios/swift](ios/swift/v1/AmpliSwiftSampleApp)
 ####  [ios/objective-c](ios/objective-c/AmpliObjectiveCSampleApp)
 
+## iOS V2
+####  [ios/swift](ios/swift/v2/AmpliSwiftSampleApp)
+
 ## Android V1
 #### [android/kotlin](android/kotlin/v1/AmpliApp)
 #### [android/java](android/java/v1/AmpliApp)