Skip to content

Commit

Permalink
Merge pull request #227 from sunshinejr/release/5.0.0
Browse files Browse the repository at this point in the history
[Release] 5.0.0
  • Loading branch information
sunshinejr authored Dec 31, 2019
2 parents dbd126b + 1a0caa2 commit 1930a81
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 23 deletions.
22 changes: 11 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ language: generic
matrix:
include:
- os: osx
osx_image: xcode11
osx_image: xcode11.3
name: Danger
env:
- CACHE_NAME=SWIFT5_1
- SWIFT_VERSION=5.0
- SWIFT_TOOLS_VERSION=5.1
- XCODEGEN_VERSION=2.5.0
- IOS_SIMULATOR='name=iPhone 11,OS=13.0'
- IOS_SDK=iphonesimulator13.0
- IOS_SIMULATOR='name=iPhone 11,OS=13.2'
- IOS_SDK=iphonesimulator13.2
- TVOS_SIMULATOR='name=Apple TV 4K (at 1080p)'
- TVOS_SDK=appletvsimulator13.0
- TVOS_SDK=appletvsimulator13.2
- WATCHOS_SIMULATOR='name=Apple Watch Series 4 - 44mm'
- WATCHOS_SDK=watchsimulator6.0
- WATCHOS_SDK=watchsimulator6.1
before_install:
- brew install danger/tap/danger-swift
script: DEBUG="*" danger-swift ci
- os: osx
osx_image: xcode11
osx_image: xcode11.3
name: Swift 5.1 compatibility
env:
- CACHE_NAME=SWIFT5_1
Expand Down Expand Up @@ -119,11 +119,11 @@ before_install:

script:
- set -o pipefail
- if [[ "$SWIFT_VERSION" != "5.0" ]]; then mv Cartfile_4.2.private Cartfile.private; fi
- if [[ "$SWIFT_VERSION" != "5.0" ]]; then mv Cartfile_4.2.resolved Cartfile.resolved; fi
- carthage update --no-use-binaries --cache-builds --verbose
- xcodebuild -version
- xcodebuild -showsdks
# - if [[ "$SWIFT_VERSION" != "5.0" ]]; then mv Cartfile_4.2.private Cartfile.private; fi
# - if [[ "$SWIFT_VERSION" != "5.0" ]]; then mv Cartfile_4.2.resolved Cartfile.resolved; fi
# - carthage update --no-use-binaries --cache-builds --verbose
# - xcodebuild -version
# - xcodebuild -showsdks

- xcodebuild -project "$PROJECT" -scheme 'SwiftyUserDefaults' -sdk $IOS_SDK -destination "$IOS_SIMULATOR" ONLY_ACTIVE_ARCH=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO SWIFT_VERSION=$SWIFT_VERSION build | xcpretty
- xcodebuild -project "$PROJECT" -scheme 'SwiftyUserDefaults' -sdk $TVOS_SDK -destination "$TVOS_SIMULATOR" ONLY_ACTIVE_ARCH=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO SWIFT_VERSION=$SWIFT_VERSION build | xcpretty
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
### Next

### 5.0.0 (2019-12-31)
* 🚀

### 5.0.0-beta.5 (2019-10-05)

* Removed Combine extensions for now. Due to problems with weak-linking the framework, it's too difficult to support it with ease using all package managers and also without breaking backwards-compatibility. Probably gonna introduce it once we only support Xcode 11. [@sunshinejr](https://github.com/sunshinejr)
Expand Down
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Quick/Nimble" "v8.0.2"
github "Quick/Quick" "v2.1.0"
github "Quick/Nimble" "v8.0.5"
github "Quick/Quick" "v2.2.0"
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
Previous versions' documentation: [Version 4.0.0](https://github.com/sunshinejr/SwiftyUserDefaults/blob/566ace16ee91242b61e2e9da6cdbe7dfdadd926c/README.md), [Version 3.0.1](https://github.com/sunshinejr/SwiftyUserDefaults/blob/14b629b035bf6355b46ece22c3851068a488a895/README.md)<br />
Migration guides: [from 4.x to 5.x](MigrationGuides/migration_4_to_5.md), [from 4.0.0-alpha.1 to 4.0.0-alpha.3](MigrationGuides/migration_4_alpha_1_to_4_alpha_2.md), [from 3.x to 4.x](MigrationGuides/migration_3_to_4.md)

# Version 5.0.0-beta.5
# Version 5.0.0

<p align="center">
<a href="#features">Features</a> &bull;
Expand Down Expand Up @@ -453,7 +453,7 @@ let hasKey = Defaults.hasKey(\.skipLogin)
If you're using CocoaPods, just add this line to your Podfile:

```ruby
pod 'SwiftyUserDefaults', '5.0.0-beta.5'
pod 'SwiftyUserDefaults', '~> 5.0'
```

Install by running this command in your terminal:
Expand All @@ -473,7 +473,7 @@ import SwiftyUserDefaults
Just add to your Cartfile:

```ruby
github "sunshinejr/SwiftyUserDefaults" "5.0.0-beta.5"
github "sunshinejr/SwiftyUserDefaults" ~> 5.0
```

### Swift Package Manager
Expand All @@ -484,7 +484,7 @@ let package = Package(
name: "MyPackage",
products: [...],
dependencies: [
.package(url: "https://github.com/sunshinejr/SwiftyUserDefaults.git", .exact("5.0.0-beta.5"),
.package(url: "https://github.com/sunshinejr/SwiftyUserDefaults.git", .upToNextMajor(from: "5.0.0"))
],
targets: [...]
)
Expand Down
8 changes: 4 additions & 4 deletions Sources/PropertyWrappers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ public final class SwiftyUserDefault<T: DefaultsSerializable> where T.T == T {
self.options = options

if options.contains(.observed) {
observation = adapter.observe(key) { update in
self._value = update.newValue
observation = adapter.observe(key) { [weak self] update in
self?._value = update.newValue
}
}
}
Expand All @@ -74,8 +74,8 @@ public final class SwiftyUserDefault<T: DefaultsSerializable> where T.T == T {
self.options = options

if options.contains(.observed) {
observation = Defaults.observe(key) { update in
self._value = update.newValue
observation = Defaults.observe(key) { [weak self] update in
self?._value = update.newValue
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions SwiftyUserDefaults.podspec
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Pod::Spec.new do |s|
s.name = 'SwiftyUserDefaults'
s.version = '5.0.0-beta.5'
s.version = '5.0.0'
s.license = 'MIT'
s.summary = 'Swifty API for NSUserDefaults'
s.summary = 'Swifty API for UserDefaults'
s.homepage = 'https://github.com/sunshinejr/SwiftyUserDefaults'
s.authors = { 'Radek Pietruszewski' => '[email protected]', 'Łukasz Mróz' => '[email protected]' }
s.source = { :git => 'https://github.com/radex/SwiftyUserDefaults.git', :tag => s.version }
Expand Down

0 comments on commit 1930a81

Please sign in to comment.