Skip to content

Feature/update to swift 4.2 #2

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

Open
dharmendraiosdev wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/update to swift 4.2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
626872d
Project migrated to Swift-4.2
dharmendraiosdev Apr 19, 2019
14c1e57
Framework updated to Swift 4.2
dharmendraiosdev Apr 19, 2019
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
14 changes: 10 additions & 4 deletions EventsTree.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,13 @@
9238D8CA1F0107AC00D19D0F = {
CreatedOnToolsVersion = 8.3.3;
DevelopmentTeam = 4GS5NBU7N5;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
};
9238D8D31F0107AC00D19D0F = {
CreatedOnToolsVersion = 8.3.3;
DevelopmentTeam = 4GS5NBU7N5;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -314,7 +316,8 @@
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -373,7 +376,8 @@
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -434,7 +438,8 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand Down Expand Up @@ -483,7 +488,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand Down
38 changes: 15 additions & 23 deletions EventsTreeiOSExample/EventsTreeiOSExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
9228A7871F03143000985134 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9228A7781F03143000985134 /* LaunchScreen.storyboard */; };
9228A7881F03143000985134 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9228A77A1F03143000985134 /* Main.storyboard */; };
9228A7891F03143000985134 /* MWSegmentedControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9228A77D1F03143000985134 /* MWSegmentedControl.swift */; };
9228A78A1F03143000985134 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9228A77F1F03143000985134 /* Info.plist */; };
9228A78B1F03143000985134 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9228A7811F03143000985134 /* MainViewController.swift */; };
9228A78C1F03143000985134 /* TreeNodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9228A7821F03143000985134 /* TreeNodeView.swift */; };
9228A78D1F03143000985134 /* TreeNodeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9228A7831F03143000985134 /* TreeNodeView.xib */; };
Expand Down Expand Up @@ -171,7 +170,6 @@
92C763BF1EFACBF9007F2C30 /* Frameworks */,
92C763C01EFACBF9007F2C30 /* Resources */,
59B4BC437E80EFD3C715F29C /* [CP] Embed Pods Frameworks */,
3354905DA43DBADDD8F0B75D /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -195,7 +193,7 @@
92C763C11EFACBF9007F2C30 = {
CreatedOnToolsVersion = 8.3.3;
DevelopmentTeam = 4GS5NBU7N5;
LastSwiftMigration = 0830;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -224,7 +222,6 @@
buildActionMask = 2147483647;
files = (
9228A78D1F03143000985134 /* TreeNodeView.xib in Resources */,
9228A78A1F03143000985134 /* Info.plist in Resources */,
9228A7881F03143000985134 /* Main.storyboard in Resources */,
9228A7861F03143000985134 /* Assets.xcassets in Resources */,
9228A7871F03143000985134 /* LaunchScreen.storyboard in Resources */,
Expand All @@ -234,34 +231,24 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
3354905DA43DBADDD8F0B75D /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-IOSExample/Pods-IOSExample-resources.sh\"\n";
showEnvVarsInLog = 0;
};
59B4BC437E80EFD3C715F29C /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-IOSExample/Pods-IOSExample-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AMPopTip/AMPopTip.framework",
"${BUILT_PRODUCTS_DIR}/EventsTree/EventsTree.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AMPopTip.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EventsTree.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-IOSExample/Pods-IOSExample-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-IOSExample/Pods-IOSExample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
EE7B219573F162C3C85B06DA /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -270,13 +257,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-IOSExample-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -422,7 +412,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = darthrumata.com.EventNodeExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -437,7 +428,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = darthrumata.com.EventNodeExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
7 changes: 6 additions & 1 deletion EventsTreeiOSExample/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@ DEPENDENCIES:
- AMPopTip (= 2.1.6)
- EventsTree (= 0.2.0)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- AMPopTip
- EventsTree

SPEC CHECKSUMS:
AMPopTip: 81f57556ae12500d30ff595078b1b6d11076ced8
EventsTree: 1c23c96940e06c64c04cb596d92d5d36d3572a39

PODFILE CHECKSUM: 55da609fe19ac9faf9c47655bc74e0973d35e8c4

COCOAPODS: 1.2.1
COCOAPODS: 1.6.1
2 changes: 1 addition & 1 deletion EventsTreeiOSExample/Sources/IOSExample/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
Expand Down
2 changes: 1 addition & 1 deletion EventsTreeiOSExample/Sources/IOSExample/External/MWSegmentedControl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class MWSegmentedControl: UIView {
}
}

func changeSegment(sender: UIButton) {
@objc func changeSegment(sender: UIButton) {
if allowMultipleSelection {
if sender.backgroundColor == borderColor {
sender.backgroundColor = UIColor.clear
Expand Down