diff --git a/.gitignore b/.gitignore index 8615121..a369655 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,22 @@ +# +# .gitignore +# Nemo +# +# Created by Sinoru on 2015. 8. 8.. +# Copyright © 2015-2017 Sinoru. All rights reserved. +# +# 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. + # Xcode # build/ diff --git a/.swiftlint.yml b/.swiftlint.yml index 53531fe..4b0976f 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,9 +1,21 @@ # # .swiftlint.yml # Nemo -# +# # Created by Sinoru on 2017. 1. 11.. # Copyright © 2017 Sinoru. All rights reserved. +# +# 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. disabled_rules: - line_length diff --git a/.travis.yml b/.travis.yml index a43d19e..1c46eb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,22 @@ +# +# .travis.yml +# Nemo +# +# Created by Sinoru on 2015. 8. 10.. +# Copyright © 2015-2017 Sinoru. All rights reserved. +# +# 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. + language: swift os: osx osx_image: xcode8.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index f6c4a8a..347ef70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +### 1.1 +##### Enhancements +- Swift 3.0 Support + + ### 1.0 ##### Enhancements - Swift 2.0 Support diff --git a/Gemfile b/Gemfile index 0b37143..b32c3fb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,21 @@ +# +# Gemfile +# Nemo +# +# Created by Sinoru on 2017. 1. 11.. +# Copyright © 2017 Sinoru. All rights reserved. +# +# 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. + source 'https://rubygems.org' gem 'xcpretty' diff --git a/LICENSE b/LICENSE index 2892b13..8dada3e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,28 +1,201 @@ -Copyright (c) 2015, Jaehong Kang -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -* Neither the name of Nemo nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + 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 {yyyy} {name of copyright owner} + + 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. diff --git a/Nemo.podspec b/Nemo.podspec index 344e6e1..093135a 100644 --- a/Nemo.podspec +++ b/Nemo.podspec @@ -1,3 +1,22 @@ +# +# Nemo.podspec +# Nemo +# +# Created by Sinoru on 2015. 8. 11.. +# Copyright © 2015-2017 Sinoru. All rights reserved. +# +# 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. + Pod::Spec.new do |s| s.name = "Nemo" s.version = "1.1" @@ -9,7 +28,7 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/sinoru/Nemo" - s.license = { :type => "BSD", :file => "LICENSE" } + s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" } s.author = { "Jaehong Kang" => "sinoru@me.com" } diff --git a/Nemo/NSBundle.swift b/Nemo/NSBundle.swift index e390f53..404a9ba 100644 --- a/Nemo/NSBundle.swift +++ b/Nemo/NSBundle.swift @@ -1,10 +1,21 @@ // // NSBundle.swift -// +// Nemo // // Created by Sinoru on 2015. 8. 10.. +// Copyright © 2015-2017 Sinoru. All rights reserved. // -// +// 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. import UIKit diff --git a/Nemo/Nemo.h b/Nemo/Nemo.h index a41840b..15ac597 100644 --- a/Nemo/Nemo.h +++ b/Nemo/Nemo.h @@ -3,8 +3,19 @@ // Nemo // // Created by Sinoru on 2015. 8. 8.. -// Copyright (c) 2015년 Sinoru. All rights reserved. +// Copyright © 2015-2017 Sinoru. All rights reserved. // +// 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. #import #import diff --git a/Nemo/PhotosMenuController.swift b/Nemo/PhotosMenuController.swift index a819885..fe0833e 100644 --- a/Nemo/PhotosMenuController.swift +++ b/Nemo/PhotosMenuController.swift @@ -3,8 +3,19 @@ // Nemo // // Created by Sinoru on 2015. 8. 8.. -// Copyright (c) 2015년 Sinoru. All rights reserved. +// Copyright © 2015-2017 Sinoru. All rights reserved. // +// 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. import UIKit import MobileCoreServices diff --git a/Nemo/PhotosMenuControllerDelegate.swift b/Nemo/PhotosMenuControllerDelegate.swift index 3cb79fd..89e67b6 100644 --- a/Nemo/PhotosMenuControllerDelegate.swift +++ b/Nemo/PhotosMenuControllerDelegate.swift @@ -3,8 +3,19 @@ // Nemo // // Created by Sinoru on 2015. 8. 8.. -// Copyright (c) 2015년 Sinoru. All rights reserved. +// Copyright © 2015-2017 Sinoru. All rights reserved. // +// 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. import UIKit import Photos diff --git a/Nemo/RecentPhotosCollectionViewController.swift b/Nemo/RecentPhotosCollectionViewController.swift index 2813164..4a2a201 100644 --- a/Nemo/RecentPhotosCollectionViewController.swift +++ b/Nemo/RecentPhotosCollectionViewController.swift @@ -1,10 +1,21 @@ // // RecentPhotosCollectionViewController.swift -// +// Nemo // // Created by Sinoru on 2015. 8. 8.. +// Copyright © 2015-2017 Sinoru. All rights reserved. // -// +// 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. import UIKit import Photos diff --git a/Nemo/RecentPhotosCollectionViewControllerDelegate.swift b/Nemo/RecentPhotosCollectionViewControllerDelegate.swift index 32dc27e..96fda4b 100644 --- a/Nemo/RecentPhotosCollectionViewControllerDelegate.swift +++ b/Nemo/RecentPhotosCollectionViewControllerDelegate.swift @@ -1,10 +1,21 @@ // // RecentPhotosCollectionViewControllerDelegate.swift -// +// Nemo // // Created by Sinoru on 2015. 8. 10.. +// Copyright © 2015-2017 Sinoru. All rights reserved. // -// +// 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. import UIKit diff --git a/Nemo/RecentPhotosPhotoCollectionViewCell.swift b/Nemo/RecentPhotosPhotoCollectionViewCell.swift index d108c80..ac21aa9 100644 --- a/Nemo/RecentPhotosPhotoCollectionViewCell.swift +++ b/Nemo/RecentPhotosPhotoCollectionViewCell.swift @@ -1,10 +1,21 @@ // // RecentPhotosPhotoCollectionViewCell.swift -// +// Nemo // // Created by Sinoru on 2015. 8. 9.. +// Copyright © 2015-2017 Sinoru. All rights reserved. // -// +// 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. import UIKit diff --git a/Nemo/en.lproj/Nemo.strings b/Nemo/en.lproj/Nemo.strings index 61de39c..e8cc3f1 100644 --- a/Nemo/en.lproj/Nemo.strings +++ b/Nemo/en.lproj/Nemo.strings @@ -3,7 +3,19 @@ Nemo Created by Sinoru on 2015. 8. 10.. - Copyright (c) 2015년 Sinoru. All rights reserved. + Copyright © 2015-2017 Sinoru. All rights reserved. + + 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. */ "Cancel" = "Cancel"; diff --git a/Nemo/ja.lproj/Nemo.strings b/Nemo/ja.lproj/Nemo.strings index bf0c548..705078b 100644 --- a/Nemo/ja.lproj/Nemo.strings +++ b/Nemo/ja.lproj/Nemo.strings @@ -3,7 +3,19 @@ Nemo Created by Sinoru on 2015. 8. 10.. - Copyright (c) 2015년 Sinoru. All rights reserved. + Copyright © 2015-2017 Sinoru. All rights reserved. + + 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. */ "Cancel" = "キャンセル"; diff --git a/Nemo/ko.lproj/Nemo.strings b/Nemo/ko.lproj/Nemo.strings index 4ce135a..6b3f920 100644 --- a/Nemo/ko.lproj/Nemo.strings +++ b/Nemo/ko.lproj/Nemo.strings @@ -3,7 +3,19 @@ Nemo Created by Sinoru on 2015. 8. 10.. - Copyright (c) 2015년 Sinoru. All rights reserved. + Copyright © 2015-2017 Sinoru. All rights reserved. + + 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. */ "Cancel" = "취소"; diff --git a/NemoExample/AppDelegate.swift b/NemoExample/AppDelegate.swift index 66a74d8..ec650ac 100644 --- a/NemoExample/AppDelegate.swift +++ b/NemoExample/AppDelegate.swift @@ -6,6 +6,25 @@ // Copyright (c) 2015년 Sinoru. All rights reserved. // +// +// AppDelegate.swift +// Nemo +// +// Created by Sinoru on 2015. 8. 8.. +// Copyright © 2015-2017 Sinoru. All rights reserved. +// +// 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. + import UIKit @UIApplicationMain diff --git a/NemoExample/CollectionViewCell.swift b/NemoExample/CollectionViewCell.swift index b214781..5370bc7 100644 --- a/NemoExample/CollectionViewCell.swift +++ b/NemoExample/CollectionViewCell.swift @@ -1,10 +1,21 @@ // // CollectionViewCell.swift -// +// Nemo // // Created by Sinoru on 2015. 8. 10.. +// Copyright © 2015-2017 Sinoru. All rights reserved. // -// +// 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. import UIKit diff --git a/NemoExample/ViewController.swift b/NemoExample/ViewController.swift index a9760ed..6cb787a 100644 --- a/NemoExample/ViewController.swift +++ b/NemoExample/ViewController.swift @@ -1,10 +1,21 @@ // // ViewController.swift -// NemoExample +// Nemo // // Created by Sinoru on 2015. 8. 8.. -// Copyright (c) 2015년 Sinoru. All rights reserved. +// Copyright © 2015-2017 Sinoru. All rights reserved. // +// 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. import UIKit import Nemo diff --git a/NemoExampleTests/NemoExampleTests.swift b/NemoExampleTests/NemoExampleTests.swift index c2560e7..5b77a0c 100644 --- a/NemoExampleTests/NemoExampleTests.swift +++ b/NemoExampleTests/NemoExampleTests.swift @@ -1,10 +1,21 @@ // // NemoExampleTests.swift -// NemoExampleTests +// Nemo // // Created by Sinoru on 2015. 8. 8.. -// Copyright (c) 2015년 Sinoru. All rights reserved. +// Copyright © 2015-2017 Sinoru. All rights reserved. // +// 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. import UIKit import XCTest diff --git a/NemoTests/NemoTests.swift b/NemoTests/NemoTests.swift index f1159e7..50b4211 100644 --- a/NemoTests/NemoTests.swift +++ b/NemoTests/NemoTests.swift @@ -1,10 +1,21 @@ // // NemoTests.swift -// NemoTests +// Nemo // // Created by Sinoru on 2015. 8. 8.. -// Copyright (c) 2015년 Sinoru. All rights reserved. +// Copyright © 2015-2017 Sinoru. All rights reserved. // +// 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. import UIKit import XCTest diff --git a/README.md b/README.md index 88cb575..9c7e759 100644 --- a/README.md +++ b/README.md @@ -63,4 +63,4 @@ NMPhotosMenuController *controller = [[NMPhotosMenuController alloc] init]; Or you can simply check NemoExample on `Nemo.xcodeproj` ## License -Nemo is distributed under the BSD 3-clause "New" or "Revised" License (see LICENSE). \ No newline at end of file +Read LICENSE for more information. diff --git a/bump-version.sh b/bump-version.sh index 5673ab2..10ad41b 100755 --- a/bump-version.sh +++ b/bump-version.sh @@ -1,4 +1,22 @@ -#!/bin/bash +#!/usr/bin/env bash +# +# Nemo.podspec +# Nemo +# +# Created by Sinoru on 2015. 8. 11.. +# Copyright © 2015-2017 Sinoru. All rights reserved. +# +# 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. CURRENT_VERSION=$(agvtool vers -terse) CURRENT_MARKETING_VERSION=$(agvtool mvers -terse1)