Infrastructure updates

.github/workflows/deploying.yml

@@ -8,30 +8,23 @@ on:
 
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
         channel: ['beta', 'release']
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.7'
+        ruby-version: '3.3'
         bundler-cache: true
+    - name: Setup Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.23.x'
     - name: Installing packages
       run: |
-        brew update
-        brew install carthage swiftformat
-        brew install go || brew link --overwrite go
-        brew install swiftlint || brew link --overwrite swiftlint
         gem install bundler
-    - uses: actions/cache@v3
-      id: carthage-cache
-      with:
-        path: Carthage
-        key: ${{ runner.os }}-carthage-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Cartfile.resolved') }}
-        restore-keys: |
-          ${{ runner.os }}-carthage-${{ secrets.CACHE_VERSION }}-
     - uses: actions/cache@v3
       id: gopenpgp-cache
       with:
@@ -43,10 +36,6 @@ jobs:
       run: |
         bundle config path vendor/bundle
         bundle install --jobs 4 --retry 3
-    - name: Carthage
-      if: ${{ steps.carthage-cache.outputs.cache-hit == false }}
-      run: |
-        carthage bootstrap --no-use-binaries --cache-builds --use-xcframeworks
     - name: GopenPGP
       if: ${{ steps.gopenpgp-cache.outputs.cache-hit == false }}
       run: |

.github/workflows/testing.yml

@@ -4,27 +4,20 @@ on: [push, pull_request]
 
 jobs:
   testing:
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.7'
+        ruby-version: '3.3'
         bundler-cache: true
+    - name: Setup Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.23.x'
     - name: Installing packages
       run: |
-        brew update
-        brew install carthage swiftformat
-        brew install go || brew link --overwrite go
-        brew install swiftlint || brew link --overwrite swiftlint
         gem install bundler
-    - uses: actions/cache@v3
-      id: carthage-cache
-      with:
-        path: Carthage
-        key: ${{ runner.os }}-carthage-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Cartfile.resolved') }}
-        restore-keys: |
-          ${{ runner.os }}-carthage-${{ secrets.CACHE_VERSION }}-
     - uses: actions/cache@v3
       id: gopenpgp-cache
       with:
@@ -36,10 +29,6 @@ jobs:
       run: |
         bundle config path vendor/bundle
         bundle install --jobs 4 --retry 3
-    - name: Carthage
-      if: ${{ steps.carthage-cache.outputs.cache-hit == false }}
-      run: |
-        carthage bootstrap --no-use-binaries --cache-builds --use-xcframeworks
     - name: GopenPGP
       if: ${{ steps.gopenpgp-cache.outputs.cache-hit == false }}
       run: ./scripts/gopenpgp_build.sh

.gitignore

@@ -46,12 +46,6 @@ playground.xcworkspace
 Pods/
 Podfile.lock
 
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-Carthage/Checkouts
-Carthage/Build
-
 # Go Mobile Build results and dependency sources
 go/
 

.swiftformat

@@ -3,7 +3,6 @@
 ## Excluded folders
 
 --exclude       \
-    Carthage,   \
     go,         \
     Pods,       \
     vendor
@@ -19,6 +18,7 @@
     blankLinesAroundMark,           \
     blankLinesAtEndOfScope,         \
     blankLinesAtStartOfScope,       \
+    blankLinesBetweenChainedFunctions,  \
 #    blankLinesBetweenImports,       \
     blankLinesBetweenScopes,        \
     blockComments,                  \
@@ -32,6 +32,7 @@
     extensionAccessControl,         \
     fileHeader,                     \
 #    genericExtensions,              \
+    headerFileName,                 \
     hoistPatternLet,                \
     indent,                         \
     initCoderUnavailable,           \
@@ -41,9 +42,11 @@
     linebreaks,                     \
     modifierOrder,                  \
 #    markTypes,                      \
+    noExplicitOwnership,            \
     numberFormatting,               \
 #    opaqueGenericParameters,        \
 #    organizeDeclarations,           \
+#    preferForLoop,                  \
     preferKeyPath,                  \
     redundantBackticks,             \
     redundantBreak,                 \
@@ -52,6 +55,7 @@
     redundantFileprivate,           \
     redundantGet,                   \
     redundantInit,                  \
+    redundantInternal,              \
     redundantLet,                   \
     redundantLetError,              \
     redundantNilInit,               \
@@ -62,11 +66,13 @@
     redundantRawValues,             \
     redundantReturn,                \
     redundantSelf,                  \
+    redundantStaticSelf,            \
     redundantType,                  \
     redundantVoidReturnType,        \
     semicolons,                     \
-    sortedImports,                  \
-    sortedSwitchCases,              \
+    sortImports,                    \
+    sortSwitchCases,                \
+    sortTypealiases,                \
     spaceAroundBraces,              \
     spaceAroundBrackets,            \
     spaceAroundComments,            \
@@ -93,6 +99,8 @@
     wrapAttributes,                 \
     wrapConditionalBodies,          \
 #    wrapEnumCases,                  \
+    wrapLoopBodies,                 \
+    wrapMultilineConditionalAssignment, \
 #    wrapMultilineStatementBraces,   \
     wrapSingleLineComments,         \
 #    wrapSwitchCases,                \

.swiftlint.yml

@@ -3,10 +3,10 @@
 ## Folders to exclude from linting
 
 excluded:
-  - Carthage
   - go
   - Pods
   - vendor
+  - xcode
 
 ## Active rules
 
@@ -15,8 +15,8 @@ opt_in_rules:
 
 disabled_rules:
   - anonymous_argument_in_multiline_closure
-  - anyobject_protocol # Deprecated.
   - balanced_xctest_lifecycle
+  - contrasted_opening_brace
   - discouraged_none_name
   - discouraged_object_literal
   - discouraged_optional_collection # Too many false positives in implementations of system protocols.
@@ -40,10 +40,12 @@ disabled_rules:
   - legacy_objc_type
   - line_length
   - missing_docs
+  - no_empty_block # To be fixed later.
   - no_extension_access_modifier
   - no_grouping_extension
   - no_magic_numbers # Causes a lot of violations in tests.
   - number_separator # Contradicts with SwiftFormat rule 'decimalgrouping'. There are not many numbers anyway in the source code.
+  - one_declaration_per_file
   - prefer_nimble
   - prefixed_toplevel_constant # Violations are mostly in test code.
   - private_outlet
@@ -66,6 +68,8 @@ attributes:
 closure_body_length:
   warning: 40
   error: 60
+explicit_init:
+  include_bare_init: true
 identifier_name:
   excluded: ["id", "to", "Defaults"]
   allowed_symbols: ["_"]
@@ -80,4 +84,3 @@ trailing_comma:
 xct_specific_matcher:
   matchers: 
     - two-argument-asserts
-