diff --git a/.swift-version b/.swift-version index 8ccd63e..5e2d215 100644 --- a/.swift-version +++ b/.swift-version @@ -1,2 +1,2 @@ -4.0 +4.2 diff --git a/Example/RxRealm.xcodeproj/project.pbxproj b/Example/RxRealm.xcodeproj/project.pbxproj index 1b77e9f..b4b6a17 100644 --- a/Example/RxRealm.xcodeproj/project.pbxproj +++ b/Example/RxRealm.xcodeproj/project.pbxproj @@ -7,8 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 2677790EE41D57B5AB2DB6C9 /* Pods_RxRealm_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69375A1E91DF8BF5A1D8E7AE /* Pods_RxRealm_Tests.framework */; }; - 4E303D4EAD576FBC29DAFC59 /* Pods_RxRealm_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED95101A3752DD78847A63BC /* Pods_RxRealm_Example.framework */; }; 607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; }; 607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; }; 607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; }; @@ -35,8 +33,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 19C086470DDF3455B8F66C47 /* Pods-RxRealm_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxRealm_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RxRealm_Example/Pods-RxRealm_Example.debug.xcconfig"; sourceTree = ""; }; - 50BAF02C01823DE71733696A /* Pods-RxRealm_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxRealm_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RxRealm_Tests/Pods-RxRealm_Tests.debug.xcconfig"; sourceTree = ""; }; 607FACD01AFB9204008FA782 /* RxRealm_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RxRealm_Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -44,7 +40,6 @@ 607FACDA1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 607FACDC1AFB9204008FA782 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 607FACDF1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - 69375A1E91DF8BF5A1D8E7AE /* Pods_RxRealm_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxRealm_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 74D9A8127363946A03ABDCFB /* RxRealm.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = RxRealm.podspec; path = ../RxRealm.podspec; sourceTree = ""; }; 9C3182361D02BAA90003F1EB /* RxRealmWriteSinks.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxRealmWriteSinks.swift; sourceTree = ""; }; 9C4FE0601DC7B1FD00DF66A5 /* RxRealmObjectTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxRealmObjectTests.swift; sourceTree = ""; }; @@ -58,9 +53,6 @@ 9CFB8DC11CF22BA4004BC090 /* RxRealmRealmTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxRealmRealmTests.swift; sourceTree = ""; }; C6335D7593EFC541DC2AADFB /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; D049E54B5A4BBE6132D399BD /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; - D6D601A254F004DB43C99FD7 /* Pods-RxRealm_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxRealm_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-RxRealm_Example/Pods-RxRealm_Example.release.xcconfig"; sourceTree = ""; }; - E350C7E14661AFAA759A7AE1 /* Pods-RxRealm_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxRealm_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RxRealm_Tests/Pods-RxRealm_Tests.release.xcconfig"; sourceTree = ""; }; - ED95101A3752DD78847A63BC /* Pods_RxRealm_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxRealm_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -68,7 +60,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4E303D4EAD576FBC29DAFC59 /* Pods_RxRealm_Example.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -76,7 +67,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2677790EE41D57B5AB2DB6C9 /* Pods_RxRealm_Tests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -90,8 +80,6 @@ 607FACD21AFB9204008FA782 /* Example for RxRealm */, 9CEB7A481CC834340077C44D /* RxRealmTests */, 607FACD11AFB9204008FA782 /* Products */, - 95D486D5A426B1F600453297 /* Pods */, - 9259FF380C364865C00748A4 /* Frameworks */, ); sourceTree = ""; }; @@ -136,26 +124,6 @@ name = "Podspec Metadata"; sourceTree = ""; }; - 9259FF380C364865C00748A4 /* Frameworks */ = { - isa = PBXGroup; - children = ( - ED95101A3752DD78847A63BC /* Pods_RxRealm_Example.framework */, - 69375A1E91DF8BF5A1D8E7AE /* Pods_RxRealm_Tests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 95D486D5A426B1F600453297 /* Pods */ = { - isa = PBXGroup; - children = ( - 19C086470DDF3455B8F66C47 /* Pods-RxRealm_Example.debug.xcconfig */, - D6D601A254F004DB43C99FD7 /* Pods-RxRealm_Example.release.xcconfig */, - 50BAF02C01823DE71733696A /* Pods-RxRealm_Tests.debug.xcconfig */, - E350C7E14661AFAA759A7AE1 /* Pods-RxRealm_Tests.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; 9CEB7A481CC834340077C44D /* RxRealmTests */ = { isa = PBXGroup; children = ( @@ -180,12 +148,9 @@ isa = PBXNativeTarget; buildConfigurationList = 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "RxRealm_Example" */; buildPhases = ( - 327D603D4690007E8B638B0E /* [CP] Check Pods Manifest.lock */, 607FACCC1AFB9204008FA782 /* Sources */, 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, - 7986DE64790C01CA0573C129 /* [CP] Embed Pods Frameworks */, - 70C190BAB54D5CB1641CCE04 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -200,12 +165,9 @@ isa = PBXNativeTarget; buildConfigurationList = 9CEB7A501CC834340077C44D /* Build configuration list for PBXNativeTarget "RxRealm_Tests" */; buildPhases = ( - 47EF88764B0DDD36B74C66E8 /* [CP] Check Pods Manifest.lock */, 9CEB7A431CC834340077C44D /* Sources */, 9CEB7A441CC834340077C44D /* Frameworks */, 9CEB7A451CC834340077C44D /* Resources */, - 051741DAB4D8631AD7E12258 /* [CP] Embed Pods Frameworks */, - 87796072080EEF71421C3ED1 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -278,129 +240,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 051741DAB4D8631AD7E12258 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-RxRealm_Tests/Pods-RxRealm_Tests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/Realm/Realm.framework", - "${BUILT_PRODUCTS_DIR}/RealmSwift/RealmSwift.framework", - "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", - "${BUILT_PRODUCTS_DIR}/RxRealm/RxRealm.framework", - "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", - "${BUILT_PRODUCTS_DIR}/RxBlocking/RxBlocking.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRealm.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxBlocking.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxRealm_Tests/Pods-RxRealm_Tests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 327D603D4690007E8B638B0E /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RxRealm_Example-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 47EF88764B0DDD36B74C66E8 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RxRealm_Tests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 70C190BAB54D5CB1641CCE04 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxRealm_Example/Pods-RxRealm_Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 7986DE64790C01CA0573C129 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-RxRealm_Example/Pods-RxRealm_Example-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/Realm/Realm.framework", - "${BUILT_PRODUCTS_DIR}/RealmSwift/RealmSwift.framework", - "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", - "${BUILT_PRODUCTS_DIR}/RxRealm/RxRealm.framework", - "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRealm.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxRealm_Example/Pods-RxRealm_Example-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 87796072080EEF71421C3ED1 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxRealm_Tests/Pods-RxRealm_Tests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 607FACCC1AFB9204008FA782 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -557,7 +396,6 @@ }; 607FACF01AFB9204008FA782 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 19C086470DDF3455B8F66C47 /* Pods-RxRealm_Example.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -578,13 +416,12 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; 607FACF11AFB9204008FA782 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D6D601A254F004DB43C99FD7 /* Pods-RxRealm_Example.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -605,13 +442,12 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; 9CEB7A4E1CC834340077C44D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 50BAF02C01823DE71733696A /* Pods-RxRealm_Tests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; @@ -623,13 +459,12 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.rxswiftcommunity.RxRealm-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; 9CEB7A4F1CC834340077C44D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E350C7E14661AFAA759A7AE1 /* Pods-RxRealm_Tests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; @@ -640,7 +475,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.rxswiftcommunity.RxRealm-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Example/RxRealm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/RxRealm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Example/RxRealm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/RxRealm.xcworkspace/contents.xcworkspacedata b/Example/RxRealm.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1e6d79b..0000000 --- a/Example/RxRealm.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/Example/RxRealm/AppDelegate.swift b/Example/RxRealm/AppDelegate.swift index 93927c4..50943f7 100644 --- a/Example/RxRealm/AppDelegate.swift +++ b/Example/RxRealm/AppDelegate.swift @@ -13,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { //reset the realm on each app launch let realm = try! Realm() try! realm.write { diff --git a/RxRealm.podspec b/RxRealm.podspec index 5bb830c..e9bdf24 100644 --- a/RxRealm.podspec +++ b/RxRealm.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "RxRealm" - s.version = "0.7.5" + s.version = "0.7.6" s.summary = "An Rx wrapper of Realm's notifications and write bindings" s.description = <<-DESC