Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into release/5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
andrii-vysotskyi-cko committed Sep 10, 2024
2 parents d81f9ae + 9ba0366 commit 3871dfd
Show file tree
Hide file tree
Showing 119 changed files with 2,531 additions and 2,239 deletions.
4 changes: 1 addition & 3 deletions .github/actions/bootstrap-project/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ runs:
echo "$CONSTANTS" > Tests/ProcessOutUITests/Sources/Core/Constants.swift
shell: bash
- name: Select Xcode Version
# todo(andrii-vysotskyi): Migrate to public release once available
run: sudo xcode-select -s '/Applications/Xcode_16_beta_5.app/Contents/Developer'
shell: bash
uses: ./.github/actions/select-xcode
- name: Bootstrap Project
run: ./Scripts/BootstrapProject.sh
shell: bash
Expand Down
9 changes: 9 additions & 0 deletions .github/actions/select-xcode/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Select Xcode
description: Selects Xcode version
runs:
using: "composite"
steps:
- name: Select Xcode Version
# todo(andrii-vysotskyi): Migrate to public release once available
run: sudo xcode-select -s '/Applications/Xcode_16_beta_5.app/Contents/Developer'
shell: bash
29 changes: 29 additions & 0 deletions .github/workflows/upload-example-to-testflight.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Upload Example to TestFlight
on:
push:
branches:
- 'master'
workflow_dispatch:
jobs:
export:
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- name: Select Xcode Version
uses: ./.github/actions/select-xcode
- name: Bootstrap Project
working-directory: ./Example
run: ./Scripts/BootstrapProject.sh
- name: Import Certificates
working-directory: ./Example
env:
APPLE_DEVELOPMENT_CERTIFICATE_CONTENT: ${{ secrets.APPLE_DEVELOPMENT_CERTIFICATE_CONTENT }}
APPLE_DEVELOPMENT_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_DEVELOPMENT_CERTIFICATE_PASSWORD }}
run: ./Scripts/Distribution/ImportCerificates.sh
- name: Export Application
working-directory: ./Example
env:
APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
APP_STORE_CONNECT_API_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENT }}
run: ./Scripts/Distribution/ExportApplication.sh
1 change: 1 addition & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,6 @@ opt_in_rules:

disabled_rules:
- todo
- optional_data_string_conversion

reporter: "xcode"
1 change: 1 addition & 0 deletions Example/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
.swiftpm
Packages
*.xcodeproj
!*.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
xcuserdata/
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,6 @@
"revision" : "a914d754b4ffb1843730e8e1f8e7e60c4bf81cf9",
"version" : "1.2.4"
}
},
{
"identity" : "snapkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/SnapKit/SnapKit",
"state" : {
"revision" : "f222cbdf325885926566172f6f5f06af95473158",
"version" : "5.6.0"
}
}
],
"version" : 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"images" : [
{
"filename" : "ProcessOut.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 6 additions & 17 deletions Example/Example/Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleURLTypes</key>
Expand All @@ -25,23 +27,8 @@
</array>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
<key>UISceneConfigurations</key>
<dict>
<key>UIWindowSceneSessionRoleApplication</key>
<array>
<dict>
<key>UISceneConfigurationName</key>
<string>Default Configuration</string>
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
</dict>
</array>
</dict>
</dict>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>UILaunchScreen</key>
<dict>
<key>UIColorName</key>
Expand All @@ -56,5 +43,7 @@
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>NSCameraUsageDescription</key>
<string>This app requires camera access to scan codes for project configuration.</string>
</dict>
</plist>
Loading

0 comments on commit 3871dfd

Please sign in to comment.