Update copyright (#90)

* Update license files and bump version to 1.1 * Changed third party notices in about to "Copyright Notices" and added the MIT license to licenses.html * added Soundscape Community Contributors as a copyright holder * bumped version to 1.1 * update licenses.html to include Core GPX
soundscape-community · Mar 20, 2024 · a787c37 · a787c37
1 parent 23f59a8
commit a787c37
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 20 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,5 +1,6 @@
     MIT License
 
+    Copyright (c) 2024 Soundscape Community Contributors
     Copyright (c) Microsoft Corporation.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/apps/ios/GuideDogs.xcodeproj/project.pbxproj b/apps/ios/GuideDogs.xcodeproj/project.pbxproj
@@ -6472,7 +6472,7 @@
 				CODE_SIGN_ENTITLEMENTS = GuideDogs/Assets/PropertyLists/SoundscapeDF.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = "";
 				EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
 				ENABLE_BITCODE = NO;
@@ -6503,7 +6503,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/GuideDogs",
 				);
-				MARKETING_VERSION = 1.0.2;
+				MARKETING_VERSION = 1.1;
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited) -DADHOC";
 				PRODUCT_BUNDLE_IDENTIFIER = "services.soundscape-adhoc";
@@ -6761,7 +6761,7 @@
 				CODE_SIGN_ENTITLEMENTS = GuideDogs/Assets/PropertyLists/Soundscape.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = X4H33NKGKY;
 				EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
@@ -6793,7 +6793,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/GuideDogs",
 				);
-				MARKETING_VERSION = 1.0.2;
+				MARKETING_VERSION = 1.1;
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited) -DDEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = "services.soundscape-debug";
@@ -6821,7 +6821,7 @@
 				CODE_SIGN_ENTITLEMENTS = GuideDogs/Assets/PropertyLists/Soundscape.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = X4H33NKGKY;
 				EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
 				ENABLE_BITCODE = NO;
@@ -6851,7 +6851,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/GuideDogs",
 				);
-				MARKETING_VERSION = 1.0.2;
+				MARKETING_VERSION = 1.1;
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited) -DRELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = services.soundscape;

diff --git a/apps/ios/GuideDogs/Assets/Licenses/licenses.html b/apps/ios/GuideDogs/Assets/Licenses/licenses.html
@@ -3,7 +3,7 @@
     <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-        <title>Third Party Notices</title>
+        <title>Copyright Notices</title>
         <style type="text/css">
             body {
                 background-color: rgb(33,34,51);
@@ -19,42 +19,70 @@
         </style>
     </head>
     <body>
+        <h1>MIT License</h1>
         <p>
-        <a href="https://www.github.com/microsoft/soundscape">Soundscape</a>
-        <br> Copyright (c) Microsoft Corporation
+            Copyright &copy; 2024 Soundscape Community Contributors
+            <br/>
+            Copyright &copy; Microsoft Corporation.
+        </p>
+        <p>
+            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:
+        </p>
+        <p>
+            The above copyright notice and this permission notice shall be included in all
+            copies or substantial portions of the Software.
+        </p>
+        <p>
+            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
+        </p>
+        <h1>Third Party Notices</h1>
+        <p>
+        <a href="https://www.github.com/microsoft/soundscape">Microsoft Soundscape</a>
+        <br> Copyright &copy; Microsoft Corporation
         </p>
         <p>
         <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>
-        <br> Copyright (c) OpenStreetMap Contributors
+        <br> Copyright &copy; OpenStreetMap Contributors
         </p>
         <p>
         <a href="https://raw.githubusercontent.com/CocoaLumberjack/CocoaLumberjack/master/LICENSE">CocoaLumberjack</a>
-        <br> Copyright (c) 2016 Deusty, LLC
+        <br> Copyright &copy; 2016 Deusty, LLC
         </p>
         <p>
         <a href="https://raw.githubusercontent.com/realm/realm-cocoa/master/LICENSE">Realm</a>
-        <br> Copyright (c) 2011-2016 Realm Inc All rights reserved
+        <br> Copyright &copy; 2011-2016 Realm Inc All rights reserved
         </p>
         <p>
         <a href="https://raw.githubusercontent.com/dzenbot/DZNEmptyDataSet/master/LICENSE">DZNEmptyDataSet</a>
-        <br> Copyright (c) 2016 Ignacio Romero Zurbuchen
+        <br> Copyright &copy; 2016 Ignacio Romero Zurbuchen
         </p>
         <p>
         <a href="https://raw.githubusercontent.com/ninjaprox/NVActivityIndicatorView/master/LICENSE">NVActivityIndicatorView</a>
-        <br> Copyright (c) 2016 Nguyen Vinh
+        <br> Copyright &copy; 2016 Nguyen Vinh
         </p>
         <p>
-        <a href="https://raw.githubusercontent.com/Pierre-Loup/iOS-GPX-Framework/master/LICENSE">iOS-GPX-Framework</a>
-        <br> Copyright (c) 2012 NextBusinessSystem Co., Ltd.
+            <a href=""https://github.com/vincentneo/CoreGPX/blob/master/LICENSE">CoreGPX</a>
+            <br/> Copyright &copy; 2018 Vincent Neo
         </p>
         <p>
         <a href="https://raw.githubusercontent.com/Pierre-Loup/iOS-GPX-Framework/master/TBXML-LICENSE">TBXML</a>
-        <br> Copyright (c) 2009 Tom Bradley
+        <br> Copyright &copy; 2009 Tom Bradley
         </p>
         <p>
         <p>
         <a href="https://raw.githubusercontent.com/SDWebImage/SDWebImage/master/LICENSE">SDWebImage</a>
-        <br> Copyright (c) 2009-2017 Olivier Poitrey [email protected]
+        <br> Copyright &copy; 2009-2017 Olivier Poitrey [email protected]
         </p>
     </body>
 </html>
diff --git a/apps/ios/GuideDogs/Assets/Localization/en-US.lproj/Localizable.strings b/apps/ios/GuideDogs/Assets/Localization/en-US.lproj/Localizable.strings
@@ -589,6 +589,9 @@
 /* Settings About Title, Third Party Notices */
 "settings.about.title.third_party" = "Third Party Notices";
 
+/* Settings About Title, Copyright Notices */
+"settings.about.title.copyright" = "Copyright Notices";
+
 //------------------------------------------------------------------------------
 // MARK: Settings (New Feature)
 //------------------------------------------------------------------------------

diff --git a/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Settings/AboutViewController.swift b/apps/ios/GuideDogs/Code/Visual UI/View Controllers/Settings/AboutViewController.swift
@@ -51,7 +51,7 @@ class AboutApplicationViewController: BaseTableViewController {
             AboutLinkCellModel(localizedTitle: GDLocalizedString("settings.about.title.whats_new"), segue: "ShowVersionHistorySegue"),
             AboutLinkCellModel(localizedTitle: GDLocalizationUnnecessary("Privacy Policy"), url: AppContext.Links.privacyPolicyURL(for: LocalizationContext.currentAppLocale), event: "about.privacy_policy"),
             AboutLinkCellModel(localizedTitle: GDLocalizationUnnecessary("Services Agreement"), url: AppContext.Links.servicesAgreementURL(for: LocalizationContext.currentAppLocale), event: "about.services_agreement"),
-            AboutLinkCellModel(localizedTitle: GDLocalizedString("settings.about.title.third_party"), segue: "ShowThirdPartyNoticesSegue")
+            AboutLinkCellModel(localizedTitle: GDLocalizedString("settings.about.title.copyright"), segue: "ShowThirdPartyNoticesSegue")
         ]
 
         if LocalizationContext.currentAppLocale == Locale.frFr {

diff --git a/apps/ios/GuideDogs/Code/Visual UI/Views/Settings.storyboard b/apps/ios/GuideDogs/Code/Visual UI/Views/Settings.storyboard
@@ -896,7 +896,7 @@
                     <navigationItem key="navigationItem" title="Third Party Notices" id="rpD-K2-j5x">
                         <barButtonItem key="backBarButtonItem" title="Back" id="w2t-7L-djt"/>
                         <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="string" keyPath="localization" value="settings.about.title.third_party"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="localization" value="settings.about.title.copyright"/>
                         </userDefinedRuntimeAttributes>
                     </navigationItem>
                     <connections>