Skip to content

Commit

Permalink
Update READMEs to point to v15
Browse files Browse the repository at this point in the history
  • Loading branch information
BasThomas committed Sep 4, 2021
1 parent d11a55d commit dafc3f2
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 21 deletions.
25 changes: 13 additions & 12 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<img height="160" src="web/logo_github.png" />
</p>

# Moya 14.0.0
# Moya 15.0.0

[![CircleCI](https://img.shields.io/circleci/project/github/Moya/Moya/master.svg)](https://circleci.com/gh/Moya/Moya/tree/master)
[![codecov.io](https://codecov.io/github/Moya/Moya/coverage.svg?branch=master)](https://codecov.io/github/Moya/Moya?branch=master)
Expand Down Expand Up @@ -78,16 +78,16 @@ _Note: Instructions below are for using **SwiftPM** without the Xcode UI. It's t
To integrate using Apple's Swift package manager, without Xcode integration, add the following as a dependency to your `Package.swift`:

```swift
.package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "14.0.0"))
.package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "15.0.0"))
```

and then specify `"Moya"` as a dependency of the Target in which you wish to use Moya.
If you want to use reactive extensions, add also `"ReactiveMoya"`,`"RxMoya"` or
If you want to use reactive extensions, add also `"ReactiveMoya"`, `"RxMoya"` or
`"CombineMoya"` as your target dependency respectively.
Here's an example `PackageDescription`:

```swift
// swift-tools-version:5.0
// swift-tools-version:5.3
import PackageDescription

let package = Package(
Expand All @@ -98,7 +98,7 @@ let package = Package(
targets: ["MyPackage"]),
],
dependencies: [
.package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "14.0.0"))
.package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "15.0.0"))
],
targets: [
.target(
Expand All @@ -123,19 +123,19 @@ a weakly linked framework to your application target.
For Moya, use the following entry in your Podfile:

```rb
pod 'Moya', '~> 14.0'
pod 'Moya', '~> 15.0'

# or

pod 'Moya/RxSwift', '~> 14.0'
pod 'Moya/RxSwift', '~> 15.0'

# or

pod 'Moya/ReactiveSwift', '~> 14.0'
pod 'Moya/ReactiveSwift', '~> 15.0'

#or

pod 'Moya/Combine', '~> 14.1'
pod 'Moya/Combine', '~> 15.0'
```

Then run `pod install`.
Expand All @@ -146,15 +146,16 @@ import the framework with `import Moya`.
### Carthage

Carthage users can point to this repository and use whichever
generated framework they'd like, `Moya`, `RxMoya`, or `ReactiveMoya`.
generated framework they'd like, `Moya`, `RxMoya`, `ReactiveMoya`, or
`CombineMoya`.

Make the following entry in your Cartfile:

```
github "Moya/Moya" ~> 14.0
github "Moya/Moya" ~> 15.0
```

Then run `carthage update`.
Then run `carthage update --use-xcframeworks`.

If this is your first time using Carthage in the project, you'll need to go through some additional steps as explained [over at Carthage](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application).

Expand Down
22 changes: 13 additions & 9 deletions Readme_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<img height="160" src="web/logo_github.png" />
</p>

# Moya 14.0.0
# Moya 15.0.0

[![CircleCI](https://img.shields.io/circleci/project/github/Moya/Moya/master.svg)](https://circleci.com/gh/Moya/Moya/tree/master)
[![codecov.io](https://codecov.io/github/Moya/Moya/coverage.svg?branch=master)](https://codecov.io/github/Moya/Moya?branch=master)
Expand Down Expand Up @@ -68,13 +68,13 @@ Moya 的一些特色功能:
要使用苹果的 Swift Package Manager 集成,将以下内容作为依赖添加到你的 `Package.swift`

```swift
.package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "14.0.0"))
.package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "15.0.0"))
```

然后指定 `"Moya"` 为你想要使用 Moya 的 Target 的依赖。如果你想要使用响应式扩展,将 `"ReactiveMoya"``"RxMoya"` 也也作为依赖加入进来。这里是一个 `PackageDescription` 实例:

```swift
// swift-tools-version:5.0
// swift-tools-version:5.3
import PackageDescription

let package = Package(
Expand All @@ -85,7 +85,7 @@ let package = Package(
targets: ["MyPackage"]),
],
dependencies: [
.package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "14.0.0"))
.package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "15.0.0"))
],
targets: [
.target(
Expand All @@ -106,15 +106,19 @@ let package = Package(
在你的 Podfile 文件中添加 Moya:

```rb
pod 'Moya', '~> 14.0'
pod 'Moya', '~> 15.0'

# or

pod 'Moya/RxSwift', '~> 14.0'
pod 'Moya/RxSwift', '~> 15.0'

# or

pod 'Moya/ReactiveSwift', '~> 14.0'
pod 'Moya/ReactiveSwift', '~> 15.0'

#or

pod 'Moya/Combine', '~> 15.0'
```

然后运行 `pod install`
Expand All @@ -128,10 +132,10 @@ Carthage 用户可以指向这个仓库并使用他们喜欢的生成框架,`M
在你的 Cartfile 中添加下面的代码:

```
github "Moya/Moya" ~> 14.0
github "Moya/Moya" ~> 15.0
```

然后运行 `carthage update`
然后运行 `carthage update --use-xcframeworks`

如果这是你首次在项目中使用 Carthage,你将需要进行一些额外的步骤,它们在 [Carthage](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application) 中有解释。

Expand Down

0 comments on commit dafc3f2

Please sign in to comment.