From 73b8d93bddb5b1c012ae96f1f3858d5c720dea1b Mon Sep 17 00:00:00 2001 From: Marcus Wu Date: Mon, 10 May 2021 19:15:32 +0800 Subject: [PATCH] chore: Update dependencies version to support build with Xcode 12.5 (#163) * Update Example project pods * Update dependencies version to support build with Xcode 12.5 * Skip Danger run See: https://github.com/RxSwiftCommunity/RxRealm/pull/163 --- .github/workflows/pull_request.yml | 10 +-- Examples/Podfile.lock | 42 +++++----- .../RxRealmDemo.xcodeproj/project.pbxproj | 83 +++++++++++++++++++ RxRealm.podspec | 4 +- 4 files changed, 111 insertions(+), 28 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 61819fb..268d6ae 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -21,11 +21,11 @@ jobs: brew bundle bundle - - name: Danger - run: | - bundle exec danger - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# - name: Danger +# run: | +# bundle exec danger +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Restore SPM Cache uses: actions/cache@v1 diff --git a/Examples/Podfile.lock b/Examples/Podfile.lock index ac3e8f1..47c03b0 100644 --- a/Examples/Podfile.lock +++ b/Examples/Podfile.lock @@ -1,20 +1,20 @@ PODS: - - Realm (10.5.0): - - Realm/Headers (= 10.5.0) - - Realm/Headers (10.5.0) - - RealmSwift (10.5.0): - - Realm (= 10.5.0) - - RxCocoa (6.0.0): - - RxRelay (= 6.0.0) - - RxSwift (= 6.0.0) - - RxRealm (4.0.3): - - Realm (~> 10.5) - - RealmSwift (~> 10.5) + - Realm (10.7.4): + - Realm/Headers (= 10.7.4) + - Realm/Headers (10.7.4) + - RealmSwift (10.7.4): + - Realm (= 10.7.4) + - RxCocoa (6.1.0): + - RxRelay (= 6.1.0) + - RxSwift (= 6.1.0) + - RxRealm (5.0.1): + - Realm (~> 10.7) + - RealmSwift (~> 10.7) - RxCocoa (~> 6.0) - RxSwift (~> 6.0) - - RxRelay (6.0.0): - - RxSwift (= 6.0.0) - - RxSwift (6.0.0) + - RxRelay (6.1.0): + - RxSwift (= 6.1.0) + - RxSwift (6.1.0) DEPENDENCIES: - RxRealm (from `../`) @@ -32,13 +32,13 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Realm: e1c22c3d83b229afb70ebc10e1771c91e9542d12 - RealmSwift: 6fc078d9d3fd7e58c71bfdbb694e252462f112a5 - RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e - RxRealm: 4b384443e1043b51ec59c140374959a06c941c0d - RxRelay: 8d593be109c06ea850df027351beba614b012ffb - RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295 + Realm: f08ce1a85649a41303ecfe1cbd914c62e9e6d710 + RealmSwift: 60ec49d165f23d040ab48811d8dd177e09baf4d3 + RxCocoa: 5c51f02d562cbd94629f6c26cf0c80fe4ab8d343 + RxRealm: fc4a4bc4956f2b7be27412a22eda143785da0c85 + RxRelay: 483e1a19fad961b41f0b0c0bee506f46c1ae14fe + RxSwift: a834e5c538e89eca0cae86f403f4fbf0336786ce PODFILE CHECKSUM: c18aa0767a67d16eff537312e81255933c8a0f4e -COCOAPODS: 1.10.0 +COCOAPODS: 1.10.1 diff --git a/Examples/RxRealmDemo.xcodeproj/project.pbxproj b/Examples/RxRealmDemo.xcodeproj/project.pbxproj index bc96661..208f46a 100644 --- a/Examples/RxRealmDemo.xcodeproj/project.pbxproj +++ b/Examples/RxRealmDemo.xcodeproj/project.pbxproj @@ -11,11 +11,15 @@ 3BB28BD3D65B1369D1A64960 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 54597D6B66FBF23FCBF1A7DB /* Images.xcassets */; }; 84E694181E51B3B4646D1225 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 49505648CF8974BEF397F106 /* Main.storyboard */; }; 8E1DB46DA84AA944224297EC /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18CF27BE5242F49EDEA89577 /* ViewController.swift */; }; + D4892574CEB9161639C20869 /* Pods_RxRealmDemo_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 10CA015110DF798304ED7543 /* Pods_RxRealmDemo_iOS.framework */; }; DAEB28CFA861A50143F84323 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6298C0EF6C7C86E33743B8B5 /* AppDelegate.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 10CA015110DF798304ED7543 /* Pods_RxRealmDemo_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxRealmDemo_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 134BEAE91A12B5CD042607E6 /* Pods-RxRealmDemo-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxRealmDemo-iOS.release.xcconfig"; path = "Target Support Files/Pods-RxRealmDemo-iOS/Pods-RxRealmDemo-iOS.release.xcconfig"; sourceTree = ""; }; 18CF27BE5242F49EDEA89577 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 4F952C34DD4B82E9E012B678 /* Pods-RxRealmDemo-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxRealmDemo-iOS.debug.xcconfig"; path = "Target Support Files/Pods-RxRealmDemo-iOS/Pods-RxRealmDemo-iOS.debug.xcconfig"; sourceTree = ""; }; 5050BD06022D9BA067993ACD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; 54597D6B66FBF23FCBF1A7DB /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 6298C0EF6C7C86E33743B8B5 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -24,6 +28,17 @@ C430B976866CC45900487D76 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; /* End PBXFileReference section */ +/* Begin PBXFrameworksBuildPhase section */ + E04013C2F780BB33A90A86BA /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D4892574CEB9161639C20869 /* Pods_RxRealmDemo_iOS.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + /* Begin PBXGroup section */ 4A214DAA98C5247C1C84689A /* RxRealmDemo-iOS */ = { isa = PBXGroup; @@ -46,11 +61,31 @@ name = Products; sourceTree = ""; }; + 88600FDA4DAB72A51A9EACBF /* Frameworks */ = { + isa = PBXGroup; + children = ( + 10CA015110DF798304ED7543 /* Pods_RxRealmDemo_iOS.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 8DBD6278D187BEFFF563E53D /* Pods */ = { + isa = PBXGroup; + children = ( + 4F952C34DD4B82E9E012B678 /* Pods-RxRealmDemo-iOS.debug.xcconfig */, + 134BEAE91A12B5CD042607E6 /* Pods-RxRealmDemo-iOS.release.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; A6E8CE38563E4EA24A16F2CD = { isa = PBXGroup; children = ( 4A214DAA98C5247C1C84689A /* RxRealmDemo-iOS */, 6531959FA0DFC568430ACAAB /* Products */, + 8DBD6278D187BEFFF563E53D /* Pods */, + 88600FDA4DAB72A51A9EACBF /* Frameworks */, ); indentWidth = 2; sourceTree = ""; @@ -64,8 +99,11 @@ isa = PBXNativeTarget; buildConfigurationList = 960759C5E7AEB6ABF2CBF1A5 /* Build configuration list for PBXNativeTarget "RxRealmDemo-iOS" */; buildPhases = ( + F562FF3C332086030AC7078B /* [CP] Check Pods Manifest.lock */, 9F070CB36A79D85BB2876A0D /* Sources */, 5C6A37C6E8CA2E27A0ECA6AA /* Resources */, + E04013C2F780BB33A90A86BA /* Frameworks */, + 6371E92950D311C142D4BE5E /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -96,6 +134,7 @@ en, ); mainGroup = A6E8CE38563E4EA24A16F2CD; + productRefGroup = 6531959FA0DFC568430ACAAB /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( @@ -117,6 +156,48 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 6371E92950D311C142D4BE5E /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-RxRealmDemo-iOS/Pods-RxRealmDemo-iOS-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-RxRealmDemo-iOS/Pods-RxRealmDemo-iOS-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RxRealmDemo-iOS/Pods-RxRealmDemo-iOS-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + F562FF3C332086030AC7078B /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RxRealmDemo-iOS-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; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 9F070CB36A79D85BB2876A0D /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -151,6 +232,7 @@ /* Begin XCBuildConfiguration section */ 0FCE882B186F10CBD63A5EF1 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 4F952C34DD4B82E9E012B678 /* Pods-RxRealmDemo-iOS.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICON_NAME)"; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -233,6 +315,7 @@ }; 84000E9CA8521983711240B4 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 134BEAE91A12B5CD042607E6 /* Pods-RxRealmDemo-iOS.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICON_NAME)"; CODE_SIGN_IDENTITY = "iPhone Developer"; diff --git a/RxRealm.podspec b/RxRealm.podspec index 61e578b..e32d3fc 100644 --- a/RxRealm.podspec +++ b/RxRealm.podspec @@ -24,8 +24,8 @@ Pod::Spec.new do |s| s.source_files = "Sources/RxRealm/*.swift" s.frameworks = "Foundation" - s.dependency "Realm", "~> 10.5" - s.dependency "RealmSwift", "~> 10.5" + s.dependency "Realm", "~> 10.7" + s.dependency "RealmSwift", "~> 10.7" s.dependency "RxSwift", "~> 6.0" s.dependency "RxCocoa", "~> 6.0" end