Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
groue committed Apr 13, 2020
2 parents 97a05b9 + 94d34a7 commit c493b17
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 9 deletions.
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:

#### 4.x Releases

- `4.12.x` Releases - [4.12.0](#4120) | [4.12.1](#4121)
- `4.12.x` Releases - [4.12.0](#4120) | [4.12.1](#4121) | [4.12.2](#4122)
- `4.11.x` Releases - [4.11.0](#4110)
- `4.10.x` Releases - [4.10.0](#4100)
- `4.9.x` Releases - [4.9.0](#490)
Expand Down Expand Up @@ -69,6 +69,15 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
## Next Release
-->

## 4.12.2

Released April 13, 2020 • [diff](https://github.com/groue/GRDB.swift/compare/v4.12.1...v4.12.2)

**Fixed**

- [#757](https://github.com/groue/GRDB.swift/pull/757): Don't load association inflections unless necessary


## 4.12.1

Released March 29, 2020 • [diff](https://github.com/groue/GRDB.swift/compare/v4.12.0...v4.12.1)
Expand Down
2 changes: 1 addition & 1 deletion GRDB.swift.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'GRDB.swift'
s.version = '4.12.1'
s.version = '4.12.2'

s.license = { :type => 'MIT', :file => 'LICENSE' }
s.summary = 'A toolkit for SQLite databases, with a focus on application development.'
Expand Down
6 changes: 6 additions & 0 deletions GRDB/Utils/Inflections.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,20 @@ extension String {
return String(first).uppercased() + dropFirst()
}

// Never inline this property, in order to make sure Inflections.default
// is lazily loaded. See https://github.com/groue/GRDB.swift/issues/755#issuecomment-612418053
/// "player" -> "players"
/// "players" -> "players"
@inline(never)
var pluralized: String {
return Inflections.default.pluralize(self)
}

// Never inline this property, in order to make sure Inflections.default
// is lazily loaded. See https://github.com/groue/GRDB.swift/issues/755#issuecomment-612418053
/// "player" -> "player"
/// "players" -> "player"
@inline(never)
var singularized: String {
return Inflections.default.singularize(self)
}
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -466,12 +466,12 @@ ifdef JAZZY
--author 'Gwendal Roué' \
--author_url https://github.com/groue \
--github_url https://github.com/groue/GRDB.swift \
--github-file-prefix https://github.com/groue/GRDB.swift/tree/v4.12.1 \
--module-version 4.12.1 \
--github-file-prefix https://github.com/groue/GRDB.swift/tree/v4.12.2 \
--module-version 4.12.2 \
--module GRDB \
--root-url http://groue.github.io/GRDB.swift/docs/4.12/ \
--output Documentation/Reference \
--podspec GRDB.swift.podspec
--xcodebuild-arguments -project,GRDB.xcodeproj,-scheme,GRDBiOS
else
@echo Jazzy must be installed for doc
@exit 1
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

---

**Latest release**: March 29, 2020 • version 4.12.1 • [CHANGELOG](CHANGELOG.md) • [Migrating From GRDB 3 to GRDB 4](Documentation/GRDB3MigrationGuide.md)
**Latest release**: April 13, 2020 • version 4.12.2 • [CHANGELOG](CHANGELOG.md) • [Migrating From GRDB 3 to GRDB 4](Documentation/GRDB3MigrationGuide.md)

**Requirements**: iOS 9.0+ / macOS 10.9+ / tvOS 9.0+ / watchOS 2.0+ • Swift 4.2+ / Xcode 10.0+

| Swift version | GRDB version |
| ------------- | ----------------------------------------------------------- |
| **Swift 5** | **v4.12.1** |
| **Swift 4.2** | **v4.12.1** |
| **Swift 5** | **v4.12.2** |
| **Swift 4.2** | **v4.12.2** |
| Swift 4.1 | [v3.7.0](https://github.com/groue/GRDB.swift/tree/v3.7.0) |
| Swift 4 | [v2.10.0](https://github.com/groue/GRDB.swift/tree/v2.10.0) |
| Swift 3.2 | [v1.3.0](https://github.com/groue/GRDB.swift/tree/v1.3.0) |
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>4.12.1</string>
<string>4.12.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit c493b17

Please sign in to comment.