Resolve merge conflicts of main to develop PR #496
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge develop into main
Bump version to 4.2.0
Move Checkout.podspec to root
Remove Carthage references from README
Update samples and configurations
Fix Checkout tests
…ller Rename PaymentViewController
Add CodeQL workflow for Swift
Bump CocoaPods version to 4.2.1
Update sample project versions to exact versions
Update sample projects
Add workflow to check PR status
Remove PR checks from Bitrise in favour of GitHub Actions
…ic linking (#452) Co-authored-by: Ehab Alsharkawy <[email protected]>
SwiftLint comes pre-installed on runner images of GitHub. SwiftLint will run before all the other checks. If SwiftLint fails, then all the other checks don't run. SwiftLint only runs for the new files to avoid a big PR. It also parses errors and warnings for the new files and shows them on GitHub UI.
* Fix the fixable SwiftLint issues * Remove --strict flag from SwiftLint step under check-pr workflow * Produce a line length linter error after 210 characters
Move some folders around and update README
* Create deploy-github-pages.yml * Rename the workflow
We needed to define an exact version since they stopped supporting iOS 12 in a minor version release. This broke our CI/CD pipeline.
* Create sub README files * Set README refs to main branch
Co-authored-by: runner <[email protected]>
iOS Example Frame SPM/iOS Example Frame SPM.xcodeproj/project.pbxproj
Outdated
Show resolved
Hide resolved
deepesh-vasthimal-cko
previously approved these changes
Nov 3, 2023
deepesh-vasthimal-cko
previously approved these changes
Nov 3, 2023
okhan-okbay-cko
force-pushed
the
develop-premerge
branch
from
f4230a7 to
586de64
Compare
|
Kudos, SonarCloud Quality Gate passed!
|
deepesh-vasthimal-cko
approved these changes
Nov 6, 2023
okhan-okbay-cko
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolve merge conflicts of main to develop PR