Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Infinum/feature/spm-carthage #31

Merged
merged 19 commits into from
Nov 23, 2021

Conversation

ZvonimirMedak
Copy link
Contributor

@ZvonimirMedak ZvonimirMedak commented Oct 21, 2021

implemented SPM and left .xcodeproj so we can use that if we want just to test out the pod version instead of Package.swift.

EDIT: prepared project for carthage support. In root folder run "carthage build --no-skip-current --use-xcframeworks --archive" to create Locker.framework.zip.

@ZvonimirMedak ZvonimirMedak self-assigned this Oct 21, 2021
@ZvonimirMedak ZvonimirMedak changed the title Infinum/feature/spm WIP: Infinum/feature/spm Oct 21, 2021
@ZvonimirMedak ZvonimirMedak marked this pull request as draft October 21, 2021 13:44
@ZvonimirMedak ZvonimirMedak changed the title WIP: Infinum/feature/spm Infinum/feature/spm-carthage Oct 25, 2021
@ZvonimirMedak ZvonimirMedak marked this pull request as ready for review October 25, 2021 10:10
Copy link
Member

@jabou jabou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's wait with this PR until everything else is finished. For now, I'm only concerned with the lib renaming that we should avoid.

Package.swift Outdated Show resolved Hide resolved
Package.swift Outdated Show resolved Hide resolved
Sources/Locker/Helpers/LockerHelpers.swift Outdated Show resolved Hide resolved
@ZvonimirMedak
Copy link
Contributor Author

The lib name was renamed since we had a discussion when I tried to add SPM support the first time. I posted an error which I had to #team-ios channel and we thought that the name was giving us problems. But in the end, it wasn't. It had to do something with the lib being obj-c, now it works with the same name as the target name. 😄

@ZvonimirMedak ZvonimirMedak changed the base branch from infinum/feature/apiary to infinum/update/documentation November 11, 2021 10:13
Copy link
Member

@jabou jabou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check comments regarding the SPM and Carthage installation (readme).

Additionally, check this folder and remove it if it's not needed:
Screen Shot 2021-11-22 at 16 13 21

Example/TouchID/ViewController.swift Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@ZvonimirMedak
Copy link
Contributor Author

ZvonimirMedak commented Nov 23, 2021

Screenshot 2021-11-23 at 11 51 40

Screenshot 2021-11-23 at 11 51 22

I've just cloned the project from the SPM branch and I can't see that left-over folder, even from the terminal 😞

Edit: one thing that comes to mind is that the deletion didn't commit and if you switched from another branch to this one it didn't delete it.

README.md Outdated Show resolved Hide resolved
@ZvonimirMedak ZvonimirMedak merged commit 9615691 into infinum/update/documentation Nov 23, 2021
@ZvonimirMedak ZvonimirMedak deleted the infinum/feature/SPM branch November 23, 2021 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants