Skip to content

Commit 1930a81

Browse files
authored
Merge pull request #227 from sunshinejr/release/5.0.0
[Release] 5.0.0
2 parents dbd126b + 1a0caa2 commit 1930a81

File tree

6 files changed

+26
-23
lines changed

6 files changed

+26
-23
lines changed

.travis.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@ language: generic
22
matrix:
33
include:
44
- os: osx
5-
osx_image: xcode11
5+
osx_image: xcode11.3
66
name: Danger
77
env:
88
- CACHE_NAME=SWIFT5_1
99
- SWIFT_VERSION=5.0
1010
- SWIFT_TOOLS_VERSION=5.1
1111
- XCODEGEN_VERSION=2.5.0
12-
- IOS_SIMULATOR='name=iPhone 11,OS=13.0'
13-
- IOS_SDK=iphonesimulator13.0
12+
- IOS_SIMULATOR='name=iPhone 11,OS=13.2'
13+
- IOS_SDK=iphonesimulator13.2
1414
- TVOS_SIMULATOR='name=Apple TV 4K (at 1080p)'
15-
- TVOS_SDK=appletvsimulator13.0
15+
- TVOS_SDK=appletvsimulator13.2
1616
- WATCHOS_SIMULATOR='name=Apple Watch Series 4 - 44mm'
17-
- WATCHOS_SDK=watchsimulator6.0
17+
- WATCHOS_SDK=watchsimulator6.1
1818
before_install:
1919
- brew install danger/tap/danger-swift
2020
script: DEBUG="*" danger-swift ci
2121
- os: osx
22-
osx_image: xcode11
22+
osx_image: xcode11.3
2323
name: Swift 5.1 compatibility
2424
env:
2525
- CACHE_NAME=SWIFT5_1
@@ -119,11 +119,11 @@ before_install:
119119

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

128128
- 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
129129
- 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

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
### Next
22

3+
### 5.0.0 (2019-12-31)
4+
* 🚀
5+
36
### 5.0.0-beta.5 (2019-10-05)
47

58
* 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)

Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "Quick/Nimble" "v8.0.2"
2-
github "Quick/Quick" "v2.1.0"
1+
github "Quick/Nimble" "v8.0.5"
2+
github "Quick/Quick" "v2.2.0"

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
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 />
1717
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)
1818

19-
# Version 5.0.0-beta.5
19+
# Version 5.0.0
2020

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

455455
```ruby
456-
pod 'SwiftyUserDefaults', '5.0.0-beta.5'
456+
pod 'SwiftyUserDefaults', '~> 5.0'
457457
```
458458

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

475475
```ruby
476-
github "sunshinejr/SwiftyUserDefaults" "5.0.0-beta.5"
476+
github "sunshinejr/SwiftyUserDefaults" ~> 5.0
477477
```
478478

479479
### Swift Package Manager
@@ -484,7 +484,7 @@ let package = Package(
484484
name: "MyPackage",
485485
products: [...],
486486
dependencies: [
487-
.package(url: "https://github.com/sunshinejr/SwiftyUserDefaults.git", .exact("5.0.0-beta.5"),
487+
.package(url: "https://github.com/sunshinejr/SwiftyUserDefaults.git", .upToNextMajor(from: "5.0.0"))
488488
],
489489
targets: [...]
490490
)

Sources/PropertyWrappers.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public final class SwiftyUserDefault<T: DefaultsSerializable> where T.T == T {
6363
self.options = options
6464

6565
if options.contains(.observed) {
66-
observation = adapter.observe(key) { update in
67-
self._value = update.newValue
66+
observation = adapter.observe(key) { [weak self] update in
67+
self?._value = update.newValue
6868
}
6969
}
7070
}
@@ -74,8 +74,8 @@ public final class SwiftyUserDefault<T: DefaultsSerializable> where T.T == T {
7474
self.options = options
7575

7676
if options.contains(.observed) {
77-
observation = Defaults.observe(key) { update in
78-
self._value = update.newValue
77+
observation = Defaults.observe(key) { [weak self] update in
78+
self?._value = update.newValue
7979
}
8080
}
8181
}

SwiftyUserDefaults.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Pod::Spec.new do |s|
22
s.name = 'SwiftyUserDefaults'
3-
s.version = '5.0.0-beta.5'
3+
s.version = '5.0.0'
44
s.license = 'MIT'
5-
s.summary = 'Swifty API for NSUserDefaults'
5+
s.summary = 'Swifty API for UserDefaults'
66
s.homepage = 'https://github.com/sunshinejr/SwiftyUserDefaults'
77
s.authors = { 'Radek Pietruszewski' => '[email protected]', 'Łukasz Mróz' => '[email protected]' }
88
s.source = { :git => 'https://github.com/radex/SwiftyUserDefaults.git', :tag => s.version }

0 commit comments

Comments
 (0)