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

Added Swift package manager support #75

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@ profile
*.moved-aside
DerivedData
*.hmap
*.ipa
*.ipa
.build/
.swiftpm
Package.resolved
341 changes: 180 additions & 161 deletions Ono.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

22 changes: 9 additions & 13 deletions Ono.xcodeproj/xcshareddata/xcschemes/Ono iOS.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F82D394D1AA6199E00DAC057"
BuildableName = "Ono.framework"
BlueprintName = "Ono iOS"
ReferencedContainer = "container:Ono.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -53,17 +62,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F82D394D1AA6199E00DAC057"
BuildableName = "Ono.framework"
BlueprintName = "Ono iOS"
ReferencedContainer = "container:Ono.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -84,8 +82,6 @@
ReferencedContainer = "container:Ono.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
41 changes: 30 additions & 11 deletions Ono.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// swift-tools-version:5.2
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "Ono",
platforms: [
.iOS(.v8),
.macOS(.v10_10),
.tvOS(.v12)
],
products: [
// Products define the executables and libraries produced by a package, and make them visible to other packages.
.library(
name: "Ono",
targets: ["Ono"]),
],
dependencies: [
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
.target(
name: "Ono",
dependencies: []),
.testTarget(
name: "OnoTests",
dependencies: ["Ono"]),
]
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion Source/Ono.h → Sources/Ono/Ono.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

@import Foundation;
#import <Foundation/Foundation.h>

//! Project version number for Ono iOS.
FOUNDATION_EXPORT double Ono_VersionNumber;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion Tests/ONOAtomTests.m → Tests/OnoTests/ONOAtomTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#import <XCTest/XCTest.h>

#import "Ono.h"
@import Ono;

@interface ONOAtomTests : XCTestCase
@property (nonatomic, strong) ONOXMLDocument *document;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#import <XCTest/XCTest.h>

#import "Ono.h"
@import Ono;

@interface ONODefaultNamespaceXPathTests : XCTestCase
@property (nonatomic, strong) ONOXMLDocument *document;
Expand Down
2 changes: 1 addition & 1 deletion Tests/ONOHTMLTests.m → Tests/OnoTests/ONOHTMLTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#import <XCTest/XCTest.h>

#import "Ono.h"
@import Ono;

@interface ONOHTMLTests : XCTestCase
@property (nonatomic, strong) ONOXMLDocument *document;
Expand Down
2 changes: 1 addition & 1 deletion Tests/ONOVMAPTests.m → Tests/OnoTests/ONOVMAPTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#import <XCTest/XCTest.h>

#import "Ono.h"
@import Ono;

@interface ONOVMAPTests : XCTestCase
@property (nonatomic, strong) ONOXMLDocument *document;
Expand Down
2 changes: 1 addition & 1 deletion Tests/ONOXMLTests.m → Tests/OnoTests/ONOXMLTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#import <XCTest/XCTest.h>

#import <Ono/Ono.h>
@import Ono;

@interface ONOXMLTests : XCTestCase
@property (nonatomic, strong) ONOXMLDocument *document;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#import <XCTest/XCTest.h>

#import "Ono.h"
@import Ono;

@interface ONOXPathFunctionResultTests : XCTestCase
@property (nonatomic, strong) ONOXMLDocument *document;
Expand Down