Skip to content
This repository has been archived by the owner on Feb 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/5.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
vmartinelli committed Mar 7, 2018
2 parents 59df2b0 + 5b14a88 commit da3a403
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .swift-version
@@ -1 +1 @@
3.0
4.0
6 changes: 3 additions & 3 deletions AlecrimCoreData.podspec
@@ -1,14 +1,14 @@
Pod::Spec.new do |s|

s.name = "AlecrimCoreData"
s.version = "5.1"
s.version = "5.2"
s.summary = "A powerful and simple Core Data wrapper framework written in Swift."
s.homepage = "https://github.com/Alecrim/AlecrimCoreData"
s.homepage = "https://www.alecrim.com/AlecrimCoreData"

s.license = "MIT"

s.author = { "Vanderlei Martinelli" => "vanderlei.martinelli@gmail.com" }
s.social_media_url = "https://twitter.com/vmartinelli"
s.social_media_url = "https://www.linkedin.com/in/vmartinelli"

s.osx.deployment_target = "10.12"
s.ios.deployment_target = "9.0"
Expand Down
6 changes: 3 additions & 3 deletions README.md
@@ -1,6 +1,6 @@
![AlecrimCoreData](https://raw.githubusercontent.com/Alecrim/AlecrimCoreData/master/AlecrimCoreData.png)

[![Language: Swift](https://img.shields.io/badge/Swift-3.2-orange.svg?style=flat)](https://developer.apple.com/swift/)
[![Language: Swift](https://img.shields.io/badge/Swift-4.0-orange.svg?style=flat)](https://developer.apple.com/swift/)
[![Platform](https://img.shields.io/cocoapods/p/AlecrimCoreData.svg?style=flat)](http://cocoadocs.org/docsets/AlecrimCoreData)
[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://raw.githubusercontent.com/Alecrim/AlecrimCoreData/develop/LICENSE)
[![CocoaPods](https://img.shields.io/cocoapods/v/AlecrimCoreData.svg?style=flat)](http://cocoapods.org)
Expand Down Expand Up @@ -303,7 +303,7 @@ let filteredPeople = context.people.filter(using: predicate)
$ gem install cocoapods
```

CocoaPods 1.1.0+ is required to build AlecrimCoreData 5.0+.
CocoaPods 1.1.0+ is required to build AlecrimCoreData 5.2+.

To integrate **AlecrimCoreData** into your Xcode project using CocoaPods, specify it in your `Podfile`:

Expand All @@ -314,7 +314,7 @@ use_frameworks!

target '<Your Target Name>' do
# pod 'AlecrimCoreData', :git => 'https://github.com/Alecrim/AlecrimCoreData.git', :branch => 'develop'
pod 'AlecrimCoreData', '~> 5.0'
pod 'AlecrimCoreData', '~> 5.2'
end
```

Expand Down
10 changes: 5 additions & 5 deletions Source/AlecrimCoreData.xcodeproj/project.pbxproj
Expand Up @@ -243,7 +243,7 @@
TargetAttributes = {
1447ADCB1B52B2F000ADEAED = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 0800;
LastSwiftMigration = 0920;
};
};
};
Expand Down Expand Up @@ -431,7 +431,7 @@
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 779;
CURRENT_PROJECT_VERSION = 1743;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -444,7 +444,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -454,7 +454,7 @@
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 779;
CURRENT_PROJECT_VERSION = 1743;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -467,7 +467,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand Down
Expand Up @@ -537,7 +537,7 @@ public func << <A: AttributeProtocol, V>(left: A, right: [V]) -> NSComparisonPre
return left.isIn(right)
}

public func << <A: AttributeProtocol, V: Comparable>(left: A, right: Range<V>) -> NSComparisonPredicate where A.ValueType == V {
public func << <A: AttributeProtocol, V>(left: A, right: Range<V>) -> NSComparisonPredicate where A.ValueType == V {
return left.isBetween(right)
}

Expand Down
Expand Up @@ -9,9 +9,7 @@
import Foundation
import CoreData

public protocol CoreDataQueryable: GenericQueryable {

associatedtype Element: NSFetchRequestResult
public protocol CoreDataQueryable: GenericQueryable where Element: NSFetchRequestResult {

var batchSize: Int { get set }

Expand Down
2 changes: 1 addition & 1 deletion Source/AlecrimCoreData/Info.plist
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>5.0</string>
<string>5.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit da3a403

Please sign in to comment.