Skip to content

Commit

Permalink
Merge branch 'master' of github.com:tinrobots/CoreDataPlus
Browse files Browse the repository at this point in the history
  • Loading branch information
alemar11 committed Mar 27, 2019
2 parents 50b8770 + 1b01d6e commit 710be1a
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 12 deletions.
11 changes: 8 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog

### 1.2.2 (Work in progress)
### 2.0.0 ⭐

- CoreData is now completely migrated to **Swift 5**.
- Fixes.

### 1.2.2

- Added `fetchObjectIDs` method.

Expand All @@ -10,15 +15,15 @@

### 1.2.0

- Mechanica is now completely migrated to **Swift 4.2**.
- CoreData is now completely migrated to **Swift 4.2**.
- CoreData migration refinements.

### 1.1.0

- Added migration between model versions.
- Refinements.

### 1.0.0
### 1.0.0

- Refinements.
- Added utils for batch updates and deletes.
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![CoreDataPlus](https://raw.githubusercontent.com/tinrobots/CoreDataPlus/assets/coredata_plus.png)

[![Swift 4.2](https://img.shields.io/badge/Swift-4.2-orange.svg?style=flat)](https://developer.apple.com/swift)
[![Swift 5.0](https://img.shields.io/badge/Swift-5.0-orange.svg?style=flat)](https://developer.apple.com/swift)
![Platforms](https://img.shields.io/badge/Platform-iOS%2010%2B%20|%20macOS%2010.12+%20|%20tvOS%2010+%20|%20watchOS%203+-blue.svg)

[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
Expand All @@ -26,8 +26,8 @@ Core data extensions.
## Requirements

- iOS 10.0+ / macOS 10.12+ / tvOS 10.0+ / watchOS 3.0+
- Xcode 10.0
- Swift 4.2
- Xcode 10.2
- Swift 5.0

## Documentation

Expand Down Expand Up @@ -55,7 +55,7 @@ platform :ios, '10.0'
use_frameworks!

target '<Your Target Name>' do
pod 'CoreDataPlus', '~> 1.2.0'
pod 'CoreDataPlus', '~> 2.0.0'
end
```

Expand All @@ -79,7 +79,7 @@ $ brew install carthage
To integrate CoreDataPlus into your Xcode project using Carthage, specify it in your `Cartfile`:

```ogdl
github "tinrobots/CoreDataPlus" ~> 1.2.0
github "tinrobots/CoreDataPlus" ~> 2.0.0
```

Run `carthage update` to build the framework and drag the built `CoreDataPlus.framework` into your Xcode project.
Expand All @@ -91,7 +91,7 @@ Once you have your Swift package set up, adding CoreDataPlus as a dependency is

```swift
dependencies: [
.package(url: "https://github.com/tinrobots/CoreDataPlus.git", from: "1.2.0")
.package(url: "https://github.com/tinrobots/CoreDataPlus.git", from: "2.0.0")
]
```

Expand Down
2 changes: 1 addition & 1 deletion Support/Info-Tests.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<string>2.0.0</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Support/Info-tvOS.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<string>2.0.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Support/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<string>2.0.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down

0 comments on commit 710be1a

Please sign in to comment.