From 573d37635f0e139e2cfd28e3135f71989fe80a0c Mon Sep 17 00:00:00 2001 From: Guilherme Souza Date: Wed, 3 Oct 2018 21:30:41 -0300 Subject: [PATCH 1/5] Added support for Swift 4.2 --- EasyRealm.podspec | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++ Example/EasyRealm.xcodeproj/project.pbxproj | 54 ++----------------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++ Example/EasyRealm/AppDelegate.swift | 2 +- Example/Podfile.lock | 27 ++++++---- 6 files changed, 37 insertions(+), 64 deletions(-) create mode 100644 EasyRealm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 Example/EasyRealm.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/EasyRealm.podspec b/EasyRealm.podspec index 381d712..877204d 100644 --- a/EasyRealm.podspec +++ b/EasyRealm.podspec @@ -34,5 +34,5 @@ EasyRealm is a micro-framework (less than 200 LOC) that helps you use Realm. s.watchos.deployment_target = '2.0' s.source_files = 'EasyRealm/Classes/**/*' - s.dependency 'RealmSwift', '~> 3.1.0' + s.dependency 'RealmSwift', '~> 3.10.0' end diff --git a/EasyRealm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/EasyRealm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/EasyRealm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/EasyRealm.xcodeproj/project.pbxproj b/Example/EasyRealm.xcodeproj/project.pbxproj index 8eb688c..985972a 100644 --- a/Example/EasyRealm.xcodeproj/project.pbxproj +++ b/Example/EasyRealm.xcodeproj/project.pbxproj @@ -62,7 +62,7 @@ 607FACEA1AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 962F9CCB6FC7DAF0C47B9A39 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; B6C45787A877C3285FE205B0 /* Pods-EasyRealm_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EasyRealm_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-EasyRealm_Tests/Pods-EasyRealm_Tests.release.xcconfig"; sourceTree = ""; }; - CEE03CDEB69479C449935B09 /* EasyRealm.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = EasyRealm.podspec; path = ../EasyRealm.podspec; sourceTree = ""; }; + CEE03CDEB69479C449935B09 /* EasyRealm.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = EasyRealm.podspec; path = ../EasyRealm.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; DD2EF73E42A8D43D39780307 /* Pods_EasyRealm_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_EasyRealm_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; ED34CAE00F1E0583F8416DB8 /* Pods-EasyRealm_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EasyRealm_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-EasyRealm_Example/Pods-EasyRealm_Example.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -198,7 +198,6 @@ 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, 8584362E4784F814598805E0 /* [CP] Embed Pods Frameworks */, - F274C71186C48F825D140108 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -217,8 +216,6 @@ 607FACE11AFB9204008FA782 /* Sources */, 607FACE21AFB9204008FA782 /* Frameworks */, 607FACE31AFB9204008FA782 /* Resources */, - A98665CB3C4F52A46CC2C65F /* [CP] Embed Pods Frameworks */, - 6D5CBF9C7FED35D44B9ED640 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -309,21 +306,6 @@ 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; }; - 6D5CBF9C7FED35D44B9ED640 /* [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-EasyRealm_Tests/Pods-EasyRealm_Tests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 8584362E4784F814598805E0 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -364,36 +346,6 @@ 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; }; - A98665CB3C4F52A46CC2C65F /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-EasyRealm_Tests/Pods-EasyRealm_Tests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - F274C71186C48F825D140108 /* [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-EasyRealm_Example/Pods-EasyRealm_Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -550,7 +502,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -564,7 +516,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Example/EasyRealm.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/EasyRealm.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Example/EasyRealm.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/EasyRealm/AppDelegate.swift b/Example/EasyRealm/AppDelegate.swift index 9610432..2cc9f10 100644 --- a/Example/EasyRealm/AppDelegate.swift +++ b/Example/EasyRealm/AppDelegate.swift @@ -12,7 +12,7 @@ import UIKit 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 { return true } } diff --git a/Example/Podfile.lock b/Example/Podfile.lock index faddb3d..2566fc8 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,24 +1,29 @@ PODS: - EasyRealm (3.2.0): - - RealmSwift (~> 3.1.0) - - Realm (3.1.1): - - Realm/Headers (= 3.1.1) - - Realm/Headers (3.1.1) - - RealmSwift (3.1.1): - - Realm (= 3.1.1) + - RealmSwift (~> 3.10.0) + - Realm (3.10.0): + - Realm/Headers (= 3.10.0) + - Realm/Headers (3.10.0) + - RealmSwift (3.10.0): + - Realm (= 3.10.0) DEPENDENCIES: - EasyRealm (from `../`) +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - Realm + - RealmSwift + EXTERNAL SOURCES: EasyRealm: - :path: ../ + :path: "../" SPEC CHECKSUMS: - EasyRealm: dab2bbece1449610894e3d530ee13f2b92349ecb - Realm: 42d1c38a5b1bbcc828b48a7ce702cb86fc68adf4 - RealmSwift: d31937ca6a6ee54acde64ec839523c0a3c04924b + EasyRealm: ad8b923c42faae7a0b76a4f31a6f993b45b1abc6 + Realm: 85ab9e4f779d66f6e9ffeb118dc25b7f130c96ac + RealmSwift: 69121c8b86d0ae005fb779efdb10e606732e1c74 PODFILE CHECKSUM: 75271464d388777fdf0703576b224eaba6178765 -COCOAPODS: 1.3.1 +COCOAPODS: 1.5.3 From f3b73ccb8c6144693e3afe82dda4627c6804d16d Mon Sep 17 00:00:00 2001 From: Guilherme Souza Date: Wed, 3 Oct 2018 21:32:10 -0300 Subject: [PATCH 2/5] Update version on README.md --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9e4630c..e53b08b 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,11 @@ EasyRealm is a micro-framework (less than 200 LOC) that helps you use Realm. ## Versions guides -| Swift | Realm | EasyRealm | -|-----------|----------|-----------| -| 3.0 | >= 2.4 | 2.0.1 | -| 3.2 / 4.0 | >= 3.0.0 | >= 3.0.0 | +| Swift | Realm | EasyRealm | +|-----------|-----------|-----------| +| 3.0 | >= 2.4 | 2.0.1 | +| 3.2 / 4.0 | >= 3.0.0 | >= 3.0.0 | +| 4.2 | >= 3.10.0 | >= 3.2.0 | ## Keys Features @@ -132,7 +133,7 @@ it, simply add the following line to your Podfile: #### CocoaPods ```ruby use_frameworks! -pod "EasyRealm", '~> 2.0.0' +pod "EasyRealm", '~> 3.2.0' ``` #### Carthage From d9c0b0e971f47e1e8ede71a19e6c0fe9d4411646 Mon Sep 17 00:00:00 2001 From: Guilherme Souza Date: Wed, 3 Oct 2018 21:42:37 -0300 Subject: [PATCH 3/5] Update .swift-version --- .swift-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.swift-version b/.swift-version index 5186d07..bf77d54 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +4.2 From 53fd5bbb694f1501114a5ee396d66c792775c015 Mon Sep 17 00:00:00 2001 From: Guilherme Souza Date: Wed, 3 Oct 2018 21:43:53 -0300 Subject: [PATCH 4/5] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5f30578..7c305d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: objective-c -osx_image: xcode9 xcode_project: Example/EasyRealm.xcworkspace before_install: - gem install fastlane -NV From 85e05f25093fc2071fa1b95a69301521f132004a Mon Sep 17 00:00:00 2001 From: Guilherme Souza Date: Wed, 3 Oct 2018 21:55:00 -0300 Subject: [PATCH 5/5] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7c305d4..f1eaf02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: objective-c +osx_image: xcode10 xcode_project: Example/EasyRealm.xcworkspace before_install: - gem install fastlane -NV