Skip to content

SPM support - #47

Merged
ceeK merged 6 commits into
ceeK:masterfrom
mateuszmackowiak:spm
Feb 17, 2021
Merged

SPM support#47
ceeK merged 6 commits into
ceeK:masterfrom
mateuszmackowiak:spm

Conversation

@mateuszmackowiak

@mateuszmackowiakmateuszmackowiak commented Jun 7, 2020•
edited by 1ec5
Loading

Copy link
Copy Markdown
Contributor

SPM support for the library.
I have changed the sample json file to use multilane string to be compatible with sim prior swift 5.3 (resources).
Both Carthage and pods version are still supported.
SPM package contains passing tests and I have defined other supported platforms iOS(.v8), .macOS(.v10_15), .watchOS(.v4), .tvOS(.v11)

Fixes#11.

@1ec5

1ec5 commented Sep 16, 2020

Copy link
Copy Markdown
Collaborator

This would fix #11.

1ec5
1ec5 reviewed Nov 10, 2020
View reviewed changes
Comment threadSolar iOSTests/CorrectResults.swift Outdated
1ec5
1ec5 reviewed Nov 17, 2020
View reviewed changes
Comment threadSolar.xcodeproj/project.pbxproj Outdated
@1ec51ec5 mentioned this pull request Dec 15, 2020
Closed
@ceeKceeK closed this Feb 15, 2021
@ceeKceeK reopened this Feb 15, 2021
ceeK
ceeK requested changes Feb 15, 2021
View reviewed changes

@ceeKceeK left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Hi @mateuszmackowiak. Firstly, thank you for taking the time to work on this pull request, and apologies that it has taken me so long to follow up.

I'd like to get this merged ASAP as it appears to be in high demand. One thing that stood out to me compared to the other SwiftPM PRs is all of the .swiftpm files. I tried to figure out whether these are necessary to checkin and it appears people usually add the .swiftpm directory to their .gitignore. I found the SPM folks doing it themselves here.

Unless you have a reason for checking this in, would you be able to add .swiftpm to the .gitignore and remove the files under the .swiftpm directory?

Comment threadPackage.swift Outdated
Comment threadREADME.md

[![Version](https://img.shields.io/cocoapods/v/Solar.svg?style=flat)](http://cocoapods.org/pods/Solar) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Build Status](https://travis-ci.org/ceeK/Solar.svg?branch=master)](https://travis-ci.org/ceeK/Solar)
[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/hyperium/hyper/master/LICENSE)
[![Version](https://img.shields.io/cocoapods/v/Solar.svg?style=flat)](http://cocoapods.org/pods/Solar) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![POD compatible](https://img.shields.io/badge/Cocoapods-compatible-4BC51D.svg?style=flat)](https://cocoapods.org) [![SPM compatible](https://img.shields.io/badge/SPM-compatible-4BC51D.svg?style=flat)](https://swift.org/package-manager/) [![Build Status](https://travis-ci.org/ceeK/Solar.svg?branch=master)](https://travis-ci.org/ceeK/Solar)

@ceeKceeKFeb 15, 2021

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Awesome! Thank you 🙌

Comment threadSolar iOSTests/Solar_iOSTests.swift
#endif
}()

override func setUpWithError() throws {

@ceeKceeKFeb 15, 2021

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

👍

1ec5
1ec5 reviewed Feb 17, 2021
View reviewed changes
Comment threadPackage.swift Outdated
@1ec5
1ec5 requested a review from ceeKFebruary 17, 2021 00:35
@1ec5

1ec5 commented Feb 17, 2021

Copy link
Copy Markdown
Collaborator

Unless you have a reason for checking this in, would you be able to add .swiftpm to the .gitignore and remove the files under the .swiftpm directory?

Done. I also made the minimum deployment targets more consistent among CocoaPods, Carthage, and SPM, though #29 tracks supporting more of the platforms with Carthage.

mateuszmackowiakand others added 5 commits February 16, 2021 18:31
@mateuszmackowiak@1ec5
SPM support
27e03e4
@mateuszmackowiak@1ec5
SPM 5.3 resource support
20c28c6
@1ec5
Removed and ignore .swiftpm
db981c8
@1ec5
Avoid specifying linking type
acbc41e
@1ec5
Made minimum deployment targets consistent across package managers
16d76eb
Solar requires macOS 10.10, tvOS 9, or watchOS 3 when using SPM and macOS 10.9 or watchOS 3 when using Carthage for consistency with CocoaPods.
This was referenced Feb 17, 2021
Closed
Closed
@1ec51ec5 added this to the 2.2 milestone Feb 17, 2021
@1ec51ec5 mentioned this pull request Feb 17, 2021
Open
@1ec51ec5 added the build label Feb 17, 2021
@ceeK

ceeK commented Feb 17, 2021

Copy link
Copy Markdown
Owner

LGTM!

@ceeK
ceeK merged commit f0a693e into ceeK:masterFeb 17, 2021
@ceeK

ceeK commented Feb 17, 2021

Copy link
Copy Markdown
Owner

And thank you @1ec5 for going through all this! 🙌

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@1ec51ec51ec5 approved these changes
@ceeKceeKAwaiting requested review from ceeK

Assignees

No one assigned

Labels

buildenhancement

Projects

None yet

Milestone

v2.3.0

Development

Successfully merging this pull request may close these issues.

Add Swift Package Manager support

3 participants

@mateuszmackowiak@1ec5@ceeK