Swift migration: merge changes from main #665
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
Resolves #588
* Update issue templates Looks like GitHub wants this named differently 🤷♂️ * Delete migration_task.md * Update custom.md
Just removing the outdated image on the readme
* re-added the public-facing changes for identity v3 * updated nullability for errors in login * temporarily removed version from PurchasesCoreSwift in Purchases.podspec * updated sample app to use identity v3 * improved copy in RCPurchases.h
* added extra test case for storekit tests * added more test cases * added a few more test cases * slight cleanup * added another, particularly gnarly test case * updated test case name * added another test case * one more test case * refactors and cleanups, made chained calls more reliable for one test case * fixed name, added debug information to appUserIDs * fixed issue with test clearing transactions when it shouldn't * formatting * code cleanup * update call to replace api key and proxy url to catch issues if proxy url is empty * updated syntax since lanes are executed in a block * updated xcode and simulator versions for storekitTests * updated syntax for setting log levels * fixed fastlane changes that broke replace_in for storekit_tests * update fastlane * improvements from PR comments * restricted storekit_tests to release tags and branches * removed signing for storekittest app since it only runs in simulator * removed storekitTestCertificate.cer since it's not needed, re-added tests just in case * restricted storekit_tests to release branches and tags again now that they passed
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.7.0 to 2.8.0. - [Release notes](https://github.com/sporkmonger/addressable/releases) - [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md) - [Commits](sporkmonger/addressable@addressable-2.7.0...addressable-2.8.0) --- updated-dependencies: - dependency-name: addressable dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* looks like in some rebase createAlias got un-deprecated, re-deprecated it * updated changelog and version number to 3.12.0 * added missing PR for identity v3 in changelog * added install swiflint step to more ci jobs * fix typo in circleci config.yml * updated the name of the swiftlint step in xcode so it's more obvious at first glance when it fails * fixed an issue where a few targets wouldn't compile correctly when doing carthage archive because they were pointing to unreleased versions of Purchases. * re-added the old carthage script for archives * added `vendor` folder to excluded directories for swiftlint
Co-authored-by: Andy Boedo <andresboedo@gmail.com>
* renamed eTagInResponse -> maybeEtagInResponse to resolve conflict in some versions of Xcode * updated version number to 3.12.1 and changelog * added `scan_derived_data` to excluded directories for swiftlint
Co-authored-by: Distiller <distiller@static.38.39.178.68.cyberlynk.net>
…should not (#663) * fixed a bug where setting debugLogsEnabled = false would still set them to true * cleanup: replaced if / else with ternary operator
aboedo
changed the title
|
There's an empty |
|
Good catch! I'll fix that |
vegaro
approved these changes
Jul 21, 2021
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.
merged changes from
main.I'm opening a PR because there were a tooon of conflicts, so a sanity check for the conflict resolution is appreciated.