Skip to content

Commit

Permalink
Tiny refinements: see commit descriptions (#60)
Browse files Browse the repository at this point in the history
* Apply extension-safe falg for framework targets only to avoid warnings when linking against libswiftXCTest.dylib for Swift tests.

* Fix Error.userInfo type.
  • Loading branch information
shoumikhin authored and temrich committed Jul 14, 2018
1 parent 2a9a100 commit 1e15edb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions Promises.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1578,6 +1578,7 @@
OBJ_248 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -1597,6 +1598,7 @@
OBJ_249 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1670,6 +1672,7 @@
OBJ_278 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
DEFINES_MODULE = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1696,6 +1699,7 @@
OBJ_279 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
DEFINES_MODULE = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1722,7 +1726,6 @@
OBJ_3 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand Down Expand Up @@ -1773,7 +1776,6 @@
OBJ_4 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand Down
2 changes: 1 addition & 1 deletion Sources/PromisesTestHelpers/PromisesTestHelpers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public struct Test {
public extension Error {
var domain: String { return (self as NSError).domain }
var code: Int { return (self as NSError).code }
var userInfo: [AnyHashable: Any] { return (self as NSError).userInfo }
var userInfo: [String: Any] { return (self as NSError).userInfo }
}

/// Compare two `Error?`.
Expand Down

0 comments on commit 1e15edb

Please sign in to comment.