From f49b1e081e7a26d7217e68a6d98c53b66acb19a6 Mon Sep 17 00:00:00 2001 From: freekering Date: Mon, 6 Mar 2017 19:05:23 +0900 Subject: [PATCH 1/4] Update LICENSE --- LICENSE | 223 ++++++-------------------------------------------------- 1 file changed, 21 insertions(+), 202 deletions(-) diff --git a/LICENSE b/LICENSE index 610cecd..2f643ee 100644 --- a/LICENSE +++ b/LICENSE @@ -1,202 +1,21 @@ -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2013-2015 Iron Summit Media Strategies, LLC - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - +MIT License + +Copyright (c) 2017 RIDI Corporation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From da72b43d6d8e67152827608820e5003abbe3e518 Mon Sep 17 00:00:00 2001 From: DaVin Ahn Date: Tue, 4 Jul 2017 19:24:24 +0900 Subject: [PATCH 2/4] Fix build warning --- WKJavaScriptController/WKJavaScriptController.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/WKJavaScriptController/WKJavaScriptController.swift b/WKJavaScriptController/WKJavaScriptController.swift index 0d04ef6..5fe889b 100644 --- a/WKJavaScriptController/WKJavaScriptController.swift +++ b/WKJavaScriptController/WKJavaScriptController.swift @@ -129,7 +129,7 @@ open class WKJavaScriptController: NSObject { fileprivate func protocolsAdoptedBy(`protocol`: Protocol) -> [Protocol] { var protocols = [`protocol`] let protocolList = protocol_copyProtocolList(`protocol`, nil) - if protocolList != nil, var list = Optional(protocolList) { + if protocolList != nil, let list = Optional(protocolList) { if let adoptedProtocol = list?.pointee.unsafelyUnwrapped { protocols += protocolsAdoptedBy(protocol: adoptedProtocol) } @@ -149,10 +149,10 @@ open class WKJavaScriptController: NSObject { while list?.pointee.name != nil { defer { list = list?.successor() } - let selector = list?.pointee.name - guard let types = list?.pointee.types, + guard let selector = list?.pointee.name, + let types = list?.pointee.types, let signature = String(cString: types, encoding: String.Encoding.utf8) else { - log("Method signature not found, so it was excluded. (selector: \(selector))") + log("Method signature not found, so it was excluded. (selector: \(list?.pointee.name ?? "nil"))") continue } @@ -187,7 +187,7 @@ open class WKJavaScriptController: NSObject { continue } - let bridge = MethodBridge(nativeSelector: selector!) + let bridge = MethodBridge(nativeSelector: selector) if bridge.argumentLength > limit { log("Argument length is longer than \(limit), so it was excluded. (selector: \(bridge.nativeSelector))") continue From 82812f2a0e76b2566e4b025eb94504569ac06540 Mon Sep 17 00:00:00 2001 From: DaVin Ahn Date: Wed, 5 Jul 2017 11:05:41 +0900 Subject: [PATCH 3/4] Update .swiftlint.yml --- .swiftlint.yml | 51 ++++++++++++------- .../project.pbxproj | 15 ++++++ .../WKJavaScriptController.swift | 8 +-- 3 files changed, 52 insertions(+), 22 deletions(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index ea1f76a..1b37794 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,24 +1,39 @@ +# Note 1: 가독성 개선 및 코드 간략화를 위함 +# Note 2: Xcode 에디터 특성상 의미 없음 +# Note 3: VC 구조상 지킬 수 없음 +# Note 4: API 관련 Data class와 JSI 설계를 위함 +# Note 5: 속도 향상을 위함 +# Note 6: ObjC 스타일의 네이밍을 사용하기 때문에 지킬 수 없음 +# (Swift에 rename refactor가 지원되기 전까지는 ObjC 스타일을 유지할 예정) +# Note 7: 추후 RxSwift 및 Swift3 대응으로 해결할 예정 + +disabled_rules: + # Global + - file_length # 파일 길이 제한 없음 (Note 3) + - for_where # for-in-where 강제 안함 (Note 1) + - force_cast # 강제 cast 허용 (Note 1) + - force_try # 강제 try 허용 (Note 1) + - function_body_length # 함수 구현부 길이 제한 없음 (Note 1) + - function_parameter_count # 함수 파라메터 갯수 제한 없음 (Note 4) + - line_length # 행 길이 제한 없음 (Note 2) + - todo + - trailing_whitespace # 구문 줄 바꿈 허용 (Note 1) + - type_body_length # 타입 선언부 길이 제한 없음 (Note 3) + - variable_name # 변수명 길이 제한 없음 (Note 4) + - vertical_whitespace # 수직 여백 허용 (Note 1) + # WKJavaScriptController + - cyclomatic_complexity # 복잡도 무시 (Note 7) + +opt_in_rules: + - empty_count # isEmpty 사용 강제 (Note 1, 5) + - closure_end_indentation # 클로저의 시작과 끝의 들여쓰기를 동일하게 맞추도록 (Note 1) + - closure_spacing # 클로저 표현식의 시작과 끝에 공백을 넣도록 (Note 1) + - explicit_init # 명시적인 init 호출을 하지 않도록 (Note 1) + - first_where # `.filter { … }.first` 보다 `.first(where: { … })`를 사용하도록 (Note 1, 5) + included: - WKJavaScriptController - WKJavaScriptController-Demo excluded: - Pods - -variable_name: - min_length: - warning: 0 - error: 0 - -disabled_rules: - - file_length - - force_cast - - force_try - - function_body_length - - function_parameter_count - - todo - - type_body_length - - line_length - - trailing_whitespace - - cyclomatic_complexity - - variable_name diff --git a/WKJavaScriptController-Demo/WKJavaScriptController-Demo.xcodeproj/project.pbxproj b/WKJavaScriptController-Demo/WKJavaScriptController-Demo.xcodeproj/project.pbxproj index 3705d28..bc6a4ba 100644 --- a/WKJavaScriptController-Demo/WKJavaScriptController-Demo.xcodeproj/project.pbxproj +++ b/WKJavaScriptController-Demo/WKJavaScriptController-Demo.xcodeproj/project.pbxproj @@ -102,6 +102,7 @@ buildConfigurationList = 83FA359C1E2C5C6900A6B171 /* Build configuration list for PBXNativeTarget "WKJavaScriptController-Demo" */; buildPhases = ( 7C3475A598746FB73315144A /* [CP] Check Pods Manifest.lock */, + 83054A791F0C76460001C4B0 /* SwiftLint Script */, 83FA35861E2C5C6900A6B171 /* Sources */, 83FA35871E2C5C6900A6B171 /* Frameworks */, 83FA35881E2C5C6900A6B171 /* Resources */, @@ -198,6 +199,20 @@ shellScript = "diff \"${PODS_ROOT}/../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; }; + 83054A791F0C76460001C4B0 /* SwiftLint Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "SwiftLint Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "function toVersion { echo -e \"$@\" | awk -F. '{ printf(\"%d%03d%03d%03d\\n\", $1,$2,$3,$4); }'; }\nif which swiftlint >/dev/null; then\n current=$(swiftlint version)\n require=\"0.20.0\"\n if [ $(toVersion \"$current\") -ge $(toVersion \"$require\") ]; then\n cd \"${PROJECT_DIR}/../\"\n swiftlint\n else\n echo \"SwiftLint requires a SwiftLint version of >= $require. You are on $current.\"\n echo \"Please update using 'brew upgrade swiftlint'.\"\n exit 101\n fi\nelse\n echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\n exit 100\nfi"; + }; FAD7856FCA59270D07D9FB11 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/WKJavaScriptController/WKJavaScriptController.swift b/WKJavaScriptController/WKJavaScriptController.swift index 5fe889b..6a3e719 100644 --- a/WKJavaScriptController/WKJavaScriptController.swift +++ b/WKJavaScriptController/WKJavaScriptController.swift @@ -152,7 +152,7 @@ open class WKJavaScriptController: NSObject { guard let selector = list?.pointee.name, let types = list?.pointee.types, let signature = String(cString: types, encoding: String.Encoding.utf8) else { - log("Method signature not found, so it was excluded. (selector: \(list?.pointee.name ?? "nil"))") + log("Method signature not found, so it was excluded. (selector: \(list?.pointee.name ?? Selector(("nil"))))") continue } @@ -272,7 +272,7 @@ extension WKJavaScriptController: WKScriptMessageHandler { public func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) { guard let target = target, let args = message.body as? [Arg], - let bridge = bridgeList.filter({ $0.jsSelector == message.name }).first else { + let bridge = bridgeList.first(where: { $0.jsSelector == message.name }) else { return } @@ -318,7 +318,7 @@ extension WKJavaScriptController: WKScriptMessageHandler { let userInfo = [ "nativeSelector": bridge.nativeSelector, "jsSelector": bridge.jsSelector, - "args": args, + "args": args ] as [String: Any] NotificationCenter.default.post(name: WKJavaScriptControllerWillMethodInvocationNotification, object: nil, userInfo: userInfo) @@ -329,7 +329,7 @@ extension WKJavaScriptController: WKScriptMessageHandler { "nativeSelector": bridge.nativeSelector, "jsSelector": bridge.jsSelector, "args": args, - "reason": "Arguments has NSNull(=undefined).", + "reason": "Arguments has NSNull(=undefined)." ] as [String: Any] NotificationCenter.default.post(name: WKJavaScriptControllerIgnoredMethodInvocationNotification, object: nil, userInfo: userInfo) return From d7eb726f804ddb07196df8d402d0a2fa3b5ed301 Mon Sep 17 00:00:00 2001 From: DaVin Ahn Date: Wed, 5 Jul 2017 11:06:39 +0900 Subject: [PATCH 4/4] Update podspec --- WKJavaScriptController.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WKJavaScriptController.podspec b/WKJavaScriptController.podspec index a14fa1d..1223328 100644 --- a/WKJavaScriptController.podspec +++ b/WKJavaScriptController.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'WKJavaScriptController' - s.version = '1.1.5' + s.version = '1.1.6' s.summary = 'Calling native code from Javascript in the iOS application likes JavascriptInterface in the Android.' s.homepage = 'https://github.com/ridibooks/WKJavaScriptController' s.authors = { 'Ridibooks Viewer Team' => 'viewer.team@ridi.com' }