From c48b1c75c391f03c8526c0b3d284225445429516 Mon Sep 17 00:00:00 2001
From: Ahmet Gunay <ahmet.gunay@careem.com>
Date: Mon, 23 Sep 2024 12:14:33 +0400
Subject: [PATCH 1/2] Uses Bundle utility

---
 Sources/UberCore/Colors.swift             | 4 ++--
 Sources/UberRides/RideRequestButton.swift | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sources/UberCore/Colors.swift b/Sources/UberCore/Colors.swift
index d07882b..2b1c526 100644
--- a/Sources/UberCore/Colors.swift
+++ b/Sources/UberCore/Colors.swift
@@ -35,13 +35,13 @@ public extension UIColor {
     
     static let uberButtonHighlightedDarkBackground: UIColor = UIColor(
         named: "UberButtonHighlightedDarkBackground",
-        in: .module,
+        in: .resource(for: UberButton.self),
         compatibleWith: nil
     ) ?? UIColor.darkText
     
     static let uberButtonHighlightedLightBackground: UIColor = UIColor(
         named: "UberButtonHighlightedLightBackground",
-        in: .module,
+        in: .resource(for: UberButton.self),
         compatibleWith: nil
     ) ?? UIColor.darkText
     
diff --git a/Sources/UberRides/RideRequestButton.swift b/Sources/UberRides/RideRequestButton.swift
index 97728b2..cc6c945 100644
--- a/Sources/UberRides/RideRequestButton.swift
+++ b/Sources/UberRides/RideRequestButton.swift
@@ -302,7 +302,7 @@ public class RideRequestButton: UberButton {
     }
     
     private func image(name: String) -> UIImage? {
-        UIImage(named: name, in: Bundle.module, compatibleWith: nil)
+        UIImage(named: name, in: .resource(for: RideRequestButton.self), compatibleWith: nil)
     }
 }
 

From 374fa0c1ee849387e8a36d218136fc4ed4196065 Mon Sep 17 00:00:00 2001
From: Mohammad Fathi <mohssen@uber.com>
Date: Mon, 23 Sep 2024 09:53:05 -0700
Subject: [PATCH 2/2] Update workflow to run on main, develop branches

---
 .github/workflows/xcodebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/xcodebuild.yml b/.github/workflows/xcodebuild.yml
index 5aea419..21d0296 100644
--- a/.github/workflows/xcodebuild.yml
+++ b/.github/workflows/xcodebuild.yml
@@ -1,6 +1,6 @@
 on:
   pull_request:
-    branches: [ master, 2.x ]
+    branches: [ main, develop ]
 
 jobs:
   build: