Merge branch 'beta'

# Conflicts: # android/demo-custom/build.gradle # android/demo-simple/build.gradle # cordova-plugin-genius-scan-demo/config.xml # dotnet-maui/SimpleDemo.csproj # flutter-plugin-genius-scan-demo/pubspec.lock # flutter-plugin-genius-scan-demo/pubspec.yaml # ios/GSSDKCustomDemo/GSSDKCustomDemo.xcodeproj/project.pbxproj # ios/GSSDKCustomDemo/GSSDKCustomDemo/Sources/PDFViewController.swift # ios/GSSDKSimpleDemo/GSSDKSimpleDemo.xcodeproj/project.pbxproj # react-native-genius-scan-demo/package.json
thegrizzlylabs · Apr 3, 2024 · 54acb2b · 54acb2b
2 parents a8f7cd9 + c47fdf2
commit 54acb2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/dotnet-maui.yml b/.github/workflows/dotnet-maui.yml
@@ -11,6 +11,9 @@ jobs:
     runs-on: macos-13
     steps:
     - uses: actions/checkout@v1
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '15.1'
     - name: Build demo
       run: |
         cd dotnet-maui

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -8,24 +8,22 @@ on:
 
 jobs:
   build-custom-demo:
-    runs-on: macos-12
+    runs-on: macos-13
     defaults:
       run:
         working-directory: ios/GSSDKCustomDemo
     steps:
     - uses: actions/checkout@v2
-    - run: pod install
     - run: xcodebuild build -scheme GSSDKCustomDemo -workspace GSSDKCustomDemo.xcworkspace -configuration Debug -sdk iphoneos \
            ONLY_ACTIVE_ARCH=YES \
            CODE_SIGNING_ALLOWED="NO"
   build-simple-demo:
-    runs-on: macos-12
+    runs-on: macos-13
     defaults:
       run:
         working-directory: ios/GSSDKSimpleDemo
     steps:
     - uses: actions/checkout@v2
-    - run: pod install
     - run: xcodebuild build -scheme GSSDKSimpleDemo -workspace GSSDKSimpleDemo.xcworkspace -configuration Debug -sdk iphoneos \
            ONLY_ACTIVE_ARCH=YES \
            CODE_SIGNING_ALLOWED="NO"