chore: Update RSDKUtils version to 5.1.0 for cocoaPod and SPM (RMCCX-8311)

SoumenRautray · web-flow · commit 16fc44a76f05 · 2025-02-05T14:27:10.000+05:30
diff --git a/Package.resolved b/Package.resolved
@@ -5,35 +5,35 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mattgallagher/CwlCatchException.git",
       "state" : {
-        "revision" : "35f9e770f54ce62dd8526470f14c6e137cef3eea",
-        "version" : "2.1.1"
+        "revision" : "07b2ba21d361c223e25e3c1e924288742923f08c",
+        "version" : "2.2.1"
       }
     },
     {
       "identity" : "cwlpreconditiontesting",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git",
       "state" : {
-        "revision" : "c21f7bab5ca8eee0a9998bbd17ca1d0eb45d4688",
-        "version" : "2.1.0"
+        "revision" : "0139c665ebb45e6a9fbdb68aabfd7c39f3fe0071",
+        "version" : "2.2.2"
       }
     },
     {
       "identity" : "ios-sdkutils",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/rakutentech/ios-sdkutils.git",
       "state" : {
-        "revision" : "dedb314c2b8b5cfa2887fdbf7d0e18bf44c0cb26",
-        "version" : "4.2.0"
+        "revision" : "73792aaee286bbc0bede335513845deb2ffefbf7",
+        "version" : "5.1.0"
       }
     },
     {
       "identity" : "nimble",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Quick/Nimble.git",
       "state" : {
-        "revision" : "c93f16c25af5770f0d3e6af27c9634640946b068",
-        "version" : "9.2.1"
+        "revision" : "831000dd1939bc2096df572c5fd156f41d858bfa",
+        "version" : "12.1.0"
       }
     }
   ],
diff --git a/Package.swift b/Package.swift
@@ -15,7 +15,7 @@ let package = Package(
             targets: ["RInAppMessaging"])
     ],
     dependencies: [
-        .package(url: "https://github.com/rakutentech/ios-sdkutils.git", .upToNextMajor(from: "4.2.0"))
+        .package(url: "https://github.com/rakutentech/ios-sdkutils.git", .upToNextMajor(from: "5.1.0"))
     ],
     targets: [
         .target(
diff --git a/Podfile b/Podfile
@@ -1,5 +1,5 @@
 use_frameworks!
-platform :ios, '12.0'
+platform :ios, '14.0'
 
 secrets = ["RIAM_CONFIG_URL", "RIAM_APP_SUBSCRIPTION_KEY"]
 
@@ -8,12 +8,12 @@ project 'RInAppMessaging', 'UITests' => :debug
 target 'RInAppMessaging_Example' do
   pod 'RInAppMessaging', :path => '.'
   pod 'SwiftLint', '~> 0.50'
-  pod 'RSDKUtils', '~> 4.2.0', :testspecs => ['Nimble', 'TestHelpers']
+  pod 'RSDKUtils', '~> 5.1.0', :testspecs => ['Nimble', 'TestHelpers']
   pod 'Shock', '~> 6.1.2'
 
   abstract_target 'Tests-Common' do
     pod 'Quick', '~> 5.0'
-    pod 'Nimble'
+    pod 'Nimble','~> 12.1.0'
 
     target 'Tests'
 
diff --git a/Podfile.lock b/Podfile.lock
@@ -6,19 +6,19 @@ PODS:
   - CNIOLinux (2.40.0)
   - CNIOWindows (2.40.0)
   - GRMustache.swift (4.0.1)
-  - Nimble (10.0.0)
+  - Nimble (12.1.0)
   - Quick (5.0.1)
   - RInAppMessaging (9.0.0):
-    - RSDKUtils (~> 4.0)
-  - RSDKUtils (4.2.0):
-    - RSDKUtils/Main (= 4.2.0)
-  - RSDKUtils/Main (4.2.0):
+    - RSDKUtils (~> 5.1.0)
+  - RSDKUtils (5.1.0):
+    - RSDKUtils/Main (= 5.1.0)
+  - RSDKUtils/Main (5.1.0):
     - RSDKUtils/RLogger
-  - RSDKUtils/Nimble (4.2.0):
+  - RSDKUtils/Nimble (5.1.0):
     - Nimble
     - RSDKUtils/Main
-  - RSDKUtils/RLogger (4.2.0)
-  - RSDKUtils/TestHelpers (4.2.0):
+  - RSDKUtils/RLogger (5.1.0)
+  - RSDKUtils/TestHelpers (5.1.0):
     - RSDKUtils/Main
   - Shock (6.1.3):
     - GRMustache.swift (~> 4.0.1)
@@ -68,12 +68,12 @@ PODS:
     - SwiftNIOCore (= 2.40.0)
 
 DEPENDENCIES:
-  - Nimble
+  - Nimble (~> 12.1.0)
   - Quick (~> 5.0)
   - RInAppMessaging (from `.`)
-  - RSDKUtils (~> 4.2.0)
-  - RSDKUtils/Nimble (~> 4.2.0)
-  - RSDKUtils/TestHelpers (~> 4.2.0)
+  - RSDKUtils (~> 5.1.0)
+  - RSDKUtils/Nimble (~> 5.1.0)
+  - RSDKUtils/TestHelpers (~> 5.1.0)
   - Shock (~> 6.1.2)
   - SwiftLint (~> 0.50)
 
@@ -110,10 +110,10 @@ SPEC CHECKSUMS:
   CNIOLinux: 62e3505f50de558c393dc2f273dde71dcce518da
   CNIOWindows: 3047f2d8165848a3936a0a755fee27c6b5ee479b
   GRMustache.swift: a6436504284b22b4b05daf5f46f77bd3fe00a9a2
-  Nimble: 5316ef81a170ce87baf72dd961f22f89a602ff84
+  Nimble: 7badc051fbff5e14e3798e2392b9389de67f75ea
   Quick: 749aa754fd1e7d984f2000fe051e18a3a9809179
-  RInAppMessaging: e67e3d3db5792201041fcba320f981c40ed763ec
-  RSDKUtils: 4ef7a283108a78e879f335c788d78bbd5699f907
+  RInAppMessaging: 57adabd73a205a69e3ffd19daee4fe55fcea027c
+  RSDKUtils: 6ae357662b44e390f026edd3431f57ad23fcaf97
   Shock: 34def30d5e729f6c1eea2a5b5c2d024b875af86c
   SwiftLint: 1cc5cd61ba9bacb2194e340aeb47a2a37fda00b3
   SwiftNIO: 829958aab300642625091f82fc2f49cb7cf4ef24
@@ -123,6 +123,6 @@ SPEC CHECKSUMS:
   SwiftNIOHTTP1: ef56706550a1dc135ea69d65215b9941e643c23b
   SwiftNIOPosix: b49af4bdbecaadfadd5c93dfe28594d6722b75e4
 
-PODFILE CHECKSUM: d93126c6ae225ff9f7bcfc59f0e4ced878216e9b
+PODFILE CHECKSUM: 8c42d97c4f173f1dd3f1d8bf6600f2261b1abddc
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/RInAppMessaging.podspec b/RInAppMessaging.podspec
@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '14.0'
   s.swift_versions = ['5.7.1']
   s.resources = ['Sources/RInAppMessaging/Resources/PrivacyInfo.xcprivacy']
-  s.dependency 'RSDKUtils', '~> 4.0'
+  s.dependency 'RSDKUtils', '~> 5.1.0'
   s.source_files = 'Sources/RInAppMessaging/**/*.swift'
   s.resource_bundles = { 'RInAppMessagingResources' => ['Sources/RInAppMessaging/Resources/*'] }
 end
diff --git a/SampleSPM/SampleSPM.xcodeproj/project.pbxproj b/SampleSPM/SampleSPM.xcodeproj/project.pbxproj
@@ -1530,15 +1530,15 @@
 			repositoryURL = "https://github.com/Quick/Nimble.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 9.0.0;
+				minimumVersion = 12.1.0;
 			};
 		};
 		45FA8FF3272C2C09005166FD /* XCRemoteSwiftPackageReference "ios-sdkutils" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/rakutentech/ios-sdkutils.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 4.0.0;
+				minimumVersion = 5.1.0;
 			};
 		};
 		45FA9002272C2C5C005166FD /* XCRemoteSwiftPackageReference "Shock" */ = {
diff --git a/Sources/RInAppMessaging/Views/CarouselCell.swift b/Sources/RInAppMessaging/Views/CarouselCell.swift
@@ -50,7 +50,7 @@ final class CarouselCell: UICollectionViewCell {
 
     func configure(with image: UIImage?, altText: String?, cellBgColor: UIColor) {
         let hasImage = (image != nil)
-        backgroundColor = hasImage ? cellBgColor : .clear
+        backgroundColor = hasImage ? cellBgColor : .white
         imageView.isHidden = !hasImage
         imageView.image = image
         textLabel.isHidden = hasImage
diff --git a/Sources/RInAppMessaging/Views/CarouselView.swift b/Sources/RInAppMessaging/Views/CarouselView.swift
@@ -83,7 +83,7 @@ extension CarouselView: UICollectionViewDataSource, UICollectionViewDelegateFlow
             return UICollectionViewCell()
         }
 
-        collectionView.backgroundColor = (carouselData[indexPath.item].image != nil) ? carouselBgColor : .clear
+        collectionView.backgroundColor = carouselBgColor
         cell.configure(with: carouselData[indexPath.item].image,
                        altText: carouselData[indexPath.item].altText,
                        cellBgColor: carouselBgColor)
diff --git a/Tests/Tests/CarouselCellSpec.swift b/Tests/Tests/CarouselCellSpec.swift
@@ -58,7 +58,7 @@ class CarouselCellSpec: QuickSpec {
                     expect(cell.imageView.image).to(beNil())
                     expect(cell.textLabel.isHidden).to(beFalse())
                     expect(cell.textLabel.text).to(equal("Alt Text"))
-                    expect(cell.backgroundColor).to(equal(.clear))
+                    expect(cell.backgroundColor).to(equal(.white))
                 }
             }
 
@@ -68,7 +68,7 @@ class CarouselCellSpec: QuickSpec {
 
                     expect(cell.textLabel.text).to(equal(""))
                     expect(cell.textLabel.isHidden).to(beFalse())
-                    expect(cell.backgroundColor).to(equal(.clear))
+                    expect(cell.backgroundColor).to(equal(.white))
                 }
             }
 
@@ -78,7 +78,7 @@ class CarouselCellSpec: QuickSpec {
 
                     expect(cell.textLabel.text).to(equal("carousel_image_load_error".localized))
                     expect(cell.textLabel.isHidden).to(beFalse())
-                    expect(cell.backgroundColor).to(equal(.clear))
+                    expect(cell.backgroundColor).to(equal(.white))
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -5,35 +5,35 @@`
`5`	`5`	`"kind" : "remoteSourceControl",`
`6`	`6`	`"location" : "https://github.com/mattgallagher/CwlCatchException.git",`
`7`	`7`	`"state" : {`
`8`		`- "revision" : "35f9e770f54ce62dd8526470f14c6e137cef3eea",`
`9`		`- "version" : "2.1.1"`
	`8`	`+ "revision" : "07b2ba21d361c223e25e3c1e924288742923f08c",`
	`9`	`+ "version" : "2.2.1"`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`{`
`13`	`13`	`"identity" : "cwlpreconditiontesting",`
`14`	`14`	`"kind" : "remoteSourceControl",`
`15`	`15`	`"location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git",`
`16`	`16`	`"state" : {`
`17`		`- "revision" : "c21f7bab5ca8eee0a9998bbd17ca1d0eb45d4688",`
`18`		`- "version" : "2.1.0"`
	`17`	`+ "revision" : "0139c665ebb45e6a9fbdb68aabfd7c39f3fe0071",`
	`18`	`+ "version" : "2.2.2"`
`19`	`19`	`}`
`20`	`20`	`},`
`21`	`21`	`{`
`22`	`22`	`"identity" : "ios-sdkutils",`
`23`	`23`	`"kind" : "remoteSourceControl",`
`24`	`24`	`"location" : "https://github.com/rakutentech/ios-sdkutils.git",`
`25`	`25`	`"state" : {`
`26`		`- "revision" : "dedb314c2b8b5cfa2887fdbf7d0e18bf44c0cb26",`
`27`		`- "version" : "4.2.0"`
	`26`	`+ "revision" : "73792aaee286bbc0bede335513845deb2ffefbf7",`
	`27`	`+ "version" : "5.1.0"`
`28`	`28`	`}`
`29`	`29`	`},`
`30`	`30`	`{`
`31`	`31`	`"identity" : "nimble",`
`32`	`32`	`"kind" : "remoteSourceControl",`
`33`	`33`	`"location" : "https://github.com/Quick/Nimble.git",`
`34`	`34`	`"state" : {`
`35`		`- "revision" : "c93f16c25af5770f0d3e6af27c9634640946b068",`
`36`		`- "version" : "9.2.1"`
	`35`	`+ "revision" : "831000dd1939bc2096df572c5fd156f41d858bfa",`
	`36`	`+ "version" : "12.1.0"`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`],`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ extension CarouselView: UICollectionViewDataSource, UICollectionViewDelegateFlow`
`83`	`83`	`return UICollectionViewCell()`
`84`	`84`	`}`
`85`	`85`
`86`		`- collectionView.backgroundColor = (carouselData[indexPath.item].image != nil) ? carouselBgColor : .clear`
	`86`	`+ collectionView.backgroundColor = carouselBgColor`
`87`	`87`	`cell.configure(with: carouselData[indexPath.item].image,`
`88`	`88`	`altText: carouselData[indexPath.item].altText,`
`89`	`89`	`cellBgColor: carouselBgColor)`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class CarouselCellSpec: QuickSpec {`
`58`	`58`	`expect(cell.imageView.image).to(beNil())`
`59`	`59`	`expect(cell.textLabel.isHidden).to(beFalse())`
`60`	`60`	`expect(cell.textLabel.text).to(equal("Alt Text"))`
`61`		`- expect(cell.backgroundColor).to(equal(.clear))`
	`61`	`+ expect(cell.backgroundColor).to(equal(.white))`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`@@ -68,7 +68,7 @@ class CarouselCellSpec: QuickSpec {`
`68`	`68`
`69`	`69`	`expect(cell.textLabel.text).to(equal(""))`
`70`	`70`	`expect(cell.textLabel.isHidden).to(beFalse())`
`71`		`- expect(cell.backgroundColor).to(equal(.clear))`
	`71`	`+ expect(cell.backgroundColor).to(equal(.white))`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`@@ -78,7 +78,7 @@ class CarouselCellSpec: QuickSpec {`
`78`	`78`
`79`	`79`	`expect(cell.textLabel.text).to(equal("carousel_image_load_error".localized))`
`80`	`80`	`expect(cell.textLabel.isHidden).to(beFalse())`
`81`		`- expect(cell.backgroundColor).to(equal(.clear))`
	`81`	`+ expect(cell.backgroundColor).to(equal(.white))`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`