Merge branch 'master' into feature/boost_notifications

finn-no · Oct 16, 2024 · d1bba2a · d1bba2a
2 parents 7bd1165 + dc494b5
commit d1bba2a
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/Demo/SnapshotTests/Info.plist b/Demo/SnapshotTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>148.3.0</string>
+	<string>148.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSPrincipalClass</key>

diff --git a/Demo/Sources/Info.plist b/Demo/Sources/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>148.3.0</string>
+	<string>148.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

diff --git a/FinniversKit.podspec b/FinniversKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FinniversKit'
-  s.version      = '148.3.0'
+  s.version      = '148.4.0'
   s.summary      = "FINN's iOS Components"
   s.author       = 'FINN.no'
   s.homepage     = 'https://schibsted.frontify.com/d/oCLrx0cypXJM/design-system'

diff --git a/FinniversKit.xcworkspace/xcshareddata/swiftpm/Package.resolved b/FinniversKit.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -33,8 +33,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/warp-ds/warp-ios.git",
       "state" : {
-        "revision" : "debbf05cf26bc89f7d0f1755f4f817a398a06865",
-        "version" : "0.0.27"
+        "revision" : "037ef2a2ee8be35f37a1d245fd72b6cfc468e177",
+        "version" : "0.0.32"
       }
     }
   ],

diff --git a/FinniversKit/FinniversKit.xcodeproj/project.pbxproj b/FinniversKit/FinniversKit.xcodeproj/project.pbxproj
@@ -3878,7 +3878,7 @@
 			requirement = {
 				kind = versionRange;
 				maximumVersion = 999.0.0;
-				minimumVersion = 0.0.27;
+				minimumVersion = 0.0.32;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/FinniversKit/Sources/Components/Ribbon/Ribbon+Style.swift b/FinniversKit/Sources/Components/Ribbon/Ribbon+Style.swift
@@ -20,7 +20,7 @@ public extension RibbonView {
             case .success: return Warp.UIColor.badgePositiveBackground
             case .warning: return Warp.UIColor.badgeWarningBackground
             case .error: return Warp.UIColor.badgeNegativeBackground
-            case .disabled: return Warp.UIColor.badgeDisabledBackground
+            case .disabled: return Warp.UIToken.backgroundDisabled
             case .sponsored: return Warp.UIColor.badgeSponsoredBackground
             }
         }

diff --git a/FinniversKit/Sources/Info.plist b/FinniversKit/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>148.3.0</string>
+	<string>148.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/FinniversKit/UnitTests/Info.plist b/FinniversKit/UnitTests/Info.plist
@@ -15,6 +15,6 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>148.3.0</string>
+	<string>148.4.0</string>
 </dict>
 </plist>
diff --git a/Package.swift b/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/warp-ds/warp-ios.git", "0.0.27"..."999.0.0")
+        .package(url: "https://github.com/warp-ds/warp-ios.git", "0.0.32"..."999.0.0")
     ],
     targets: [
         .target(