Merge branch 'main' of https://github.com/soundscape-community/sounds…

…cape into connor-commits
soundscape-community · Sep 15, 2024 · 39eea13 · 39eea13
2 parents 91ba6df + 83de694
commit 39eea13
Show file tree

Hide file tree

Showing 81 changed files with 1,191 additions and 1,254 deletions.
diff --git a/.github/workflows/ios-tests.yml b/.github/workflows/ios-tests.yml
@@ -13,10 +13,19 @@ on:
             - 'apps/ios/**'
 jobs:
     unit-tests:
-        runs-on: macos-latest
+        runs-on: macos-14
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
+            - name: setup
+              run: |
+                sudo xcode-select -s /Applications/Xcode_15.3.app/Contents/Developer
+                gem install xcpretty
             - name: Build
-              run: xcodebuild build-for-testing -workspace apps/ios/GuideDogs.xcworkspace -scheme Soundscape -destination 'platform=iOS Simulator,name=iPhone 13'
+              run: xcodebuild build-for-testing -workspace apps/ios/GuideDogs.xcworkspace -scheme Soundscape -destination 'platform=iOS Simulator,name=iPhone 15' CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO |tee xcodebuild.log | xcpretty
+            - name: uploadlog
+              uses: actions/upload-artifact@v4
+              with:
+                name: xcodebuild-log
+                path: xcodebuild.log
             - name: Test
-              run: xcodebuild test-without-building -workspace apps/ios/GuideDogs.xcworkspace -scheme Soundscape -destination 'platform=iOS Simulator,name=iPhone 13'
+              run: xcodebuild test-without-building -workspace apps/ios/GuideDogs.xcworkspace -scheme Soundscape -destination 'platform=iOS Simulator,name=iPhone 15'
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@
 *.xcuserstate
 xcuserdata/
 .build
+Package.resolved
 
 ## Generic Files To Ignore
 *~

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
diff --git a/apps/ios/GuideDogs.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/apps/ios/GuideDogs.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/apps/ios/GuideDogs.xcworkspace/xcshareddata/swiftpm/Package.resolved b/apps/ios/GuideDogs.xcworkspace/xcshareddata/swiftpm/Package.resolved
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/da-DK.lproj/InfoPlist.strings b/apps/ios/GuideDogs/Assets/Localization/da-DK.lproj/InfoPlist.strings
diff --git a/apps/ios/GuideDogs/Assets/Localization/da-DK.lproj/Localizable.strings b/apps/ios/GuideDogs/Assets/Localization/da-DK.lproj/Localizable.strings
diff --git a/apps/ios/GuideDogs/Assets/Localization/de-DE.lproj/InfoPlist.strings b/apps/ios/GuideDogs/Assets/Localization/de-DE.lproj/InfoPlist.strings
diff --git a/apps/ios/GuideDogs/Assets/Localization/de-DE.lproj/Localizable.strings b/apps/ios/GuideDogs/Assets/Localization/de-DE.lproj/Localizable.strings
diff --git a/apps/ios/GuideDogs/Assets/Localization/el-GR.lproj/InfoPlist.strings b/apps/ios/GuideDogs/Assets/Localization/el-GR.lproj/InfoPlist.strings
diff --git a/apps/ios/GuideDogs/Assets/Localization/el-GR.lproj/Localizable.strings b/apps/ios/GuideDogs/Assets/Localization/el-GR.lproj/Localizable.strings
diff --git a/apps/ios/GuideDogs/Assets/Localization/en-GB.lproj/InfoPlist.strings b/apps/ios/GuideDogs/Assets/Localization/en-GB.lproj/InfoPlist.strings
diff --git a/apps/ios/GuideDogs/Assets/Localization/en-GB.lproj/Localizable.strings b/apps/ios/GuideDogs/Assets/Localization/en-GB.lproj/Localizable.strings