Skip to content

Commit

Permalink
Migrates to swift 4 (v0.3.0)
Browse files Browse the repository at this point in the history
  • Loading branch information
@s4cha
s4cha committed Sep 22, 2017
1 parent 7850302 commit 2178248
Show file tree
Hide file tree
Showing 19 changed files with 42 additions and 196 deletions.
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "Swinject/Swinject" "2.0.0"
github "Swinject/Swinject" "2.1.1"
139 changes: 0 additions & 139 deletions Libs/Swinject.framework/Headers/Swinject-Swift.h
View file

This file was deleted.

17 changes: 0 additions & 17 deletions Libs/Swinject.framework/Headers/Swinject.h
View file

This file was deleted.

Binary file removed Libs/Swinject.framework/Info.plist
View file
Binary file not shown.
Binary file removed Libs/Swinject.framework/Modules/Swinject.swiftmodule/arm.swiftdoc
View file
Binary file not shown.
Binary file removed Libs/Swinject.framework/Modules/Swinject.swiftmodule/arm.swiftmodule
View file
Binary file not shown.
Binary file removed Libs/Swinject.framework/Modules/Swinject.swiftmodule/arm64.swiftdoc
View file
Binary file not shown.
Binary file removed Libs/Swinject.framework/Modules/Swinject.swiftmodule/arm64.swiftmodule
View file
Binary file not shown.
Binary file removed Libs/Swinject.framework/Modules/Swinject.swiftmodule/i386.swiftdoc
View file
Binary file not shown.
Binary file removed Libs/Swinject.framework/Modules/Swinject.swiftmodule/i386.swiftmodule
View file
Binary file not shown.
Binary file removed Libs/Swinject.framework/Modules/Swinject.swiftmodule/x86_64.swiftdoc
View file
Binary file not shown.
Binary file removed Libs/Swinject.framework/Modules/Swinject.swiftmodule/x86_64.swiftmodule
View file
Binary file not shown.
10 changes: 0 additions & 10 deletions Libs/Swinject.framework/Modules/module.modulemap
View file

This file was deleted.

Binary file removed Libs/Swinject.framework/Swinject
View file
Binary file not shown.
Binary file modified Plug.framework.zip
View file
Binary file not shown.
56 changes: 31 additions & 25 deletions Plug.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
objects = {

/* Begin PBXBuildFile section */
990D89011E6C1C6D0091EB7F /* Swinject.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 999A99CC1E6AD4AA0007C653 /* Swinject.framework */; };
9910CBD01E6D2F990030BB4B /* TestUseCases.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9910CBCF1E6D2F990030BB4B /* TestUseCases.swift */; };
9910CBD21E6D2FF40030BB4B /* UseCasesImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9910CBD11E6D2FF40030BB4B /* UseCasesImplementations.swift */; };
9910CBD31E6D30C00030BB4B /* Swinject.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 999A99CC1E6AD4AA0007C653 /* Swinject.framework */; };
9927921D1F74FBE100F89443 /* Swinject.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9927921C1F74FBE100F89443 /* Swinject.framework */; };
9927921E1F74FC7C00F89443 /* Swinject.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9927921C1F74FBE100F89443 /* Swinject.framework */; };
999A99DB1E6B01530007C653 /* Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 999A99D81E6B01530007C653 /* Action.swift */; };
99C64E221E6D2E7800C2C19F /* PlugTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99C64E211E6D2E7800C2C19F /* PlugTests.swift */; };
99C64E241E6D2E7800C2C19F /* Plug.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 999A996A1E6AAE640007C653 /* Plug.framework */; };
Expand All @@ -29,8 +29,8 @@
/* Begin PBXFileReference section */
9910CBCF1E6D2F990030BB4B /* TestUseCases.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestUseCases.swift; sourceTree = "<group>"; };
9910CBD11E6D2FF40030BB4B /* UseCasesImplementations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UseCasesImplementations.swift; sourceTree = "<group>"; };
9927921C1F74FBE100F89443 /* Swinject.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Swinject.framework; path = Carthage/Build/iOS/Swinject.framework; sourceTree = "<group>"; };
999A996A1E6AAE640007C653 /* Plug.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Plug.framework; sourceTree = BUILT_PRODUCTS_DIR; };
999A99CC1E6AD4AA0007C653 /* Swinject.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Swinject.framework; path = Libs/Swinject.framework; sourceTree = "<group>"; };
999A99D81E6B01530007C653 /* Action.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Action.swift; sourceTree = "<group>"; };
999A99D91E6B01530007C653 /* Actions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Actions.h; sourceTree = "<group>"; };
999A99DA1E6B01530007C653 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -44,7 +44,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
990D89011E6C1C6D0091EB7F /* Swinject.framework in Frameworks */,
9927921D1F74FBE100F89443 /* Swinject.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -53,7 +53,7 @@
buildActionMask = 2147483647;
files = (
99C64E241E6D2E7800C2C19F /* Plug.framework in Frameworks */,
9910CBD31E6D30C00030BB4B /* Swinject.framework in Frameworks */,
9927921E1F74FC7C00F89443 /* Swinject.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -63,7 +63,7 @@
999A99601E6AAE640007C653 = {
isa = PBXGroup;
children = (
999A996C1E6AAE640007C653 /* Actions */,
999A99D71E6B01530007C653 /* Source */,
99C64E201E6D2E7800C2C19F /* PlugTests */,
999A996B1E6AAE640007C653 /* Products */,
999A99CB1E6AD4AA0007C653 /* Frameworks */,
Expand All @@ -79,18 +79,10 @@
name = Products;
sourceTree = "<group>";
};
999A996C1E6AAE640007C653 /* Actions */ = {
isa = PBXGroup;
children = (
999A99D71E6B01530007C653 /* Source */,
);
path = Actions;
sourceTree = "<group>";
};
999A99CB1E6AD4AA0007C653 /* Frameworks */ = {
isa = PBXGroup;
children = (
999A99CC1E6AD4AA0007C653 /* Swinject.framework */,
9927921C1F74FBE100F89443 /* Swinject.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -173,7 +165,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 0820;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = freshOS;
TargetAttributes = {
999A99691E6AAE640007C653 = {
Expand Down Expand Up @@ -229,7 +221,7 @@
files = (
);
inputPaths = (
"$(SRCROOT)/Libs/Swinject.framework",
"$(SRCROOT)/Carthage/Build/iOS/Swinject.framework",
);
outputPaths = (
);
Expand Down Expand Up @@ -278,15 +270,21 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = 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_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_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -316,6 +314,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = "";
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -331,15 +330,21 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = 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_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_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -361,6 +366,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = "";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -379,7 +385,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Libs",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = Source/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand All @@ -389,7 +395,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -404,7 +410,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Libs",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = Source/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand All @@ -413,7 +419,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.freshOS.Plug;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -423,14 +429,14 @@
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Libs",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = PlugTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.freshOS.PlugTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -440,14 +446,14 @@
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Libs",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = PlugTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.freshOS.PlugTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand Down
Loading

0 comments on commit 2178248

Please sign in to comment.