Skip to content

Commit

Permalink
Merge branch 'release/1.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kofktu
Kofktu committed Feb 7, 2019
2 parents ee89a42 + 4bb94a8 commit 2319aa8
Show file tree
Hide file tree
Showing 31 changed files with 1,367 additions and 84 deletions.
157 changes: 83 additions & 74 deletions Example/Example.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,49 +7,20 @@
objects = {

/* Begin PBXBuildFile section */
2B4BF5EFAEB365CCDD1C65F8 /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C5834909A3E455682DC898 /* Pods_Example.framework */; };
C337D68F1EFE2E1F00425943 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C337D68E1EFE2E1F00425943 /* AppDelegate.swift */; };
C337D6911EFE2E1F00425943 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C337D6901EFE2E1F00425943 /* ViewController.swift */; };
C337D6941EFE2E1F00425943 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C337D6921EFE2E1F00425943 /* Main.storyboard */; };
C337D6961EFE2E1F00425943 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C337D6951EFE2E1F00425943 /* Assets.xcassets */; };
C337D6991EFE2E1F00425943 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C337D6971EFE2E1F00425943 /* LaunchScreen.storyboard */; };
C337D6B01EFE36D800425943 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C337D6AF1EFE36D800425943 /* Foundation.framework */; };
C337D6B21EFE36DD00425943 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C337D6B11EFE36DD00425943 /* UIKit.framework */; };
C3DDE17D2164BFE200A79981 /* WKCookieWebView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3DDE17C2164BFA500A79981 /* WKCookieWebView.framework */; };
C3DDE17E2164BFE200A79981 /* WKCookieWebView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C3DDE17C2164BFA500A79981 /* WKCookieWebView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
CEF44FDE220C061900101C21 /* ObjCWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF44FDD220C061900101C21 /* ObjCWebViewController.m */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
C3DDE17B2164BFA500A79981 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C3DDE1772164BFA500A79981 /* WKCookieWebView.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = C337D6771EFE2CFF00425943;
remoteInfo = WKCookieWebView;
};
C3DDE17F2164BFE200A79981 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C3DDE1772164BFA500A79981 /* WKCookieWebView.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = C337D6761EFE2CFF00425943;
remoteInfo = WKCookieWebView;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
C3DDE1812164BFE200A79981 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
C3DDE17E2164BFE200A79981 /* WKCookieWebView.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
153316C43EE6E51C0F6D10E5 /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
4E916C9DB675D10B45CDAEDD /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
C337D68B1EFE2E1F00425943 /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
C337D68E1EFE2E1F00425943 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
C337D6901EFE2E1F00425943 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand All @@ -59,7 +30,10 @@
C337D69A1EFE2E1F00425943 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
C337D6AF1EFE36D800425943 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
C337D6B11EFE36DD00425943 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
C3DDE1772164BFA500A79981 /* WKCookieWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WKCookieWebView.xcodeproj; path = ../WKCookieWebView.xcodeproj; sourceTree = "<group>"; };
CEF44FDB220C061900101C21 /* Example-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Example-Bridging-Header.h"; sourceTree = "<group>"; };
CEF44FDC220C061900101C21 /* ObjCWebViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ObjCWebViewController.h; sourceTree = "<group>"; };
CEF44FDD220C061900101C21 /* ObjCWebViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ObjCWebViewController.m; sourceTree = "<group>"; };
D0C5834909A3E455682DC898 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -69,20 +43,29 @@
files = (
C337D6B21EFE36DD00425943 /* UIKit.framework in Frameworks */,
C337D6B01EFE36D800425943 /* Foundation.framework in Frameworks */,
C3DDE17D2164BFE200A79981 /* WKCookieWebView.framework in Frameworks */,
2B4BF5EFAEB365CCDD1C65F8 /* Pods_Example.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
00A14BC87E2F7067567F18BE /* Pods */ = {
isa = PBXGroup;
children = (
4E916C9DB675D10B45CDAEDD /* Pods-Example.debug.xcconfig */,
153316C43EE6E51C0F6D10E5 /* Pods-Example.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
C337D6821EFE2E1F00425943 = {
isa = PBXGroup;
children = (
C3DDE1772164BFA500A79981 /* WKCookieWebView.xcodeproj */,
C337D68D1EFE2E1F00425943 /* Example */,
C337D68C1EFE2E1F00425943 /* Products */,
C337D6AE1EFE36D800425943 /* Frameworks */,
00A14BC87E2F7067567F18BE /* Pods */,
);
sourceTree = "<group>";
};
Expand All @@ -99,10 +82,13 @@
children = (
C337D68E1EFE2E1F00425943 /* AppDelegate.swift */,
C337D6901EFE2E1F00425943 /* ViewController.swift */,
CEF44FDC220C061900101C21 /* ObjCWebViewController.h */,
CEF44FDD220C061900101C21 /* ObjCWebViewController.m */,
C337D6921EFE2E1F00425943 /* Main.storyboard */,
C337D6951EFE2E1F00425943 /* Assets.xcassets */,
C337D6971EFE2E1F00425943 /* LaunchScreen.storyboard */,
C337D69A1EFE2E1F00425943 /* Info.plist */,
CEF44FDB220C061900101C21 /* Example-Bridging-Header.h */,
);
path = Example;
sourceTree = "<group>";
Expand All @@ -112,34 +98,27 @@
children = (
C337D6B11EFE36DD00425943 /* UIKit.framework */,
C337D6AF1EFE36D800425943 /* Foundation.framework */,
D0C5834909A3E455682DC898 /* Pods_Example.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
C3DDE1782164BFA500A79981 /* Products */ = {
isa = PBXGroup;
children = (
C3DDE17C2164BFA500A79981 /* WKCookieWebView.framework */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
C337D68A1EFE2E1F00425943 /* Example */ = {
isa = PBXNativeTarget;
buildConfigurationList = C337D69D1EFE2E1F00425943 /* Build configuration list for PBXNativeTarget "Example" */;
buildPhases = (
1246EA012691A75681E34C57 /* [CP] Check Pods Manifest.lock */,
C337D6871EFE2E1F00425943 /* Sources */,
C337D6881EFE2E1F00425943 /* Frameworks */,
C337D6891EFE2E1F00425943 /* Resources */,
C3DDE1812164BFE200A79981 /* Embed Frameworks */,
957C72A292C0C742EDA5B5E9 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
dependencies = (
C3DDE1802164BFE200A79981 /* PBXTargetDependency */,
);
name = Example;
productName = Example;
Expand All @@ -159,6 +138,7 @@
C337D68A1EFE2E1F00425943 = {
CreatedOnToolsVersion = 8.3.2;
DevelopmentTeam = KLVLNTBFM4;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
};
};
Expand All @@ -174,29 +154,13 @@
mainGroup = C337D6821EFE2E1F00425943;
productRefGroup = C337D68C1EFE2E1F00425943 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = C3DDE1782164BFA500A79981 /* Products */;
ProjectRef = C3DDE1772164BFA500A79981 /* WKCookieWebView.xcodeproj */;
},
);
projectRoot = "";
targets = (
C337D68A1EFE2E1F00425943 /* Example */,
);
};
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
C3DDE17C2164BFA500A79981 /* WKCookieWebView.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = WKCookieWebView.framework;
remoteRef = C3DDE17B2164BFA500A79981 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
C337D6891EFE2E1F00425943 /* Resources */ = {
isa = PBXResourcesBuildPhase;
Expand All @@ -210,26 +174,66 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
1246EA012691A75681E34C57 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Example-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# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
957C72A292C0C742EDA5B5E9 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/WKCookieWebView/WKCookieWebView.framework",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WKCookieWebView.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
C337D6871EFE2E1F00425943 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C337D6911EFE2E1F00425943 /* ViewController.swift in Sources */,
CEF44FDE220C061900101C21 /* ObjCWebViewController.m in Sources */,
C337D68F1EFE2E1F00425943 /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
C3DDE1802164BFE200A79981 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = WKCookieWebView;
targetProxy = C3DDE17F2164BFE200A79981 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
C337D6921EFE2E1F00425943 /* Main.storyboard */ = {
isa = PBXVariantGroup;
Expand Down Expand Up @@ -345,29 +349,34 @@
};
C337D69E1EFE2E1F00425943 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 4E916C9DB675D10B45CDAEDD /* Pods-Example.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = KLVLNTBFM4;
INFOPLIST_FILE = Example/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.kofktu.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_OBJC_BRIDGING_HEADER = "Example/Example-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
C337D69F1EFE2E1F00425943 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 153316C43EE6E51C0F6D10E5 /* Pods-Example.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = KLVLNTBFM4;
INFOPLIST_FILE = Example/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.kofktu.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_OBJC_BRIDGING_HEADER = "Example/Example-Bridging-Header.h";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
10 changes: 10 additions & 0 deletions Example/Example.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Example/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion Example/Example/AppDelegate.swift
View file
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]? = nil) -> Bool {
// Override point for customization after application launch.
return true
}
Expand Down
5 changes: 5 additions & 0 deletions Example/Example/Example-Bridging-Header.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//

#import "ObjCWebViewController.h"
17 changes: 17 additions & 0 deletions Example/Example/ObjCWebViewController.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// ObjCWebViewController.h
// Example
//
// Created by Taeun Kim on 07/02/2019.
// Copyright © 2019 Kofktu. All rights reserved.
//

#import <UIKit/UIKit.h>

NS_ASSUME_NONNULL_BEGIN

@interface ObjCWebViewController : UIViewController

@end

NS_ASSUME_NONNULL_END
Loading

0 comments on commit 2319aa8

Please sign in to comment.