Compare commits

...

9 Commits

Author SHA1 Message Date
Lukas Kubanek d7daeb0518 Merge pull request #19 from lukaskubanek/swift2.3
Swift 2.3
2016-09-24 21:19:47 +02:00
Lukas Kubanek 9b6c798a17 Migrated the iOS target to Swift 2.3 as well 2016-09-24 21:12:31 +02:00
Lukas Kubanek 959f4f0eb1 Updated Travis configuration 2016-09-24 21:07:53 +02:00
Lukas Kubanek 040aadd65f Updated the README 2016-09-24 21:06:01 +02:00
Lukas Kubanek b6a99e3ffe Changed the target name to use “Mac” suffix instead of “OSX”
Closes #15
2016-09-24 21:00:10 +02:00
Lukas Kubanek 20d4d7e7c4 Ran the migrator for Swift 2.3 2016-09-23 18:44:18 +02:00
Lukas Kubanek a8a69e4570 Updated schemes for new test target product names 2016-06-16 12:02:37 +02:00
Lukas Kubanek cea6cb0952 Updated test target product names 2016-06-16 10:22:36 +02:00
Lukas Kubanek fae6eb2617 Reordered groups 2016-06-15 18:33:39 +02:00
5 changed files with 56 additions and 42 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode7.3
osx_image: xcode8
xcode_project: OrderedDictionary.xcodeproj
xcode_scheme: OrderedDictionary-iOS
@@ -10,4 +10,4 @@ branches:
- master
script:
- xcodebuild clean build test -project OrderedDictionary.xcodeproj -scheme OrderedDictionary-iOS -destination "platform=iOS Simulator,name=iPhone 6,OS=9.0"
- xcodebuild clean build test -project OrderedDictionary.xcodeproj -scheme OrderedDictionary-iOS -destination "platform=iOS Simulator,name=iPhone 6s,OS=10.0"
+39 -23
View File
@@ -60,11 +60,11 @@
803F9CD21B92324C002F728F /* OrderedDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderedDictionary.h; sourceTree = "<group>"; };
803F9CD41B92324C002F728F /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
803F9CD71B9232EE002F728F /* OrderedDictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderedDictionary.swift; sourceTree = "<group>"; };
803F9CEF1B925B1C002F728F /* OrderedDictionary-OSX-Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OrderedDictionary-OSX-Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
803F9CEF1B925B1C002F728F /* OrderedDictionary_Mac_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OrderedDictionary_Mac_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
803F9CFC1B925B4C002F728F /* OrderedDictionaryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderedDictionaryTests.swift; sourceTree = "<group>"; };
803F9CFE1B925B56002F728F /* Info-Tests.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Tests.plist"; sourceTree = "<group>"; };
806097631B92F20400DB20CF /* OrderedDictionary.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OrderedDictionary.framework; sourceTree = BUILT_PRODUCTS_DIR; };
806097711B92F44F00DB20CF /* OrderedDictionary-iOS-Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OrderedDictionary-iOS-Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
806097711B92F44F00DB20CF /* OrderedDictionary_iOS_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OrderedDictionary_iOS_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
80F94F181B926A60000A96E7 /* OrderedDictionary.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = OrderedDictionary.playground; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -106,8 +106,8 @@
isa = PBXGroup;
children = (
803F9CD11B92324C002F728F /* Sources */,
803F9CFB1B925B4C002F728F /* Tests */,
80F94F171B926A60000A96E7 /* Playgrounds */,
803F9CFB1B925B4C002F728F /* Tests */,
803F9CD31B92324C002F728F /* Supporting Files */,
803F9CC71B923207002F728F /* Products */,
);
@@ -117,9 +117,9 @@
isa = PBXGroup;
children = (
803F9CC61B923207002F728F /* OrderedDictionary.framework */,
803F9CEF1B925B1C002F728F /* OrderedDictionary-OSX-Tests.xctest */,
803F9CEF1B925B1C002F728F /* OrderedDictionary_Mac_Tests.xctest */,
806097631B92F20400DB20CF /* OrderedDictionary.framework */,
806097711B92F44F00DB20CF /* OrderedDictionary-iOS-Tests.xctest */,
806097711B92F44F00DB20CF /* OrderedDictionary_iOS_Tests.xctest */,
);
name = Products;
sourceTree = "<group>";
@@ -180,9 +180,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
803F9CC51B923207002F728F /* OrderedDictionary-OSX */ = {
803F9CC51B923207002F728F /* OrderedDictionary-Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = 803F9CCE1B923207002F728F /* Build configuration list for PBXNativeTarget "OrderedDictionary-OSX" */;
buildConfigurationList = 803F9CCE1B923207002F728F /* Build configuration list for PBXNativeTarget "OrderedDictionary-Mac" */;
buildPhases = (
803F9CC11B923207002F728F /* Sources */,
803F9CC21B923207002F728F /* Frameworks */,
@@ -193,14 +193,14 @@
);
dependencies = (
);
name = "OrderedDictionary-OSX";
name = "OrderedDictionary-Mac";
productName = OrderedDictionary;
productReference = 803F9CC61B923207002F728F /* OrderedDictionary.framework */;
productType = "com.apple.product-type.framework";
};
803F9CEE1B925B1C002F728F /* OrderedDictionary-OSX-Tests */ = {
803F9CEE1B925B1C002F728F /* OrderedDictionary-Mac-Tests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 803F9CF71B925B1C002F728F /* Build configuration list for PBXNativeTarget "OrderedDictionary-OSX-Tests" */;
buildConfigurationList = 803F9CF71B925B1C002F728F /* Build configuration list for PBXNativeTarget "OrderedDictionary-Mac-Tests" */;
buildPhases = (
803F9CEB1B925B1C002F728F /* Sources */,
803F9CEC1B925B1C002F728F /* Frameworks */,
@@ -212,9 +212,9 @@
dependencies = (
803F9CF61B925B1C002F728F /* PBXTargetDependency */,
);
name = "OrderedDictionary-OSX-Tests";
name = "OrderedDictionary-Mac-Tests";
productName = OrderedDictionaryTests;
productReference = 803F9CEF1B925B1C002F728F /* OrderedDictionary-OSX-Tests.xctest */;
productReference = 803F9CEF1B925B1C002F728F /* OrderedDictionary_Mac_Tests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
806097621B92F20400DB20CF /* OrderedDictionary-iOS */ = {
@@ -251,7 +251,7 @@
);
name = "OrderedDictionary-iOS-Tests";
productName = "OrderedDictionary-iOS-Tests";
productReference = 806097711B92F44F00DB20CF /* OrderedDictionary-iOS-Tests.xctest */;
productReference = 806097711B92F44F00DB20CF /* OrderedDictionary_iOS_Tests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
@@ -261,20 +261,23 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0700;
LastUpgradeCheck = 0800;
ORGANIZATIONNAME = "Lukas Kubanek";
TargetAttributes = {
803F9CC51B923207002F728F = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 0800;
};
803F9CEE1B925B1C002F728F = {
CreatedOnToolsVersion = 7.0;
};
806097621B92F20400DB20CF = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 0800;
};
806097701B92F44F00DB20CF = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 0800;
};
};
};
@@ -290,8 +293,8 @@
projectDirPath = "";
projectRoot = "";
targets = (
803F9CC51B923207002F728F /* OrderedDictionary-OSX */,
803F9CEE1B925B1C002F728F /* OrderedDictionary-OSX-Tests */,
803F9CC51B923207002F728F /* OrderedDictionary-Mac */,
803F9CEE1B925B1C002F728F /* OrderedDictionary-Mac-Tests */,
806097621B92F20400DB20CF /* OrderedDictionary-iOS */,
806097701B92F44F00DB20CF /* OrderedDictionary-iOS-Tests */,
);
@@ -367,7 +370,7 @@
/* Begin PBXTargetDependency section */
803F9CF61B925B1C002F728F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 803F9CC51B923207002F728F /* OrderedDictionary-OSX */;
target = 803F9CC51B923207002F728F /* OrderedDictionary-Mac */;
targetProxy = 803F9CF51B925B1C002F728F /* PBXContainerItemProxy */;
};
806097781B92F44F00DB20CF /* PBXTargetDependency */ = {
@@ -391,8 +394,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
@@ -438,8 +443,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
@@ -459,6 +466,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
@@ -484,6 +492,7 @@
PRODUCT_NAME = OrderedDictionary;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 2.3;
};
name = Debug;
};
@@ -506,6 +515,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.lukaskubanek.OrderedDictionary;
PRODUCT_NAME = OrderedDictionary;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
};
name = Release;
};
@@ -517,7 +527,7 @@
INFOPLIST_FILE = "Supporting Files/Info-Tests.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.lukaskubanek.OrderedDictionaryTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
};
name = Debug;
};
@@ -529,7 +539,7 @@
INFOPLIST_FILE = "Supporting Files/Info-Tests.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.lukaskubanek.OrderedDictionaryTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
};
name = Release;
};
@@ -538,6 +548,7 @@
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -550,6 +561,7 @@
PRODUCT_NAME = OrderedDictionary;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
@@ -559,6 +571,7 @@
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -571,6 +584,7 @@
PRODUCT_NAME = OrderedDictionary;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
@@ -584,8 +598,9 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.lukaskubanek.OrderedDictionary-iOS-Tests";
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SDKROOT = iphoneos;
SWIFT_VERSION = 2.3;
};
name = Debug;
};
@@ -597,8 +612,9 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.lukaskubanek.OrderedDictionary-iOS-Tests";
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SDKROOT = iphoneos;
SWIFT_VERSION = 2.3;
VALIDATE_PRODUCT = YES;
};
name = Release;
@@ -615,7 +631,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
803F9CCE1B923207002F728F /* Build configuration list for PBXNativeTarget "OrderedDictionary-OSX" */ = {
803F9CCE1B923207002F728F /* Build configuration list for PBXNativeTarget "OrderedDictionary-Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
803F9CCF1B923207002F728F /* Debug */,
@@ -624,7 +640,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
803F9CF71B925B1C002F728F /* Build configuration list for PBXNativeTarget "OrderedDictionary-OSX-Tests" */ = {
803F9CF71B925B1C002F728F /* Build configuration list for PBXNativeTarget "OrderedDictionary-Mac-Tests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
803F9CF81B925B1C002F728F /* Debug */,
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -11,13 +11,12 @@
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES"
hideIssues = "NO">
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "803F9CC51B923207002F728F"
BuildableName = "OrderedDictionary.framework"
BlueprintName = "OrderedDictionary-OSX"
BlueprintName = "OrderedDictionary-Mac"
ReferencedContainer = "container:OrderedDictionary.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@@ -35,8 +34,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "803F9CEE1B925B1C002F728F"
BuildableName = "OrderedDictionary-OSX-Tests.xctest"
BlueprintName = "OrderedDictionary-OSX-Tests"
BuildableName = "OrderedDictionary_Mac_Tests.xctest"
BlueprintName = "OrderedDictionary-Mac-Tests"
ReferencedContainer = "container:OrderedDictionary.xcodeproj">
</BuildableReference>
</TestableReference>
@@ -46,7 +45,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "803F9CC51B923207002F728F"
BuildableName = "OrderedDictionary.framework"
BlueprintName = "OrderedDictionary-OSX"
BlueprintName = "OrderedDictionary-Mac"
ReferencedContainer = "container:OrderedDictionary.xcodeproj">
</BuildableReference>
</MacroExpansion>
@@ -68,7 +67,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "803F9CC51B923207002F728F"
BuildableName = "OrderedDictionary.framework"
BlueprintName = "OrderedDictionary-OSX"
BlueprintName = "OrderedDictionary-Mac"
ReferencedContainer = "container:OrderedDictionary.xcodeproj">
</BuildableReference>
</MacroExpansion>
@@ -86,7 +85,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "803F9CC51B923207002F728F"
BuildableName = "OrderedDictionary.framework"
BlueprintName = "OrderedDictionary-OSX"
BlueprintName = "OrderedDictionary-Mac"
ReferencedContainer = "container:OrderedDictionary.xcodeproj">
</BuildableReference>
</MacroExpansion>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -11,8 +11,7 @@
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES"
hideIssues = "NO">
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "806097621B92F20400DB20CF"
@@ -35,7 +34,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "806097701B92F44F00DB20CF"
BuildableName = "OrderedDictionary-iOS-Tests.xctest"
BuildableName = "OrderedDictionary_iOS_Tests.xctest"
BlueprintName = "OrderedDictionary-iOS-Tests"
ReferencedContainer = "container:OrderedDictionary.xcodeproj">
</BuildableReference>
+4 -4
View File
@@ -12,8 +12,8 @@ Internally `OrderedDictionary` uses a backing store composed of an instance of `
## Requirements
- Swift 2.2+
- Xcode 7.3
- Swift 2.3
- Xcode 8
- iOS 8.0+ / OS X 10.10+
## Installation
@@ -66,7 +66,7 @@ Lukas Kubanek // [lukaskubanek.com][11] // [@kubanekl][12]
[image-1]: https://img.shields.io/travis/lukaskubanek/OrderedDictionary.svg?style=flat-square "Build"
[image-2]: https://img.shields.io/github/release/lukaskubanek/OrderedDictionary.svg?style=flat-square
[image-3]: https://img.shields.io/badge/Swift-2.2-orange.svg?style=flat-square "Swift 2.2"
[image-4]: https://img.shields.io/badge/platform-osx/ios-yellowgreen.svg?style=flat-square "Platform: OS X, iOS"
[image-3]: https://img.shields.io/badge/Swift-2.3-orange.svg?style=flat-square "Swift 2.2"
[image-4]: https://img.shields.io/badge/platform-macOS/iOS-yellowgreen.svg?style=flat-square "Platform: OS X, iOS"
[image-5]: https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat-square "Carthage compatible"
[image-6]: https://img.shields.io/badge/license-MIT-lightgrey.svg?style=flat-square "License: MIT"