diff --git a/Cami.xcodeproj/project.pbxproj b/Cami.xcodeproj/project.pbxproj index d2d4dfa..53b0585 100644 --- a/Cami.xcodeproj/project.pbxproj +++ b/Cami.xcodeproj/project.pbxproj @@ -287,7 +287,6 @@ 461649342B09A89A00F7E7E1 /* PrivacyInfo.xcprivacy */, 46934D912B78F5130025ADF2 /* sonar-project.properties */, 4655330A2AF4EA69000B537B /* Products */, - 46E0222D2B7A72B0005725B0 /* Frameworks */, ); sourceTree = ""; }; @@ -487,13 +486,6 @@ path = Helper; sourceTree = ""; }; - 46E0222D2B7A72B0005725B0 /* Frameworks */ = { - isa = PBXGroup; - children = ( - ); - name = Frameworks; - sourceTree = ""; - }; 46F31B6E2B765C920016799F /* Calendar */ = { isa = PBXGroup; children = ( @@ -1072,6 +1064,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_HEADERS_RUN_UNIFDEF = YES; + CURRENT_PROJECT_VERSION = 21; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = NP94WB3P75; ENABLE_PREVIEWS = YES; @@ -1129,6 +1122,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_HEADERS_RUN_UNIFDEF = YES; + CURRENT_PROJECT_VERSION = 21; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = NP94WB3P75; ENABLE_PREVIEWS = YES; @@ -1181,7 +1175,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; CODE_SIGN_ENTITLEMENTS = CamiWidgetExtension.entitlements; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 21; DEVELOPMENT_TEAM = NP94WB3P75; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; @@ -1229,7 +1223,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; CODE_SIGN_ENTITLEMENTS = CamiWidgetExtension.entitlements; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 21; DEVELOPMENT_TEAM = NP94WB3P75; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; @@ -1307,8 +1301,9 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/apple/swift-collections.git"; requirement = { - kind = upToNextMinorVersion; - minimumVersion = 1.0.6; + kind = versionRange; + maximumVersion = 10.0.0; + minimumVersion = 1.1.0; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/Cami.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Cami.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 0c69885..1a0f425 100644 --- a/Cami.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Cami.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections.git", "state" : { - "revision" : "d029d9d39c87bed85b1c50adee7c41795261a192", - "version" : "1.0.6" + "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb", + "version" : "1.1.0" } } ], diff --git a/Settings.bundle/About.plist b/Settings.bundle/About.plist deleted file mode 100644 index 2ef3871..0000000 --- a/Settings.bundle/About.plist +++ /dev/null @@ -1,31 +0,0 @@ - - - - - StringsTable - About - PreferenceSpecifiers - - - Type - PSGroupSpecifier - FooterText - Cami Calendar is an application developed by Aemi Studio. Aemi Studio is an organization owned by Guillaume Coquard. - - - Type - PSGroupSpecifier - FooterText - You can find more work from Aemi Studio on our website or GitHub account: -- https://aemi.studio -- https://github.com/Aemi-Studio - - - Type - PSGroupSpecifier - FooterText - You can reach out to Aemi Studio by email at: public@aemi.studio - - - - diff --git a/Settings.bundle/About/About.plist b/Settings.bundle/About/About.plist new file mode 100644 index 0000000..ab58d61 --- /dev/null +++ b/Settings.bundle/About/About.plist @@ -0,0 +1,28 @@ + + + + + StringsTable + About + PreferenceSpecifiers + + + Type + PSGroupSpecifier + FooterText + Cami Calendar is a native yet improved calendar widget for your iPhone, iPad or Mac developed by Aemi Studio. + +Aemi Studio is an organization aimed toward creating innovative and meaningful interactions through application development. + +Aemi Studio is owned and has been founded by Guillaume Coquard (gcqd.fr). + +You can find more work from Aemi Studio on our website or GitHub account: +- https://aemi.studio +- https://github.com/Aemi-Studio + +If you need or want to reach out to Aemi Studio, please send an email to: +- public@aemi.studio + + + + diff --git a/Settings.bundle/Privacy Policy.plist b/Settings.bundle/Privacy Policy/Privacy Policy.plist similarity index 100% rename from Settings.bundle/Privacy Policy.plist rename to Settings.bundle/Privacy Policy/Privacy Policy.plist diff --git a/Settings.bundle/Root.plist b/Settings.bundle/Root.plist index 8ee52f4..3766ec3 100644 --- a/Settings.bundle/Root.plist +++ b/Settings.bundle/Root.plist @@ -20,11 +20,11 @@ Title About File - About + About/About File - Privacy Policy + Privacy Policy/Privacy Policy Type PSChildPaneSpecifier Title @@ -36,7 +36,7 @@ Title Third Party Library File - Third Party Library + Third Party Library/Third Party Library Type diff --git a/Settings.bundle/Third Party Library.plist b/Settings.bundle/Third Party Library/Third Party Library.plist similarity index 63% rename from Settings.bundle/Third Party Library.plist rename to Settings.bundle/Third Party Library/Third Party Library.plist index 1ad116e..97abc41 100644 --- a/Settings.bundle/Third Party Library.plist +++ b/Settings.bundle/Third Party Library/Third Party Library.plist @@ -8,9 +8,11 @@ Type - PSGroupSpecifier - FooterText - Cami Calendar uses "Swift Collections" Swift library available at https://github.com/apple/swift-collections. + PSChildPaneSpecifier + Title + swift-collections + File + Third Party Library/swift-collections/swift-collections diff --git a/Settings.bundle/Third Party Library/swift-collections/swift-collections-license.plist b/Settings.bundle/Third Party Library/swift-collections/swift-collections-license.plist new file mode 100644 index 0000000..f54f775 --- /dev/null +++ b/Settings.bundle/Third Party Library/swift-collections/swift-collections-license.plist @@ -0,0 +1,228 @@ + + + + + StringsTable + swift-collections - License + PreferenceSpecifiers + + + Type + PSGroupSpecifier + FooterText + 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. + + + +## Runtime Library Exception to the Apache 2.0 License: ## + + + As an exception, if you use this Software to compile your source code and + portions of this Software are embedded into the binary product as a result, + you may redistribute such product without providing attribution as would + otherwise be required by Sections 4(a), 4(b) and 4(d) of the License. + + + + + diff --git a/Settings.bundle/Third Party Library/swift-collections/swift-collections.plist b/Settings.bundle/Third Party Library/swift-collections/swift-collections.plist new file mode 100644 index 0000000..8ae772f --- /dev/null +++ b/Settings.bundle/Third Party Library/swift-collections/swift-collections.plist @@ -0,0 +1,36 @@ + + + + + StringsTable + swift-collections + PreferenceSpecifiers + + + Type + PSGroupSpecifier + FooterText + Cami Calendar uses "Swift Collections", a Swift library maintained by Apple available at: +- https://github.com/apple/swift-collections + +"swift-collections" is currently used in work-in-progress features you can enable in the settings, and more specifically the scrolling Calendar view. + + + Type + PSGroupSpecifier + Title + + File + + + + Type + PSChildPaneSpecifier + Title + License + File + Third Party Library/swift-collections/swift-collections-license + + + + diff --git a/Settings.bundle/en.lproj/About.strings b/Settings.bundle/en.lproj/About.strings index 6544e98..481e83d 100644 --- a/Settings.bundle/en.lproj/About.strings +++ b/Settings.bundle/en.lproj/About.strings @@ -1,7 +1,23 @@ -"Cami Calendar is an application developed by Aemi Studio. Aemi Studio is an organization owned by Guillaume Coquard." = "Cami Calendar is an application developed by Aemi Studio. Aemi Studio is an organization owned by Guillaume Coquard."; -"You can find more work from Aemi Studio on our website or GitHub account: +"Cami Calendar is a native yet improved calendar widget for your iPhone, iPad or Mac developed by Aemi Studio. + +Aemi Studio is an organization aimed toward creating innovative and meaningful interactions through application development. + +Aemi Studio is owned and has been founded by Guillaume Coquard (gcqd.fr). + +You can find more work from Aemi Studio on our website or GitHub account: - https://aemi.studio -- https://github.com/Aemi-Studio" = "You can find more work from Aemi Studio on our website or GitHub account: +- https://github.com/Aemi-Studio + +If you need or want to reach out to Aemi Studio, please send an email to: +- public@aemi.studio" = "Cami Calendar is a native yet improved calendar widget for your iPhone, iPad or Mac developed by Aemi Studio. + +Aemi Studio is an organization aimed toward creating innovative and meaningful interactions through application development. + +Aemi Studio is owned and has been founded by Guillaume Coquard (gcqd.fr). + +You can find more work from Aemi Studio on our website or GitHub account: - https://aemi.studio -- https://github.com/Aemi-Studio"; -"You can reach out to Aemi Studio by email at: public@aemi.studio" = "You can reach out to Aemi Studio by email at: public@aemi.studio"; +- https://github.com/Aemi-Studio + +If you need or want to reach out to Aemi Studio, please send an email to: +- public@aemi.studio"; diff --git a/Settings.bundle/en.lproj/Third Party Library.strings b/Settings.bundle/en.lproj/Third Party Library.strings deleted file mode 100644 index f569873..0000000 --- a/Settings.bundle/en.lproj/Third Party Library.strings +++ /dev/null @@ -1 +0,0 @@ -"Cami Calendar uses \"Swift Collections\" Swift library available at https://github.com/apple/swift-collections." = "Cami Calendar uses \"Swift Collections\" Swift library available at https://github.com/apple/swift-collections."; diff --git a/Settings.bundle/en.lproj/swift-collections.strings b/Settings.bundle/en.lproj/swift-collections.strings new file mode 100644 index 0000000..c3d369f --- /dev/null +++ b/Settings.bundle/en.lproj/swift-collections.strings @@ -0,0 +1,8 @@ +"Cami Calendar uses \"swift-collections\", a Swift library maintained by Apple available at: +- https://github.com/apple/swift-collections + +\"swift-collections\" is currently used in work-in-progress features you can enable in the settings, and more specifically the scrolling Calendar view." = "Cami Calendar uses \"swift-collections\", a Swift library maintained by Apple available at: +- https://github.com/apple/swift-collections + +\"swift-collections\" is currently used in work-in-progress features you can enable in the settings, and more specifically the scrolling Calendar view."; +"License" = "License";