Merge pull request #364 from player-ui/add-swiftlint-dep

iOS: Add swiftlint as ios test
player-ui · Jun 5, 2024 · 42d21b1 · 42d21b1
2 parents 8c7089e + a1bcda6
commit 42d21b1
Show file tree

Hide file tree

Showing 11 changed files with 972 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -134,7 +134,9 @@ jobs:
               $(bazel query "kind(ios_unit_test, //ios/...)") \
               $(bazel query "kind(ios_unit_test, //plugins/...)") \
               $(bazel query "kind(ios_ui_test, //ios/...)") \
-              $(bazel query "kind(ios_ui_test, //plugins/...)")
+              $(bazel query "kind(ios_ui_test, //plugins/...)") \
+              $(bazel query "attr(name, '.*SwiftLint', //ios/...)") \
+              $(bazel query "attr(name, '.*SwiftLint', //plugins/...)")
       - run:
           name: Tests
           command: |
@@ -148,7 +150,9 @@ jobs:
               $(bazel query "kind(ios_unit_test, //ios/...)") \
               $(bazel query "kind(ios_unit_test, //plugins/...)") \
               $(bazel query "kind(ios_ui_test, //ios/...)") \
-              $(bazel query "kind(ios_ui_test, //plugins/...)")
+              $(bazel query "kind(ios_ui_test, //plugins/...)") \
+              $(bazel query "attr(name, '.*SwiftLint', //ios/...)") \
+              $(bazel query "attr(name, '.*SwiftLint', //plugins/...)")
 
       - run:
           when: always

diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -17,3 +17,6 @@ identifier_name:
         - drop_down
         - radio_button
         - search_input
+included:
+    - ios
+    - plugins
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -248,3 +248,6 @@ gazelle(
     name = "update_build_files",
     gazelle = ":gazelle_bin",
 )
+
+#SwiftLint
+exports_files([".swiftlint.yml"])
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -31,6 +31,7 @@ bazel_dep(name = "rules_xcodeproj", version = "2.2.0")
 
 bazel_dep(name = "gazelle", version = "0.34.0", repo_name = "bazel_gazelle")
 bazel_dep(name = "rules_swift_package_manager", version = "0.22.0")
+bazel_dep(name = "swiftlint", version = "0.54.0", repo_name = "SwiftLint")
 
 ## This section is handled by rules_swift_package_manager
 swift_deps = use_extension(
@@ -48,7 +49,8 @@ swift_deps.from_file(
 use_repo(
     swift_deps,
     "swiftpkg_swift_hooks",
-    "swiftpkg_viewinspector"
+    "swiftpkg_viewinspector",
+    "swiftpkg_swiftlint"
 )
 ###### End iOS ######
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")

diff --git a/ios/demo/Sources/PluginsAndPlayerCollection.swift b/ios/demo/Sources/PluginsAndPlayerCollection.swift
@@ -78,7 +78,7 @@ public struct PluginsAndPlayerCollection: View {
 
             switch eventData {
             case .string(data: let string):
-                $beaconAndPubsubInfo.wrappedValue = $beaconAndPubsubInfo.wrappedValue + "Published: `\(eventName)` with message: `\(string)` \n"
+                $beaconAndPubsubInfo.wrappedValue += "Published: `\(eventName)` with message: `\(string)` \n"
             default: break
             }
         })])
@@ -87,7 +87,7 @@ public struct PluginsAndPlayerCollection: View {
             $alertPresented.wrappedValue = true
             let encoder = JSONEncoder()
             if let data = try? encoder.encode(beaconStruct), let jsonString = String(data: data, encoding: .utf8) {
-                $beaconAndPubsubInfo.wrappedValue = $beaconAndPubsubInfo.wrappedValue  + "Beacon: \(jsonString) \n"
+                $beaconAndPubsubInfo.wrappedValue += "Beacon: \(jsonString) \n"
             }
         }
 

diff --git a/plugins/pending-transaction/swiftui/Sources/SwiftUIPendingTransactionPlugin.swift b/plugins/pending-transaction/swiftui/Sources/SwiftUIPendingTransactionPlugin.swift
@@ -23,7 +23,8 @@ public class SwiftUIPendingTransactionPlugin<T>: NativePlugin where T: Identifia
     /**
      Constructs the SwiftUIPendingTransactionPlugin
      - parameters:
-        - keypath: Takes a keypath from the EnvironmentValues extension with generics of the TransactionContext<T> matching a user defined object, `\.transactionContext` which uses TransactionContext<PendingTransactionPhases> is the default.
+        - keypath: Takes a keypath from the EnvironmentValues extension with generics of the TransactionContext<T> matching a user defined object,
+                   `\.transactionContext` which uses TransactionContext<PendingTransactionPhases> is the default.
      */
     public init(keyPath: WritableKeyPath<EnvironmentValues, TransactionContext<T>>) {
         self.keyPath = keyPath

diff --git a/swift_deps.bzl b/swift_deps.bzl
@@ -9,6 +9,22 @@ def swift_dependencies():
         remote = "https://github.com/tadija/AEXML.git",
     )
 
+    # version: 0.2.0
+    swift_package(
+        name = "swiftpkg_collectionconcurrencykit",
+        commit = "b4f23e24b5a1bff301efc5e70871083ca029ff95",
+        dependencies_index = "@//:swift_deps_index.json",
+        remote = "https://github.com/JohnSundell/CollectionConcurrencyKit.git",
+    )
+
+    # version: 1.8.2
+    swift_package(
+        name = "swiftpkg_cryptoswift",
+        commit = "c9c3df6ab812de32bae61fc0cd1bf6d45170ebf0",
+        dependencies_index = "@//:swift_deps_index.json",
+        remote = "https://github.com/krzyzanowskim/CryptoSwift.git",
+    )
+
     # version: 8.9.1
     swift_package(
         name = "swiftpkg_eyes_xcui_swift_package",
@@ -49,6 +65,14 @@ def swift_dependencies():
         remote = "https://github.com/onevcat/Rainbow.git",
     )
 
+    # version: 0.34.1
+    swift_package(
+        name = "swiftpkg_sourcekitten",
+        commit = "b6dc09ee51dfb0c66e042d2328c017483a1a5d56",
+        dependencies_index = "@//:swift_deps_index.json",
+        remote = "https://github.com/jpsim/SourceKitten.git",
+    )
+
     # version: 0.10.1
     swift_package(
         name = "swiftpkg_spectre",
@@ -57,6 +81,14 @@ def swift_dependencies():
         remote = "https://github.com/kylef/Spectre.git",
     )
 
+    # version: 1.2.3
+    swift_package(
+        name = "swiftpkg_swift_argument_parser",
+        commit = "8f4d2753f0e4778c76d5f05ad16c74f707390531",
+        dependencies_index = "@//:swift_deps_index.json",
+        remote = "https://github.com/apple/swift-argument-parser.git",
+    )
+
     # version: 0.1.0
     swift_package(
         name = "swiftpkg_swift_hooks",
@@ -65,6 +97,14 @@ def swift_dependencies():
         remote = "https://github.com/intuit/swift-hooks.git",
     )
 
+    # version: 509.0.2
+    swift_package(
+        name = "swiftpkg_swift_syntax",
+        commit = "6ad4ea24b01559dde0773e3d091f1b9e36175036",
+        dependencies_index = "@//:swift_deps_index.json",
+        remote = "https://github.com/apple/swift-syntax.git",
+    )
+
     # version: 6.0.3
     swift_package(
         name = "swiftpkg_swiftcli",
@@ -73,6 +113,30 @@ def swift_dependencies():
         remote = "https://github.com/jakeheis/SwiftCLI.git",
     )
 
+    # version: 0.54.0
+    swift_package(
+        name = "swiftpkg_swiftlint",
+        commit = "f17a4f9dfb6a6afb0408426354e4180daaf49cee",
+        dependencies_index = "@//:swift_deps_index.json",
+        remote = "https://github.com/realm/SwiftLint.git",
+    )
+
+    # version: 0.9.0
+    swift_package(
+        name = "swiftpkg_swiftytexttable",
+        commit = "c6df6cf533d120716bff38f8ff9885e1ce2a4ac3",
+        dependencies_index = "@//:swift_deps_index.json",
+        remote = "https://github.com/scottrhoyt/SwiftyTextTable.git",
+    )
+
+    # version: 7.0.2
+    swift_package(
+        name = "swiftpkg_swxmlhash",
+        commit = "a853604c9e9a83ad9954c7e3d2a565273982471f",
+        dependencies_index = "@//:swift_deps_index.json",
+        remote = "https://github.com/drmohundro/SWXMLHash.git",
+    )
+
     # version: 2.0.1
     swift_package(
         name = "swiftpkg_version",
@@ -108,7 +172,7 @@ def swift_dependencies():
     # version: 5.0.6
     swift_package(
         name = "swiftpkg_yams",
-        commit = "0d9ee7ea8c4ebd4a489ad7a73d5c6cad55d6fed3",
+        commit = "9234124cff5e22e178988c18d8b95a8ae8007f76",
         dependencies_index = "@//:swift_deps_index.json",
         remote = "https://github.com/jpsim/Yams.git",
     )