Merge pull request #385 from session-foundation/dev

Release 2.9.0

Author: mpretty-cyro

.drone.jsonnet

@@ -1,5 +1,5 @@
 // This build configuration requires the following to be installed:
-// Git, Xcode, XCode Command-line Tools, xcbeautify, xcresultparser, pip
+// Git, Xcode, XCode Command-line Tools, xcbeautify, xcresultparser
 
 // Log a bunch of version information to make it easier for debugging
 local version_info = {
@@ -9,8 +9,7 @@ local version_info = {
     'git --version',
     'xcodebuild -version',
     'xcbeautify --version',
-    'xcresultparser --version',
-    'pip --version',
+    'xcresultparser --version'
   ],
 };
 
@@ -23,11 +22,17 @@ local clone_submodules = {
 // cmake options for static deps mirror
 local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https://oxen.rocks/deps ' else '');
 
-local boot_simulator(device_type) = {
+local boot_simulator(device_type="") = {
   name: 'Boot Test Simulator',
   commands: [
     'devname="Test-iPhone-${DRONE_COMMIT:0:9}-${DRONE_BUILD_EVENT}"',
-    'xcrun simctl create "$devname" ' + device_type,
+    (if device_type != "" then
+       'xcrun simctl create "$devname" ' + device_type
+     else
+      'device_type=$(xcrun simctl list devicetypes -j | ' +
+        'jq -r \'.devicetypes | map(select(.productFamily=="iPhone")) | sort_by(.minRuntimeVersion) | .[-1].identifier\' | tail -n1); ' +
+        'xcrun simctl create "$devname" "$device_type"'
+    ),
     'sim_uuid=$(xcrun simctl list devices -je | jq -re \'[.devices[][] | select(.name == "\'$devname\'").udid][0]\')',
     'xcrun simctl boot $sim_uuid',
 
@@ -59,7 +64,7 @@ local sim_delete_cmd = 'if [ -f build/artifacts/sim_uuid ]; then rm -f /Users/$U
       version_info,
       clone_submodules,
 
-      boot_simulator('com.apple.CoreSimulator.SimDeviceType.iPhone-15'),
+      boot_simulator(),
       sim_keepalive,
       {
         name: 'Build and Run Tests',

LibSession-Util

@@ -282,8 +282,6 @@ extension EmojiGenerator {
         // Main enum: Create a string enum defining our enumNames equal to the baseEmoji string
         // e.g. case grinning = "😀"
         writeBlock(fileName: "Emoji.swift") { fileHandle in
-            fileHandle.writeLine("// swiftlint:disable all")
-            fileHandle.writeLine("// stringlint:disable")
             fileHandle.writeLine("")
             fileHandle.writeLine("/// A sorted representation of all available emoji")
             fileHandle.writeLine("enum Emoji: String, CaseIterable, Equatable {")
@@ -293,7 +291,6 @@ extension EmojiGenerator {
                 }
             }
             fileHandle.writeLine("}")
-            fileHandle.writeLine("// swiftlint:disable all")
         }
     }
 
@@ -340,8 +337,6 @@ extension EmojiGenerator {
         // if rawValue == "😀" { self.init(baseEmoji: .grinning, skinTones: nil) }
         // else if rawValue == "🦻🏻" { self.init(baseEmoji: .earWithHearingAid, skinTones: [.light])
         writeBlock(fileName: "EmojiWithSkinTones+String.swift") { fileHandle in
-            fileHandle.writeLine("// swiftlint:disable all")
-            fileHandle.writeLine("// stringlint:disable")
             fileHandle.writeLine("")
             fileHandle.writeLine("extension EmojiWithSkinTones {")
             fileHandle.indent {
@@ -409,7 +404,6 @@ extension EmojiGenerator {
                 }
             }
             fileHandle.writeLine("}")
-            fileHandle.writeLine("// swiftlint:disable all")
         }
     }
 
@@ -474,8 +468,6 @@ extension EmojiGenerator {
 
     static func writeSkinToneLookupFile(from emojiModel: EmojiModel) {
         writeBlock(fileName: "Emoji+SkinTones.swift") { fileHandle in
-            fileHandle.writeLine("// swiftlint:disable all")
-            fileHandle.writeLine("// stringlint:disable")
             fileHandle.writeLine("")
             fileHandle.writeLine("extension Emoji {")
             fileHandle.indent {
@@ -539,7 +531,6 @@ extension EmojiGenerator {
                 fileHandle.writeLine("}")
             }
             fileHandle.writeLine("}")
-            fileHandle.writeLine("// swiftlint:disable all")
         }
     }
 
@@ -556,8 +547,6 @@ extension EmojiGenerator {
         ]
 
         writeBlock(fileName: "Emoji+Category.swift") { fileHandle in
-            fileHandle.writeLine("// swiftlint:disable all")
-            fileHandle.writeLine("// stringlint:disable")
             fileHandle.writeLine("")
             fileHandle.writeLine("extension Emoji {")
             fileHandle.indent {
@@ -664,16 +653,13 @@ extension EmojiGenerator {
                 fileHandle.writeLine("}")
             }
             fileHandle.writeLine("}")
-            fileHandle.writeLine("// swiftlint:disable all")
         }
     }
 
     static func writeNameLookupFile(from emojiModel: EmojiModel) {
         // Name lookup: Create a computed property mapping an Emoji enum element to the raw Emoji name string
         // e.g. case .grinning: return "GRINNING FACE"
         writeBlock(fileName: "Emoji+Name.swift") { fileHandle in
-            fileHandle.writeLine("// swiftlint:disable all")
-            fileHandle.writeLine("// stringlint:disable")
             fileHandle.writeLine("")
             fileHandle.writeLine("extension Emoji {")
             fileHandle.indent {
@@ -688,7 +674,6 @@ extension EmojiGenerator {
                 fileHandle.writeLine("}")
             }
             fileHandle.writeLine("}")
-            fileHandle.writeLine("// swiftlint:disable all")
         }
     }
 }
@@ -753,6 +738,11 @@ extension EmojiGenerator {
 
         fileHandle.writeLine("")
         fileHandle.writeLine("// This file is generated by EmojiGenerator.swift, do not manually edit it.")
+        fileHandle.writeLine("//")
+        fileHandle.writeLine("// swiftlint:disable all")
+        fileHandle.writeLine("// stringlint:disable")
+        fileHandle.writeLine("")
+        fileHandle.writeLine("import Foundation")
         fileHandle.writeLine("")
 
         block(fileHandle)