Skip to content

Commit

Permalink
Merge pull request #3 from SomeRandomiOSDev/SwiftPackages
Browse files Browse the repository at this point in the history
Added support for Swift Packages
  • Loading branch information
SomeRandomiOSDev committed Jun 10, 2019
2 parents 7cb84cd + 22e49d3 commit 45face0
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 260 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CBORCoding.xcodeproj/project.xcworkspace
CBORCoding.xcodeproj/xcuserdata
.build
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ osx_image: xcode10.2
xcode_project: CBORCoding.xcodeproj

script:
- set -o pipefail && travis_retry xcodebuild -scheme "CBORCoding" -destination "platform=iOS Simulator,name=iPhone XS Max" -configuration Test ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test
- set -o pipefail && travis_retry xcodebuild -scheme "CBORCoding tvOS" -destination "platform=tvOS Simulator,name=Apple TV 4K" -configuration Test ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test
- set -o pipefail && travis_retry xcodebuild -scheme "CBORCoding" -destination "platform=iOS Simulator,name=iPhone XS Max" -configuration Debug ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test
- set -o pipefail && travis_retry xcodebuild -scheme "CBORCoding tvOS" -destination "platform=tvOS Simulator,name=Apple TV 4K" -configuration Debug ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test
- set -o pipefail && travis_retry xcodebuild -scheme "CBORCoding watchOS" -destination "platform=watchOS Simulator,name=Apple Watch Series 4 - 44mm" -configuration Debug ONLY_ACTIVE_ARCH=YES
- set -o pipefail && travis_retry xcodebuild -scheme "CBORCoding macOS" -destination "platform=macOS" -configuration Test ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test
- set -o pipefail && travis_retry xcodebuild -scheme "CBORCoding macOS" -destination "platform=macOS" -configuration Debug ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test

after_success:
- bash <(curl -s https://codecov.io/bash)
2 changes: 1 addition & 1 deletion CBORCoding.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "CBORCoding"
s.version = "1.0.1"
s.version = "1.0.2"
s.summary = "A CBOR Encoder and Decoder"
s.description = <<-DESC
A lightweight framework containing a coder pair for encoding and decoding `Codable` conforming types to and from CBOR document format for iOS, macOS, tvOS, and watchOS.
Expand Down
246 changes: 2 additions & 244 deletions CBORCoding.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
DD957E722296D514000127A3 /* CBORDecoderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CBORDecoderTests.swift; sourceTree = "<group>"; };
DD957E9C2299CE1C000127A3 /* CBOR+Codable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CBOR+Codable.swift"; sourceTree = "<group>"; };
DDF755AB22A80069002E11D4 /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = SOURCE_ROOT; };
DDF755AC22A8649F002E11D4 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -239,6 +240,7 @@
isa = PBXGroup;
children = (
DD12989122A487FB005CEB9A /* CBORCoding.podspec */,
DDF755AC22A8649F002E11D4 /* Package.swift */,
DD1298A122A546B4005CEB9A /* .swiftlint.yml */,
DDF755AB22A80069002E11D4 /* .travis.yml */,
DD12989322A487FB005CEB9A /* README.md */,
Expand Down Expand Up @@ -737,15 +739,6 @@
};
name = Debug;
};
DD12989A22A48C30005CEB9A /* Test */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
};
name = Test;
};
DD12989B22A48C30005CEB9A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -781,32 +774,6 @@
};
name = Debug;
};
DD1298BB22A563BE005CEB9A /* Test */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = CBORCoding/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.somerandomiosdev.cborcoding;
PRODUCT_NAME = CBORCoding;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = macosx;
};
name = Test;
};
DD1298BC22A563BE005CEB9A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -853,26 +820,6 @@
};
name = Debug;
};
DD1298BF22A563BE005CEB9A /* Test */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = CBORCodingTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
PRODUCT_BUNDLE_IDENTIFIER = com.somerandomiosdev.cborcodingtests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
};
name = Test;
};
DD1298C022A563BE005CEB9A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -918,31 +865,6 @@
};
name = Debug;
};
DD1298F322A56431005CEB9A /* Test */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = CBORCoding/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.somerandomiosdev.cborcoding;
PRODUCT_NAME = CBORCoding;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
TARGETED_DEVICE_FAMILY = 3;
};
name = Test;
};
DD1298F422A56431005CEB9A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -987,25 +909,6 @@
};
name = Debug;
};
DD1298F722A56431005CEB9A /* Test */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = CBORCodingTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.somerandomiosdev.cborcodingtests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.2;
};
name = Test;
};
DD1298F822A56431005CEB9A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -1051,32 +954,6 @@
};
name = Debug;
};
DD12990522A5644C005CEB9A /* Test */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = CBORCoding/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.somerandomiosdev.cborcoding;
PRODUCT_NAME = CBORCoding;
SDKROOT = watchos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "watchsimulator watchos";
TARGETED_DEVICE_FAMILY = 4;
};
name = Test;
};
DD12990622A5644C005CEB9A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -1316,124 +1193,13 @@
};
name = Release;
};
DD957E6F2296C1F5000127A3 /* Test */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = NO;
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = UNIT_TEST;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
name = Test;
};
DD957E702296C1F5000127A3 /* Test */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = CBORCoding/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.somerandomiosdev.cborcoding;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
name = Test;
};
DD957E712296C1F5000127A3 /* Test */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = CBORCodingTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.somerandomiosdev.cborcodingtests;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Test;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
DD12989822A48C30005CEB9A /* Build configuration list for PBXAggregateTarget "Run SwiftLint" */ = {
isa = XCConfigurationList;
buildConfigurations = (
DD12989922A48C30005CEB9A /* Debug */,
DD12989A22A48C30005CEB9A /* Test */,
DD12989B22A48C30005CEB9A /* Release */,
);
defaultConfigurationIsVisible = 0;
Expand All @@ -1443,7 +1209,6 @@
isa = XCConfigurationList;
buildConfigurations = (
DD1298BA22A563BE005CEB9A /* Debug */,
DD1298BB22A563BE005CEB9A /* Test */,
DD1298BC22A563BE005CEB9A /* Release */,
);
defaultConfigurationIsVisible = 0;
Expand All @@ -1453,7 +1218,6 @@
isa = XCConfigurationList;
buildConfigurations = (
DD1298BE22A563BE005CEB9A /* Debug */,
DD1298BF22A563BE005CEB9A /* Test */,
DD1298C022A563BE005CEB9A /* Release */,
);
defaultConfigurationIsVisible = 0;
Expand All @@ -1463,7 +1227,6 @@
isa = XCConfigurationList;
buildConfigurations = (
DD1298F222A56431005CEB9A /* Debug */,
DD1298F322A56431005CEB9A /* Test */,
DD1298F422A56431005CEB9A /* Release */,
);
defaultConfigurationIsVisible = 0;
Expand All @@ -1473,7 +1236,6 @@
isa = XCConfigurationList;
buildConfigurations = (
DD1298F622A56431005CEB9A /* Debug */,
DD1298F722A56431005CEB9A /* Test */,
DD1298F822A56431005CEB9A /* Release */,
);
defaultConfigurationIsVisible = 0;
Expand All @@ -1483,7 +1245,6 @@
isa = XCConfigurationList;
buildConfigurations = (
DD12990422A5644C005CEB9A /* Debug */,
DD12990522A5644C005CEB9A /* Test */,
DD12990622A5644C005CEB9A /* Release */,
);
defaultConfigurationIsVisible = 0;
Expand All @@ -1493,7 +1254,6 @@
isa = XCConfigurationList;
buildConfigurations = (
DD32E37B228DDCFB002D9067 /* Debug */,
DD957E6F2296C1F5000127A3 /* Test */,
DD32E37C228DDCFB002D9067 /* Release */,
);
defaultConfigurationIsVisible = 0;
Expand All @@ -1503,7 +1263,6 @@
isa = XCConfigurationList;
buildConfigurations = (
DD32E37E228DDCFB002D9067 /* Debug */,
DD957E702296C1F5000127A3 /* Test */,
DD32E37F228DDCFB002D9067 /* Release */,
);
defaultConfigurationIsVisible = 0;
Expand All @@ -1513,7 +1272,6 @@
isa = XCConfigurationList;
buildConfigurations = (
DD32E381228DDCFB002D9067 /* Debug */,
DD957E712296C1F5000127A3 /* Test */,
DD32E382228DDCFB002D9067 /* Release */,
);
defaultConfigurationIsVisible = 0;
Expand Down
Loading

0 comments on commit 45face0

Please sign in to comment.