Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild

# Conflicts:
#	Session.xcodeproj/project.pbxproj

README.md

@@ -6,7 +6,7 @@
 
 Session integrates directly with [Oxen Service Nodes](https://docs.oxen.io/about-the-oxen-blockchain/oxen-service-nodes), which are a set of distributed, decentralized and Sybil resistant nodes. Service Nodes act as servers which store messages, and a set of nodes which allow for onion routing functionality obfuscating users' IP addresses. For a full understanding of how Session works, read the [Session Whitepaper](https://getsession.org/whitepaper).
 
-<img src="https://i.imgur.com/SocRFTh.jpg" width="320" />
+<img src="https://i.imgur.com/Ioub5bx.png" width="320" />
 
 ## Want to contribute? Found a bug or have a feature request?
 

Scripts/LintLocalizableStrings.swift

@@ -106,8 +106,19 @@ enum ScriptAction: String {
                 guard
                     let builtProductsPath: String = ProcessInfo.processInfo.environment["BUILT_PRODUCTS_DIR"],
                     let productName: String = ProcessInfo.processInfo.environment["FULL_PRODUCT_NAME"],
+                    let productPathInfo = try? URL(fileURLWithPath: "\(builtProductsPath)/\(productName)")
+                        .resourceValues(forKeys: [.isSymbolicLinkKey, .isAliasFileKey]),
+                    let finalProductUrl: URL = try? { () -> URL in
+                        let possibleAliasUrl: URL = URL(fileURLWithPath: "\(builtProductsPath)/\(productName)")
+                        
+                        guard productPathInfo.isSymbolicLink == true || productPathInfo.isAliasFile == true else {
+                            return possibleAliasUrl
+                        }
+                        
+                        return try URL(resolvingAliasFileAt: possibleAliasUrl, options: URL.BookmarkResolutionOptions())
+                    }(),
                     let enumerator: FileManager.DirectoryEnumerator = FileManager.default.enumerator(
-                        at: URL(fileURLWithPath: "\(builtProductsPath)/\(productName)"),
+                        at: finalProductUrl,
                         includingPropertiesForKeys: [.isDirectoryKey],
                         options: [.skipsHiddenFiles]
                     ),

Session.xcodeproj/project.pbxproj

@@ -6418,6 +6418,7 @@
 				FD245C56285065EA00B966DD /* SNProto.swift in Sources */,
 				FD09798B27FD1CFE00936362 /* Capability.swift in Sources */,
 				C3BBE0C72554F1570050F1E3 /* FixedWidthInteger+BigEndian.swift in Sources */,
+				FD1D732A2A85AA2000E3F410 /* Setting+Utilities.swift in Sources */,
 				FD09798127FCFEE800936362 /* SessionThread.swift in Sources */,
 				FD09C5EA282A1BB2000CE219 /* ThreadTypingIndicator.swift in Sources */,
 				FDB5DADA2A95D839002C8721 /* GroupUpdateInfoChangeMessage.swift in Sources */,