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.

Sign up for GitHub

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

Support for Xcode 11 #720

Merged
merged 6 commits into from
Jan 31, 2020
Merged

Support for Xcode 11 #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de9cd86
Upgrade Nimble to the latest version (v8.0.5)
ecaselles Jan 30, 2020
46cb0b9
Remove warnings regarding outdated localisation configuration
ecaselles Jan 30, 2020
e98dd80
Upgrade Kiwi project to Xcode 10.3
ecaselles Jan 30, 2020
6943979
Convert to swift 5 (no code changes were required)
ecaselles Jan 30, 2020
bd53516
Upgrade to Xcode 11.3.1 and Swift 5
ecaselles Jan 30, 2020
181801f
Upgrade travis configuration to run with Xcode 11.3
ecaselles Jan 30, 2020
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
language: objective-c
osx_image: xcode9.2
osx_image: xcode11.3
script: make ci
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Quick/Nimble" "v7.0.3"
github "Quick/Nimble" "v8.0.5"
github "specta/expecta" "v1.0.6"
26 changes: 16 additions & 10 deletions Kiwi.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1673,33 +1673,35 @@
attributes = {
LastSwiftUpdateCheck = 0700;
LastTestingUpgradeCheck = 0600;
LastUpgradeCheck = 0920;
LastUpgradeCheck = 1030;
ORGANIZATIONNAME = "Allen Ding";
TargetAttributes = {
4AE02FBC1AEB45EB00556381 = {
CreatedOnToolsVersion = 6.3;
};
4AE02FC61AEB45EB00556381 = {
CreatedOnToolsVersion = 6.3;
LastSwiftMigration = 1030;
};
CE87C4221AF194E900310C07 = {
CreatedOnToolsVersion = 6.3.1;
};
CE87C42C1AF194EA00310C07 = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 1130;
};
};
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Kiwi" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
en,
de,
ja,
fr,
Base,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
projectDirPath = "";
Expand Down Expand Up @@ -2223,7 +2225,7 @@
PRODUCT_NAME = "$(KIWI_TESTS_PRODUCT_NAME)";
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand Down Expand Up @@ -2256,7 +2258,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = "$(KIWI_TESTS_PRODUCT_NAME)";
SDKROOT = macosx;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -2268,11 +2270,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down Expand Up @@ -2315,11 +2319,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down Expand Up @@ -2468,7 +2474,7 @@
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_NAME = "$(KIWI_TESTS_PRODUCT_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand Down Expand Up @@ -2498,7 +2504,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = "$(KIWI_TESTS_PRODUCT_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand Down
28 changes: 16 additions & 12 deletions Kiwi.xcodeproj/xcshareddata/xcschemes/Kiwi-OSX.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0920"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,18 +26,9 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4AE02FBC1AEB45EB00556381"
BuildableName = "Kiwi.framework"
BlueprintName = "Kiwi-OSX"
ReferencedContainer = "container:Kiwi.xcodeproj">
</BuildableReference>
</MacroExpansion>
onlyGenerateCoverageForSpecifiedTargets = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
<CodeCoverageTargets>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -59,6 +50,17 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4AE02FBC1AEB45EB00556381"
BuildableName = "Kiwi.framework"
BlueprintName = "Kiwi-OSX"
ReferencedContainer = "container:Kiwi.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -79,6 +81,8 @@
ReferencedContainer = "container:Kiwi.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
28 changes: 16 additions & 12 deletions Kiwi.xcodeproj/xcshareddata/xcschemes/Kiwi-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0920"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,18 +26,9 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CE87C4221AF194E900310C07"
BuildableName = "Kiwi.framework"
BlueprintName = "Kiwi-iOS"
ReferencedContainer = "container:Kiwi.xcodeproj">
</BuildableReference>
</MacroExpansion>
onlyGenerateCoverageForSpecifiedTargets = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
<CodeCoverageTargets>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -59,6 +50,17 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CE87C4221AF194E900310C07"
BuildableName = "Kiwi.framework"
BlueprintName = "Kiwi-iOS"
ReferencedContainer = "container:Kiwi.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -79,6 +81,8 @@
ReferencedContainer = "container:Kiwi.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down