update 01 to swift 4 and change snapkit to version 3.2

nimomeng · Apr 10, 2018 · 3146bc4 · 3146bc4
1 parent b75aeb9
commit 3146bc4
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 98 deletions.
diff --git a/01.CustomFont/CustomFont/CustomFont.xcodeproj/project.pbxproj b/01.CustomFont/CustomFont/CustomFont.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
 		3B87C8AB1E7D70BE003011CD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3B87C8A91E7D70BE003011CD /* Main.storyboard */; };
 		3B87C8AD1E7D70BE003011CD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3B87C8AC1E7D70BE003011CD /* Assets.xcassets */; };
 		3B87C8B01E7D70BE003011CD /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3B87C8AE1E7D70BE003011CD /* LaunchScreen.storyboard */; };
-		FEC936971D40DFFA49A3AC12 /* Pods_CustomFont.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA8797550ED5B0337E6A3F8 /* Pods_CustomFont.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -23,17 +22,13 @@
 		3B87C8AC1E7D70BE003011CD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		3B87C8AF1E7D70BE003011CD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		3B87C8B11E7D70BE003011CD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		4BA8797550ED5B0337E6A3F8 /* Pods_CustomFont.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CustomFont.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		64E5B22149F71B9E8027E223 /* Pods-CustomFont.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CustomFont.release.xcconfig"; path = "Pods/Target Support Files/Pods-CustomFont/Pods-CustomFont.release.xcconfig"; sourceTree = "<group>"; };
-		D66D674E1E55707917F7DC1D /* Pods-CustomFont.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CustomFont.debug.xcconfig"; path = "Pods/Target Support Files/Pods-CustomFont/Pods-CustomFont.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		3B87C89F1E7D70BE003011CD /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FEC936971D40DFFA49A3AC12 /* Pods_CustomFont.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -45,8 +40,6 @@
 			children = (
 				3B87C8A41E7D70BE003011CD /* CustomFont */,
 				3B87C8A31E7D70BE003011CD /* Products */,
-				CB7AB1120FB9FED26B77EB9B /* Pods */,
-				9A427BF680B09EC9E595DE13 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -71,36 +64,16 @@
 			path = CustomFont;
 			sourceTree = "<group>";
 		};
-		9A427BF680B09EC9E595DE13 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				4BA8797550ED5B0337E6A3F8 /* Pods_CustomFont.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		CB7AB1120FB9FED26B77EB9B /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				D66D674E1E55707917F7DC1D /* Pods-CustomFont.debug.xcconfig */,
-				64E5B22149F71B9E8027E223 /* Pods-CustomFont.release.xcconfig */,
-			);
-			name = Pods;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
 		3B87C8A11E7D70BE003011CD /* CustomFont */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3B87C8B41E7D70BE003011CD /* Build configuration list for PBXNativeTarget "CustomFont" */;
 			buildPhases = (
-				1C62051089DED7A15E524CC7 /* [CP] Check Pods Manifest.lock */,
 				3B87C89E1E7D70BE003011CD /* Sources */,
 				3B87C89F1E7D70BE003011CD /* Frameworks */,
 				3B87C8A01E7D70BE003011CD /* Resources */,
-				79E371EB445DD37B74AB5856 /* [CP] Embed Pods Frameworks */,
-				E7A7A67B5B322A82DE71DFA5 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -158,54 +131,6 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		1C62051089DED7A15E524CC7 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputPaths = (
-			);
-			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";
-			showEnvVarsInLog = 0;
-		};
-		79E371EB445DD37B74AB5856 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CustomFont/Pods-CustomFont-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		E7A7A67B5B322A82DE71DFA5 /* [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-CustomFont/Pods-CustomFont-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		3B87C89E1E7D70BE003011CD /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -331,29 +256,33 @@
 		};
 		3B87C8B51E7D70BE003011CD /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D66D674E1E55707917F7DC1D /* Pods-CustomFont.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = CustomFont/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = nimoAndHisFriends.CustomFont;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
 		3B87C8B61E7D70BE003011CD /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 64E5B22149F71B9E8027E223 /* Pods-CustomFont.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = CustomFont/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = nimoAndHisFriends.CustomFont;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/...mFont/CustomFont.xcodeproj/xcuserdata/True.xcuserdatad/xcschemes/xcschememanagement.plist b/...mFont/CustomFont.xcodeproj/xcuserdata/True.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>CustomFont.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/01.CustomFont/CustomFont/CustomFont.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/01.CustomFont/CustomFont/CustomFont.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/...tomFont/CustomFont.xcworkspace/xcuserdata/True.xcuserdatad/UserInterfaceState.xcuserstate b/...tomFont/CustomFont.xcworkspace/xcuserdata/True.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/01.CustomFont/CustomFont/CustomFont/Info.plist b/01.CustomFont/CustomFont/CustomFont/Info.plist
@@ -18,18 +18,18 @@
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
+	<key>Item0</key>
+	<string>LiHei Pro.ttf</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string></string>
 	</array>
-	<key>Item0</key>
-	<string>LiHei Pro.ttf</string>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/01.CustomFont/CustomFont/CustomFont/ViewController.swift b/01.CustomFont/CustomFont/CustomFont/ViewController.swift
@@ -44,7 +44,7 @@ class ViewController: UIViewController {
         // Dispose of any resources that can be recreated.
     }
 
-    func changeFontFamily() {
+    @objc func changeFontFamily() {
         label.font = UIFont(name: "Savoye LET", size: 30)
     }
 

diff --git a/01.CustomFont/CustomFont/Podfile b/01.CustomFont/CustomFont/Podfile
@@ -1,13 +1,10 @@
 project 'CustomFont.xcodeproj'
 
 # Uncomment the next line to define a global platform for your project
-# platform :ios, '9.0'
-
+platform :ios, '10.0'
 target 'CustomFont' do
-  # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
-  use_frameworks!
-  pod 'SnapKit'
-
-  # Pods for CustomFont
-
-end
+source 'https://github.com/CocoaPods/Specs.git'
+use_frameworks!
+    pod 'SnapKit', '~> 3.2.0'
+
+end
diff --git a/01.CustomFont/CustomFont/Podfile.lock b/01.CustomFont/CustomFont/Podfile.lock
@@ -2,11 +2,11 @@ PODS:
   - SnapKit (3.2.0)
 
 DEPENDENCIES:
-  - SnapKit
+  - SnapKit (~> 3.2.0)
 
 SPEC CHECKSUMS:
   SnapKit: 1ca44df72cfa543218d177cb8aab029d10d86ea7
 
-PODFILE CHECKSUM: 18d9fc79ef0f580c83b535a3d9dfb198fdcc430d
+PODFILE CHECKSUM: e7c057a48a349976870041fd56f308d3c5000a70
 
-COCOAPODS: 1.2.1.beta.1
+COCOAPODS: 1.4.0