Skip to content

Commit 47a5cf1

Browse files
committed
version: 1.0.3
1 parent c9aa8be commit 47a5cf1

File tree

5 files changed

+40
-24
lines changed

5 files changed

+40
-24
lines changed

.github/workflows/android.yml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ jobs:
107107
previousTag=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`)
108108
lastTag=$(git describe --abbrev=0 --tags)
109109
echo "previousTag:$previousTag ~ lastTag:$lastTag"
110-
log=$(git log $previousTag..$lastTag --pretty=format:'- %cd **%an**: %s' --date=format:'%Y-%m-%d %H:%M:%S')
110+
log=$(git log $previousTag..$lastTag --pretty=format:'- %cd %an: %s\n' --date=format:'%Y-%m-%d %H:%M:%S')
111111
echo "$log"
112-
echo "::set-output name=log::$log"
112+
echo "::set-output name=log::"$log""
113113
114114
# 显示信息
115115
- name: Show info
@@ -118,10 +118,10 @@ jobs:
118118
echo '${{ steps.Core-path.outputs.path }}' # Core aar路径
119119
echo '${{ steps.Helper-path.outputs.path }}' # Helper aar路径
120120
echo '${{ steps.EpoxyHelper-path.outputs.path }}' # EpoxyHelper aar路径
121-
echo '${{ steps.apk-path.outputs.path }}' # apk路径
121+
echo '${{ steps.apk-path.outputs.path }}'
122122
echo '${{ steps.apk-info.outputs.result }}' # get apk info success or failure
123-
echo '${{ steps.time.outputs.time }}' # time
124-
echo '${{ steps.git-log.outputs.log }}' # git log
123+
echo '${{ steps.time.outputs.time }}'
124+
echo '${{ steps.git-log.outputs.log }}'
125125
echo '${{ steps.apk-info.outputs.application-name }}'
126126
echo '${{ steps.apk-info.outputs.application-id }}'
127127
echo '${{ steps.apk-info.outputs.version-code }}'
@@ -146,13 +146,26 @@ jobs:
146146
payload: '{"msgtype": "text", "text": {"content": "版本更新: ${{ steps.apk-info.outputs.application-name }}-版本号: ${{ steps.apk-info.outputs.version-name }} \n 编译时间: ${{ steps.time.outputs.time }} \n 距上个正式版的更新记录: \n${{ steps.git-log.outputs.log }}"}}'
147147
headers: '{"Content-Type": "application/json"}'
148148

149-
# 创建Release
149+
# 创建Changelog文件 triggered by git tag push,
150+
- name: Generate Changelog
151+
if: startsWith(github.ref, 'refs/tags/')
152+
run: |
153+
echo -e '${{ steps.git-log.outputs.log }}' > Release.txt
154+
155+
# Cat Changelog triggered by git tag push
156+
- name: Cat Changelog
157+
if: startsWith(github.ref, 'refs/tags/')
158+
run: |
159+
cat Release.txt
160+
161+
# 创建Release triggered by git tag push,
150162
# https://github.com/marketplace/actions/gh-release
151163
- name: Release
152164
uses: softprops/action-gh-release@v1
153165
if: startsWith(github.ref, 'refs/tags/')
154166
with:
155-
body: ${{ steps.git-log.outputs.log }}
167+
body_path: Release.txt
168+
draft: true
156169
files: |
157170
${{ steps.apk-path.outputs.path }}
158171
${{ steps.Core-path.outputs.path }}

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
### Introduction
99
SwipeMenuLayout is an Android side-sliding menu widget.
10+
1011
It supports swipe left (right menu) or swipe right (left menu), and can be used in RecyclerView, support long press drag and drop.
11-
demo implementation: Kotlin+epoxy+Mavericks
12-
[Mavericks](https://github.com/airbnb/mavericks)
13-
[epoxy](https://github.com/airbnb/epoxy)
12+
13+
demo implementation: Kotlin + [epoxy](https://github.com/airbnb/epoxy) + [Mavericks](https://github.com/airbnb/mavericks)
1414

1515
#### Demo Picture
1616
##### Simple example
@@ -36,12 +36,13 @@ repositories {
3636
3. RecyclerView+Epoxy,dependency: All
3737
```groovy
3838
dependencies {
39+
def swipe_version = "1.0.3"
3940
//Widget
40-
implementation 'com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-Core:1.0.2'
41+
implementation "com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-Core:$swipe_version"
4142
//Adapter Helper
42-
implementation 'com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-Helper:1.0.2'
43+
implementation "com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-Helper:$swipe_version"
4344
//Epoxy Helper
44-
implementation 'com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-EpoxyHelper:1.0.2'
45+
implementation "com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-EpoxyHelper:$swipe_version"
4546
}
4647
```
4748

README_zh.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
### 介绍
99
SwipeMenuLayout是一个Android侧滑菜单控件。
10+
1011
支持向左滑动(右侧菜单)或向右滑动(左侧菜单),并可用于RecyclerView,支持长按拖拽排序。
11-
demo实现:Kotlin+epoxy+Mavericks
12-
[Mavericks](https://github.com/airbnb/mavericks)
13-
[epoxy](https://github.com/airbnb/epoxy)
12+
13+
demo实现:Kotlin + [epoxy](https://github.com/airbnb/epoxy) + [Mavericks](https://github.com/airbnb/mavericks)
1414

1515
#### 演示效果图
1616
##### 单独使用
@@ -36,12 +36,13 @@ repositories {
3636
3. 在RecyclerView+Epoxy中使用时,需要全部3个
3737
```groovy
3838
dependencies {
39+
def swipe_version = "1.0.3"
3940
//Widget
40-
implementation 'com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-Core:1.0.2'
41+
implementation "com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-Core:$swipe_version"
4142
//Adapter Helper
42-
implementation 'com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-Helper:1.0.2'
43+
implementation "com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-Helper:$swipe_version"
4344
//Epoxy Helper
44-
implementation 'com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-EpoxyHelper:1.0.2'
45+
implementation "com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-EpoxyHelper:$swipe_version"
4546
}
4647
```
4748

app/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,10 @@ dependencies {
8888
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
8989
implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
9090

91-
//implementation 'com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-Core:1.0.2'
92-
//implementation 'com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-Helper:1.0.2'
93-
//implementation 'com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-EpoxyHelper:1.0.2'
91+
//def swipe_version = "1.0.3"
92+
//implementation "com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-Core:$swipe_version"
93+
//implementation "com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-Helper:$swipe_version"
94+
//implementation "com.github.benjaminwan.SwipeMenuLayout:SwipeMenuLayout-EpoxyHelper:$swipe_version"
9495
implementation project(':SwipeMenuLayout-Core')
9596
implementation project(':SwipeMenuLayout-Helper')
9697
implementation project(':SwipeMenuLayout-EpoxyHelper')

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ buildscript {
44
ext.compile_SdkVersion = 30
55
ext.min_SdkVersion = 21
66
ext.target_SdkVersion = 30
7-
ext.project_versionCode = 3
8-
ext.project_versionName = "1.0.2"
7+
ext.project_versionCode = 5
8+
ext.project_versionName = "1.0.3"
99
repositories {
1010
google()
1111
jcenter()

0 commit comments

Comments
 (0)