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 #5 from PoissonBallon/v3.0.0
Browse files Browse the repository at this point in the history
V3.0.0
  • Loading branch information
PoissonBallon authored Nov 16, 2017
2 parents 3368463 + 5cdf5af commit b3de57e
Show file tree
Hide file tree
Showing 10 changed files with 57 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
4.0
12 changes: 3 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
language: objective-c
osx_image: xcode8.2
osx_image: xcode9
xcode_project: Example/EasyRealm.xcworkspace
before_install:
- gem install slather --no-rdoc --no-ri --no-document --quiet
- gem install fastlane -NV
before_script:
#If one of this failed we have error and all process is stopped
Expand All @@ -13,10 +12,5 @@ script:
- fastlane scan -s EasyRealm-Example --device "iPhone 6" --clean --code_coverage

after_success:
- cd $TRAVIS_BUILD_DIR && slather
deploy:
skip_cleanup: true
provider: script
script: sh $TRAVIS_BUILD_DIR/scripts/deploy.sh
on:
tags: true
- cd $TRAVIS_BUILD_DIR
- bash <(curl -s https://codecov.io/bash)
4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Require version 2.4.0 or later
github "realm/realm-cocoa" >= 2.4.0
# Require version 3.0.0 or later
github "realm/realm-cocoa" >= 3.0.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "realm/realm-cocoa" "v2.7.0"
github "realm/realm-cocoa" "v3.0.2"
18 changes: 9 additions & 9 deletions EasyRealm.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@

Pod::Spec.new do |s|
s.name = 'EasyRealm'
s.version = '2.0.1'
s.version = '3.0.0'
s.summary = 'EasyRealm is a micro-framework that helps you use Realm.'

# This description is used to generate tags and improve search results.
# * Think: What does it do? Why did you write it? What is the focus?
# * Try to keep it short, snappy and to the point.
# * Write the description between the DESC delimiters below.
# * Finally, don't worry about the indent, CocoaPods strips it!
# This description is used to generate tags and improve search results.
# * Think: What does it do? Why did you write it? What is the focus?
# * Try to keep it short, snappy and to the point.
# * Write the description between the DESC delimiters below.
# * Finally, don't worry about the indent, CocoaPods strips it!

s.description = <<-DESC
EasyRealm is a micro-framework (less than 200 LOC) that helps you use Realm.
DESC

s.homepage = 'https://github.com/PoissonBallon/EasyRealm.git'
# s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.license = { type: 'MIT', file: 'LICENSE' }
s.author = { 'Allan Vialatte' => '[email protected]' }
s.source = { :git => 'https://github.com/PoissonBallon/EasyRealm.git', :tag => s.version.to_s }
s.source = { git: 'https://github.com/PoissonBallon/EasyRealm.git', tag: s.version.to_s }
s.social_media_url = 'https://twitter.com/poissonballon'

s.ios.deployment_target = '8.0'
s.source_files = 'EasyRealm/Classes/**/*'
s.dependency 'RealmSwift', '~> 2.4'
s.dependency 'RealmSwift', '~> 3.0.0'

# s.resource_bundles = {
# 'EasyRealm' => ['EasyRealm/Assets/*.png']
Expand Down
4 changes: 2 additions & 2 deletions EasyRealm.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@
PRODUCT_BUNDLE_IDENTIFIER = vialatte.EasyRealm;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -362,7 +362,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion EasyRealm/Classes/EasyRealmList.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ internal protocol EasyRealmList {

extension List:EasyRealmList {
internal func children() -> [Object] {
return self.flatMap{ $0 }
return self.flatMap { return $0 as? Object }
}
}
17 changes: 15 additions & 2 deletions Example/EasyRealm.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-EasyRealm_Example-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../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";
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 */ = {
Expand All @@ -327,9 +330,16 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-EasyRealm_Example/Pods-EasyRealm_Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/EasyRealm/EasyRealm.framework",
"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
"${BUILT_PRODUCTS_DIR}/RealmSwift/RealmSwift.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EasyRealm.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand All @@ -342,13 +352,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-EasyRealm_Tests-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../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";
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 */ = {
Expand Down
24 changes: 12 additions & 12 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
PODS:
- EasyRealm (1.1.2):
- RealmSwift (~> 2.4.0)
- Realm (2.4.3):
- Realm/Headers (= 2.4.3)
- Realm/Headers (2.4.3)
- RealmSwift (2.4.3):
- Realm (= 2.4.3)
- EasyRealm (2.0.0):
- RealmSwift (~> 3.0.0)
- Realm (3.0.2):
- Realm/Headers (= 3.0.2)
- Realm/Headers (3.0.2)
- RealmSwift (3.0.2):
- Realm (= 3.0.2)

DEPENDENCIES:
- EasyRealm (from `../`)

EXTERNAL SOURCES:
EasyRealm:
:path: "../"
:path: ../

SPEC CHECKSUMS:
EasyRealm: e0406ac9b9f18e551be5e52b12893bd0cbbfbc44
Realm: e08d60b0048ccccd3949c8c28a92c4db5712d7e9
RealmSwift: 30d49739ccb3385d201242736ca4dda56aec9dfc
EasyRealm: 29eb41155474cf12fa5dac5b4166748eec997e1c
Realm: 6f23fd1f178a09342eac21bfa7c2bf4312a7a180
RealmSwift: 695393add1b8f9d5fa75dd16e6355cf3935f71e2

PODFILE CHECKSUM: 75271464d388777fdf0703576b224eaba6178765

COCOAPODS: 1.2.0
COCOAPODS: 1.3.1
21 changes: 11 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
<h3 align="center">
<a href="https://github.com/PoissonBallon/EasyRealm">
<img src="Ressources/easy_realm_logo.png" width="200" />
<br />
EasyRealm
</a>
</h3>
<h1 align="center">
EasyRealm
</h1>

------

# EasyRealm

[![Version](https://img.shields.io/cocoapods/v/EasyRealm.svg?style=flat)](http://cocoapods.org/pods/EasyRealm)
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
[![Platform](https://img.shields.io/cocoapods/p/EasyRealm.svg?style=flat)](http://cocoapods.org/pods/EasyRealm)

[![Build Status](https://travis-ci.org/PoissonBallon/EasyRealm.svg?branch=master)](https://travis-ci.org/PoissonBallon/EasyRealm)
[![Swift 3](https://img.shields.io/badge/Language-Swift%203-orange.svg)](https://developer.apple.com/swift/)
[![Coverage Status](https://coveralls.io/repos/github/PoissonBallon/EasyRealm/badge.svg?branch=master)](https://coveralls.io/github/PoissonBallon/EasyRealm?branch=master)
[![Swift 4](https://img.shields.io/badge/Language-Swift%203-orange.svg)](https://developer.apple.com/swift/)
[![codecov](https://codecov.io/gh/PoissonBallon/EasyRealm/branch/master/graph/badge.svg)](https://codecov.io/gh/PoissonBallon/EasyRealm)
[![License](https://img.shields.io/cocoapods/l/EasyRealm.svg?style=flat)](http://cocoapods.org/pods/EasyRealm)

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 |

## Keys Features

Expand Down

0 comments on commit b3de57e

Please sign in to comment.