Skip to content

Commit

Permalink
fix: swift_qrcodejs
Browse files Browse the repository at this point in the history
  • Loading branch information
EyreFree committed Sep 14, 2020
1 parent 189bebd commit 2e65527
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 12 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@

---

## [5.1.7](https://github.com/EFPrefix/EFQRCode/releases/tag/5.1.7) (2020-09-14)

#### Add

- Add a contentEncoding parameter [#90](https://github.com/EFPrefix/EFQRCode/pull/90);
- Add compatibility with Catalyst dependencies [#88](https://github.com/EFPrefix/EFQRCode/pull/88).

#### Fix

- Update `swift_qrcodejs` to 1.1.4.

---

## [5.1.6](https://github.com/EFPrefix/EFQRCode/releases/tag/5.1.6) (2019-11-21)

#### Fix
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ApolloZhu/swift_qrcodejs" ~> 1.1.1
github "ApolloZhu/swift_qrcodejs" ~> 1.1.4
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ApolloZhu/swift_qrcodejs" "1.1.2"
github "ApolloZhu/swift_qrcodejs" "1.1.4"
4 changes: 2 additions & 2 deletions EFQRCode.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'EFQRCode'
s.version = '5.1.6'
s.version = '5.1.7'
s.summary = 'A better way to operate quick response code in Swift.'

s.description = <<-DESC
Expand Down Expand Up @@ -38,6 +38,6 @@ Pod::Spec.new do |s|
watchos.watchos.deployment_target = '2.0'

watchos.source_files = 'Source/**/*.{h,swift}'
watchos.dependency 'swift_qrcodejs', '>= 1.1.1'
watchos.dependency 'swift_qrcodejs', '>= 1.1.4'
end
end
2 changes: 1 addition & 1 deletion Examples/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 27214a7a38fbdfb949113bc3e6a74b29450b2e4e

COCOAPODS: 1.8.4
COCOAPODS: 1.9.3
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/ApolloZhu/swift_qrcodejs.git",
.upToNextMinor(from: "1.1.2"))
.upToNextMinor(from: "1.1.4"))
],
targets: [
.target(name: "EFQRCode",
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ EFQRCode is available through [CocoaPods](http://cocoapods.org). To install
it, simply add the following line to your Podfile:

```ruby
pod 'EFQRCode', '~> 5.1.6'
pod 'EFQRCode', '~> 5.1.7'
```

Try `pod 'EFQRCode/watchOS'` instead if you need to use it in watchOS.
Expand All @@ -128,7 +128,7 @@ $ brew install carthage
To integrate EFQRCode into your Xcode project using Carthage, specify it in your `Cartfile`:

```ogdl
github "EFPrefix/EFQRCode" ~> 5.1.6
github "EFPrefix/EFQRCode" ~> 5.1.7
```

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

```swift
dependencies: [
.Package(url: "https://github.com/EFPrefix/EFQRCode.git", Version(5, 1, 6))
.Package(url: "https://github.com/EFPrefix/EFQRCode.git", Version(5, 1, 7))
]
```

Expand Down
6 changes: 3 additions & 3 deletions README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ git clone git@github.com:EFPrefix/EFQRCode.git; cd EFQRCode; sh Startup.sh; open
EFQRCode 可以通过 [CocoaPods](http://cocoapods.org) 进行获取。只需要在你的 Podfile 中添加如下代码就能实现引入:

```ruby
pod 'EFQRCode', '~> 5.1.6'
pod 'EFQRCode', '~> 5.1.7'
```

如果你需要在 watchOS 中使用的话,请使用 `pod 'EFQRCode/watchOS'`
Expand All @@ -132,7 +132,7 @@ $ brew install carthage
通过在你的 `Cartfile` 添加如下语句可以将 EFQRCode 引入你的项目:

```ogdl
github "EFPrefix/EFQRCode" ~> 5.1.6
github "EFPrefix/EFQRCode" ~> 5.1.7
```

接下来执行 `carthage update` 命令生成 Framework 并且将生成的 `EFQRCode.framework` 拖入工程即可。
Expand All @@ -145,7 +145,7 @@ github "EFPrefix/EFQRCode" ~> 5.1.6

```swift
dependencies: [
.Package(url: "https://github.com/EFPrefix/EFQRCode.git", Version(5, 1, 6))
.Package(url: "https://github.com/EFPrefix/EFQRCode.git", Version(5, 1, 7))
]
```

Expand Down

0 comments on commit 2e65527

Please sign in to comment.