Merge pull request #1 from cederache/update_ios_15

Update RxSwift to 6.0 and update version to 0.6
BeApp · Jan 11, 2022 · 8689b30 · 8689b30
2 parents fba23c9 + df47b8a
commit 8689b30
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 11 deletions.
diff --git a/BeappCache.podspec b/BeappCache.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'BeappCache'
-  s.version          = '0.5'
+  s.version          = '0.6'
   s.summary          = 'This library provides a cache mechanism relying on RxSwift'
 
 # This description is used to generate tags and improve search results.
@@ -32,5 +32,5 @@ Pod::Spec.new do |s|
   s.frameworks = 'Foundation'
   s.dependency 'Cache', '~> 5.2.0'
   s.dependency 'RxSwift', '~> 4.5' #for cache library
-  s.dependency 'RxSwift', '~> 5.0'
+  s.dependency 'RxSwift', '~> 6.0'
 end
diff --git a/Example/BeappCache.xcodeproj/project.pbxproj b/Example/BeappCache.xcodeproj/project.pbxproj
@@ -312,17 +312,13 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-BeappCache_Example/Pods-BeappCache_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/BeappCache/BeappCache.framework",
 				"${BUILT_PRODUCTS_DIR}/Cache/Cache.framework",
 				"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BeappCache.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cache.framework",

diff --git a/Example/BeappCache.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example/BeappCache.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Example/BeappCache.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/BeappCache.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/...eproj/project.xcworkspace/xcuserdata/cederache.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/cederache.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Example/BeappCache.xcworkspace/contents.xcworkspacedata b/Example/BeappCache.xcworkspace/contents.xcworkspacedata
diff --git a/Example/BeappCache.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/BeappCache.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/...le/BeappCache.xcworkspace/xcuserdata/cederache.xcuserdatad/UserInterfaceState.xcuserstate b/...le/BeappCache.xcworkspace/xcuserdata/cederache.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Example/BeappCache/ViewController.swift b/Example/BeappCache/ViewController.swift
@@ -34,7 +34,7 @@ class ViewController: UIViewController {
             .withAsync(singleString)
             .withStrategy(.asyncOrCache)
             .fetch()
-            .observeOn(MainScheduler.instance)
+            .observe(on: MainScheduler.instance)
             .subscribe(onNext: { (_) in
                 print("Success async request or data from cache")
             }, onError: { (error) in
@@ -49,7 +49,7 @@ class ViewController: UIViewController {
             .withAsync(singleString)
             .withStrategy(.justAsync)
             .fetch()
-            .observeOn(MainScheduler.instance)
+            .observe(on: MainScheduler.instance)
             .subscribe(onNext: { (_) in
                 print("Success async request")
             }, onError: { (error) in
@@ -64,7 +64,7 @@ class ViewController: UIViewController {
             .withAsync(singleString)
             .withStrategy(.justCache)
             .fetch()
-            .observeOn(MainScheduler.instance)
+            .observe(on: MainScheduler.instance)
             .subscribe(onNext: { (_) in
                 print("Success to get data from cache")
             }, onError: { (error) in

diff --git a/Example/Tests/XCCache.swift b/Example/Tests/XCCache.swift
@@ -37,7 +37,7 @@ class XCCache {
             .withAsync(Single.just("Data for key \(key) is saved"))
             .withStrategy(strategy)
             .fetch()
-            .observeOn(MainScheduler.instance)
+            .observe(on: MainScheduler.instance)
             .subscribe(onNext: { (result) in
                 print("Data is created for key \(key)")
             }, onError: { (error) in
@@ -54,7 +54,7 @@ class XCCache {
             .withAsync(Single.just(String()))
             .withStrategy(.justCache)
             .fetch()
-            .observeOn(MainScheduler.instance)
+            .observe(on: MainScheduler.instance)
             .subscribe(onNext: { (keyValue) in
                 callBack(keyValue)
             }, onError: { (error) in