Skip to content

Commit 393b023

Browse files
committed
chore(release): released 2.1.4
1 parent 98480c5 commit 393b023

File tree

21 files changed

+96
-39
lines changed

21 files changed

+96
-39
lines changed

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,26 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.1.4](https://github.com/Tencent/Hippy/compare/2.1.3...2.1.4) (2020-12-03)
7+
8+
9+
### Bug Fixes
10+
11+
* **hippy-react:** fix pullHeader and pullFooter ([#420](https://github.com/Tencent/Hippy/issues/420)) ([abfc574](https://github.com/Tencent/Hippy/commit/abfc57401951acca4fb3fea72456784efcd4e926))
12+
* **hippy-react-web:** suppress childContextTypes warning ([#431](https://github.com/Tencent/Hippy/issues/431)) ([4a7ba66](https://github.com/Tencent/Hippy/commit/4a7ba66fc7ada2ba0f4010ab49b4e24d1886bca2))
13+
* **hippy-react,hippy-vue:** fixed setNativeProps demo ([#436](https://github.com/Tencent/Hippy/issues/436)) ([cf8be7c](https://github.com/Tencent/Hippy/commit/cf8be7cb19919bf5a1fe2bdd5372690ec98024da))
14+
15+
16+
### Features
17+
18+
* **hippy-vue,hippy-react:** added setNativeProps on element ([#430](https://github.com/Tencent/Hippy/issues/430)) ([d1f7e21](https://github.com/Tencent/Hippy/commit/d1f7e216b5fef46ace0cf50803ad2940b429a0d6))
19+
* **hippy-vue,hippy-react:** perf setNativeProps ([5cd1291](https://github.com/Tencent/Hippy/commit/5cd12910262ad3bb15d07c2dc974a829958a2b86))
20+
* support isomorphic rendering ([#415](https://github.com/Tencent/Hippy/issues/415)) ([c131734](https://github.com/Tencent/Hippy/commit/c1317348bab9d38990decf7d39f0631d807ab9a5))
21+
22+
23+
24+
25+
626
## [2.1.2](https://github.com/Tencent/Hippy/compare/2.1.1...2.1.2) (2020-11-23)
727

828

PUBLISH.zh_CN.md

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,9 @@ lerna version [VERSION] --conventional-commits --tag-version-prefix='' --no-push
2222
lerna 生成版本号和 CHANGELOG 后,需要回退一下版本,所有发布改动需要合并到一个 commit 中。
2323

2424
```bash
25-
git rebase -i HEAD^
25+
git reset --soft HEAD^
2626
```
2727

28-
进入 vim 或者编辑器后选择最后一个版本的 commit,并将要修改的 `pick` 修改成 `edit`,如果是 vim 则输入 `:` 并输入 `wq` 保存退出 vim。
29-
30-
此时进入 rebase 状态。
31-
32-
首先需要更新一下 commit message,因为自动生成的无法通过自动代码检查。
33-
34-
```bash
35-
git commit --amend -S
36-
```
37-
38-
输入符合 [Convention Commit](https://conventionalcommits.org/) 规范的 commit message,版本发布一般推荐使用:`chore(release): released [VERSION]` 这样的 commit message。
39-
4028
同时删除 tag,一会儿更新后需要重新生成 tag
4129

4230
```bash
@@ -90,10 +78,13 @@ git status
9078

9179
```bash
9280
git add [FILES]
93-
git rebase --continue
9481
```
9582

96-
会结束 rebase 状态,然后再次检查 commit 中的内容正确。
83+
输入符合 [Convention Commit](https://conventionalcommits.org/) 规范的 commit message
84+
85+
```bash
86+
git commit -m 'chore(release): released [VERSION]'
87+
```
9788

9889
打上 tag
9990

@@ -135,4 +126,4 @@ git push --tags # 提交 tag
135126
> 如果发布时参数检查失败,可以在`pod`命令前面加上 `COCOAPODS_VALIDATOR_SKIP_XCODEBUILD=1` 参数
136127

137128
* Android 发布到 [bintray](https://bintray.com/beta/#/hippy/Hippy/hippy-release?tab=overview)
138-
在 Android Studio 中打开 `examples/android-demo` 项目,在`local.properties`添加`bintrayUser=[user]``bintrayKey=[key]`,其中`[user]``[key]` 分别对应用户在bintray的 `账号名``API key` ,添加完后字旁边的 Gradle 面板中运行 `android-demo` > `android-sdk` > `publishing` > `:android-sdk:bintrayUpload` 即可发布.
129+
在 Android Studio 中打开 `examples/android-demo` 项目,在`local.properties`添加`bintrayUser=[user]``bintrayKey=[key]`,其中`[user]``[key]` 分别对应用户在bintray的 `账号名``API key` ,添加完后字旁边的 Gradle 面板中运行 `android-demo` > `android-sdk` > `publishing` > `:android-sdk:bintrayUpload` 即可发布

android/sdk/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ publish {
511511
repoName = 'Hippy'
512512
groupId = 'com.tencent.hippy'
513513
artifactId = 'hippy-release'
514-
publishVersion = '2.1.2'
514+
publishVersion = '2.1.4'
515515
dryRun = false
516516
desc = 'Hippy library for Android'
517517
website = 'https://github.com/Tencent/Hippy'

core/napi/jsc/native-source-code-ios.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* js2cpp is maintenance by Hippy Team <[email protected]>
66
* Copyright © 2018-2020 Tencent. All rights reserved.
77
*
8-
* Generated at Mon Nov 23 2020 21:28:26 GMT+0800 (GMT+08:00).
8+
* Generated at Thu Dec 03 2020 15:25:40 GMT+0800 (China Standard Time).
99
* DO NOT EDIT IT.
1010
*/
1111
#include "core/napi/native-source-code.h"

core/napi/v8/native-source-code-android.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* js2cpp is maintenance by Hippy Team <[email protected]>
66
* Copyright © 2018-2020 Tencent. All rights reserved.
77
*
8-
* Generated at Mon Nov 23 2020 21:28:26 GMT+0800 (GMT+08:00).
8+
* Generated at Thu Dec 03 2020 15:25:40 GMT+0800 (China Standard Time).
99
* DO NOT EDIT IT.
1010
*/
1111
#include "core/napi/native-source-code.h"

examples/android-demo/res/index.android.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/android-demo/res/vendor.android.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/ios-demo/res/index.ios.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/ios-demo/res/vendor.ios.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hippy.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'hippy'
11-
s.version = '2.1.3'
11+
s.version = '2.1.4'
1212
s.summary = 'hippy lib for ios'
1313

1414
# This description is used to generate tags and improve search results.

0 commit comments

Comments
 (0)