fix: package conflicts

Backbase · Jan 15, 2025 · 3a95bbc · 3a95bbc
1 parent e7ce1dd
commit 3a95bbc
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -15,8 +15,12 @@ GEM
     concurrent-ruby (1.2.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    mini_portile2 (2.8.8)
     minitest (5.17.0)
     nanaimo (0.3.0)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.13.8-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.8-x86_64-darwin)
@@ -43,6 +47,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
+  ruby
   x86_64-darwin-21
   x86_64-linux
 

diff --git a/Package.swift b/Package.swift
@@ -17,7 +17,7 @@ let package = Package(
         ),
         .package(
             url: "https://github.com/jpsim/Yams.git",
-            from: "2.0.0"
+            from: "5.0.0"
         ),
         .package(
             name: "XcodeProj",
@@ -26,7 +26,7 @@ let package = Package(
         ),
         .package(
             url: "https://github.com/apple/swift-argument-parser.git",
-            from: "0.1.0"
+            from: "1.0.0"
         ),
         .package(
             url: "https://github.com/stencilproject/Stencil.git",
@@ -38,7 +38,9 @@ let package = Package(
             from: "3.5.0"
         ),
         .package(
-            url: "https://github.com/SimplyDanny/SwiftLintPlugins")
+            url: "https://github.com/realm/SwiftLint",
+            from: "0.58.0"
+        )
     ],
     targets: [
         .target(
@@ -48,8 +50,7 @@ let package = Package(
                 "Yams",
                 "XcodeProj",
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                "Stencil",
-                "SwiftLintPlugins"
+                "Stencil"
             ]
         ),
         .target(

diff --git a/Sources/VariantsCore/Extensions/KeyedDecodingContainer+EnvVar.swift b/Sources/VariantsCore/Extensions/KeyedDecodingContainer+EnvVar.swift
@@ -28,8 +28,8 @@ public extension KeyedDecodingContainer {
 }
 
 fileprivate extension String {
-
     var asEnvVariable: String? {
+        // swiftlint:disable:next implicit_getter
         get throws {
             let regexPattern = #"^\$\{\{ envVars.(?<name>.*) \}\}"#
 

diff --git a/Tests/VariantsCoreTests/YamlParserTests.swift b/Tests/VariantsCoreTests/YamlParserTests.swift
@@ -6,6 +6,7 @@
 //
 
 // swiftlint:disable file_length
+// swiftlint:disable type_body_length
 
 import XCTest
 @testable import VariantsCore
@@ -292,4 +293,5 @@ class YamlParserTests: XCTestCase {
          testStoreDestination_iOS)
     ]
 }
+
 // swiftlint:enable file_length
diff --git a/Tests/VariantsCoreTests/iOSVariantTests.swift b/Tests/VariantsCoreTests/iOSVariantTests.swift
@@ -6,6 +6,7 @@
 //
 
 // swiftlint:disable type_body_length
+// swiftlint:disable function_body_length
 // swiftlint:disable file_length
 // swiftlint:disable line_length
 // swiftlint:disable type_name
@@ -469,5 +470,6 @@ class iOSVariantTests: XCTestCase {
 }
 
 // swiftlint:enable type_body_length
+// swiftlint:enable function_body_length
 // swiftlint:enable line_length
 // swiftlint:enable type_name
diff --git a/Variants.xcodeproj/project.pbxproj b/Variants.xcodeproj/project.pbxproj
@@ -712,7 +712,6 @@
 				8E1BA105254C3FD000DD0204 /* XCRemoteSwiftPackageReference "xcodeproj" */,
 				8E1BA10E254C3FFF00DD0204 /* XCRemoteSwiftPackageReference "swift-argument-parser" */,
 				8E8A483325514BE00056F79F /* XCRemoteSwiftPackageReference "Stencil" */,
-				2D70A7512D08525300DF5272 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */,
 			);
 			productRefGroup = OBJ_274 /* Products */;
 			projectDirPath = "";
@@ -1523,20 +1522,12 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		2D70A7512D08525300DF5272 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/SimplyDanny/SwiftLintPlugins";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.57.1;
-			};
-		};
 		8E1BA0F3254C3F3E00DD0204 /* XCRemoteSwiftPackageReference "PathKit" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/kylef/PathKit.git";
 			requirement = {
-				kind = exactVersion;
-				version = 1.0.1;
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.0.1;
 			};
 		};
 		8E1BA0FC254C3F9700DD0204 /* XCRemoteSwiftPackageReference "Yams" */ = {
@@ -1551,16 +1542,16 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/tuist/xcodeproj.git";
 			requirement = {
-				kind = exactVersion;
-				version = 8.3.1;
+				kind = upToNextMajorVersion;
+				minimumVersion = 8.3.1;
 			};
 		};
 		8E1BA10E254C3FFF00DD0204 /* XCRemoteSwiftPackageReference "swift-argument-parser" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/apple/swift-argument-parser.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 0.3.1;
+				minimumVersion = 1.0.0;
 			};
 		};
 		8E8A483325514BE00056F79F /* XCRemoteSwiftPackageReference "Stencil" */ = {