Skip to content
This repository has been archived by the owner on Oct 27, 2022. It is now read-only.

Commit

Permalink
Merge pull request #11 from grsouza/master
Browse files Browse the repository at this point in the history
Support for Swift 4.2
  • Loading branch information
PoissonBallon authored Oct 4, 2018
2 parents ca8a937 + 85e05f2 commit 9338c98
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 71 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0
4.2
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode9
osx_image: xcode10
xcode_project: Example/EasyRealm.xcworkspace
before_install:
- gem install fastlane -NV
Expand Down
2 changes: 1 addition & 1 deletion EasyRealm.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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>
54 changes: 3 additions & 51 deletions Example/EasyRealm.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
607FACEA1AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
962F9CCB6FC7DAF0C47B9A39 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
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 = "<group>"; };
CEE03CDEB69479C449935B09 /* EasyRealm.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = EasyRealm.podspec; path = ../EasyRealm.podspec; sourceTree = "<group>"; };
CEE03CDEB69479C449935B09 /* EasyRealm.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = EasyRealm.podspec; path = ../EasyRealm.podspec; sourceTree = "<group>"; 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 = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -198,7 +198,6 @@
607FACCD1AFB9204008FA782 /* Frameworks */,
607FACCE1AFB9204008FA782 /* Resources */,
8584362E4784F814598805E0 /* [CP] Embed Pods Frameworks */,
F274C71186C48F825D140108 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -217,8 +216,6 @@
607FACE11AFB9204008FA782 /* Sources */,
607FACE21AFB9204008FA782 /* Frameworks */,
607FACE31AFB9204008FA782 /* Resources */,
A98665CB3C4F52A46CC2C65F /* [CP] Embed Pods Frameworks */,
6D5CBF9C7FED35D44B9ED640 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
};
Expand All @@ -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;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion Example/EasyRealm/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
27 changes: 16 additions & 11 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -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
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9338c98

Please sign in to comment.