Skip to content

Commit 3399377

Browse files
VeiZhangVeiZhang
committed
发布版本1.2.2
1 parent 6c3b438 commit 3399377

File tree

2 files changed

+90
-69
lines changed

2 files changed

+90
-69
lines changed

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ FFmpeg.destroy()
251251
252252
| 版本 | 描述 |
253253
| --- | ---- |
254+
| [1.2.2][FFmpeg1.2.2] | 修复任务偶尔不执行 **2019-8-15** |
254255
| [1.2.1][FFmpeg1.2.1] | 设置armeabi为默认的CPU架构 **2019-5-29** |
255256
| [1.2.0][FFmpeg1.2.0] | 新增armeabi架构，分离ffmpeg可执行文件 **2019-5-21** |
256257
| [1.1.1][FFmpeg1.1.1] | 更新ffmpeg可执行文件，修改低版本机型中任务销毁时导致的阻塞 **2019-4-29** |
@@ -282,6 +283,7 @@ FFmpeg.destroy()
282283
283284
<!-- 版本 -->
284285
286+
[FFmpeg1.2.2]:https://bintray.com/veizhang/maven/ffmpeg/1.2.2
285287
[FFmpeg1.2.1]:https://bintray.com/veizhang/maven/ffmpeg/1.2.1
286288
[FFmpeg1.2.0]:https://bintray.com/veizhang/maven/ffmpeg/1.2.0
287289
[FFmpeg1.1.1]:https://bintray.com/veizhang/maven/ffmpeg/1.1.1

‎config.gradle

Lines changed: 88 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ import java.util.regex.Pattern
55
ext {
66
// 上传bintray的配置
77
bintray = [
8-
groupId : "com.excellence",
9-
publishVersion : "1.2.1",
10-
website : "https://github.com/VeiZhang/FFmpegAndroid",
11-
licences : ['Apache-2.0']
8+
groupId : "com.excellence",
9+
publishVersion: "1.2.2",
10+
website : "https://github.com/VeiZhang/FFmpegAndroid",
11+
licences : ['Apache-2.0']
1212
]
1313

1414
// 插件
1515
plugins = [
16-
application : "com.android.application",
17-
library : "com.android.library",
18-
maven : "com.github.dcendents.android-maven",
19-
bintray : "com.jfrog.bintray",
20-
novoda : "com.novoda.bintray-release",
21-
greendao : "org.greenrobot.greendao",
22-
"greendao-gradle" : "org.greenrobot:greendao-gradle-plugin:3.2.2"
16+
application : "com.android.application",
17+
library : "com.android.library",
18+
maven : "com.github.dcendents.android-maven",
19+
bintray : "com.jfrog.bintray",
20+
novoda : "com.novoda.bintray-release",
21+
greendao : "org.greenrobot.greendao",
22+
"greendao-gradle": "org.greenrobot:greendao-gradle-plugin:3.2.2"
2323
]
2424

2525
// 配置
@@ -33,100 +33,119 @@ ext {
3333
versionName : getVersionName(),
3434

3535
/*************************自定义配置*************************/
36-
androidSupportSdkVersion: "23.0.0"
36+
androidSupportSdkVersion: "23.0.0",
37+
38+
retrofit2 : "2.5.0",
39+
leakcanary : "1.6.3",
40+
exoplayer : "2.8.3",
41+
ffmpeg : "1.2.2",
42+
"imageloader" : "1.0.0",
3743
]
3844

3945
// 依赖
4046
dependencies = [
4147
/*************************原生依赖*************************/
42-
"appcompat-v7" : "com.android.support:appcompat-v7:${android["androidSupportSdkVersion"]}",
43-
"support-v4" : "com.android.support:support-v4:${android["androidSupportSdkVersion"]}",
44-
"cardview-v7" : "com.android.support:cardview-v7:${android["androidSupportSdkVersion"]}",
45-
"recyclerview-v7" : "com.android.support:recyclerview-v7:${android["androidSupportSdkVersion"]}",
46-
"design" : "com.android.support:design:${android["androidSupportSdkVersion"]}",
47-
"annotations" : "com.android.support:support-annotations:${android["androidSupportSdkVersion"]}",
48-
"gridlayout-v7" : "com.android.support:gridlayout-v7:${android["androidSupportSdkVersion"]}",
49-
"constraint-layout" : "com.android.support.constraint:constraint-layout:1.1.2",
48+
"appcompat-v7" : "com.android.support:appcompat-v7:${android["androidSupportSdkVersion"]}",
49+
"support-v4" : "com.android.support:support-v4:${android["androidSupportSdkVersion"]}",
50+
"cardview-v7" : "com.android.support:cardview-v7:${android["androidSupportSdkVersion"]}",
51+
"recyclerview-v7" : "com.android.support:recyclerview-v7:${android["androidSupportSdkVersion"]}",
52+
"design" : "com.android.support:design:${android["androidSupportSdkVersion"]}",
53+
"annotations" : "com.android.support:support-annotations:${android["androidSupportSdkVersion"]}",
54+
"gridlayout-v7" : "com.android.support:gridlayout-v7:${android["androidSupportSdkVersion"]}",
55+
"constraint-layout" : "com.android.support.constraint:constraint-layout:1.1.2",
5056

5157
/*************************第三方依赖*************************/
5258
// https://github.com/square/retrofit
53-
"retrofit2" : "com.squareup.retrofit2:retrofit:2.4.0",
54-
"converter-scalars" : "com.squareup.retrofit2:converter-scalars:2.4.0",
55-
"converter-gson" : "com.squareup.retrofit2:converter-gson:2.4.0",
56-
"adapter-rxjava" : "com.squareup.retrofit2:adapter-rxjava:2.4.0",
57-
"adapter-rxjava2" : "com.squareup.retrofit2:adapter-rxjava2:2.4.0",
59+
"retrofit2" : "com.squareup.retrofit2:retrofit:${android["retrofit2"]}",
60+
"converter-scalars" : "com.squareup.retrofit2:converter-scalars:${android["retrofit2"]}",
61+
"converter-gson" : "com.squareup.retrofit2:converter-gson:${android["retrofit2"]}",
62+
"adapter-rxjava" : "com.squareup.retrofit2:adapter-rxjava:${android["retrofit2"]}",
63+
"adapter-rxjava2" : "com.squareup.retrofit2:adapter-rxjava2:${android["retrofit2"]}",
5864
// https://github.com/square/okhttp
59-
"okhttp" : "com.squareup.okhttp3:okhttp:3.11.0",
65+
"okhttp" : "com.squareup.okhttp3:okhttp:3.14.2",
6066
// https://github.com/greenrobot/greenDAO
61-
"greendao" : "org.greenrobot:greendao:3.2.2",
67+
"greendao" : "org.greenrobot:greendao:3.2.2",
6268
// https://github.com/yuweiguocn/GreenDaoUpgradeHelper
63-
"greendao-helper" : "com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.1.0",
69+
"greendao-helper" : "io.github.yuweiguocn:GreenDaoUpgradeHelper:2.2.1",
6470
// https://github.com/bumptech/glide
65-
"glide" : "com.github.bumptech.glide:glide:4.8.0",
71+
"glide" : "com.github.bumptech.glide:glide:4.9.0",
6672
// https://github.com/square/picasso
67-
"picasso" : "com.squareup.picasso:picasso:2.71828",
73+
"picasso" : "com.squareup.picasso:picasso:2.71828",
6874
// https://github.com/facebook/fresco
69-
"fresco" : "com.facebook.fresco:fresco:1.10.0",
75+
"fresco" : "com.facebook.fresco:fresco:2.0.0",
7076
// https://github.com/greenrobot/EventBus
71-
"eventbus" : "org.greenrobot:eventbus:3.1.1",
77+
"eventbus" : "org.greenrobot:eventbus:3.1.1",
7278
// https://github.com/BuglyDevTeam/Bugly-Android
73-
"bugly" : "com.tencent.bugly:crashreport:2.6.6.1",
74-
"bugly-native" : "com.tencent.bugly:nativecrashreport:3.3.1",
79+
"bugly" : "com.tencent.bugly:crashreport:3.0.0",
80+
"bugly-native" : "com.tencent.bugly:nativecrashreport:3.7.1",
7581
// https://bintray.com/android/android-utils/com.android.volley.volley
76-
"volley" : "com.android.volley:volley:1.1.1",
82+
"volley" : "com.android.volley:volley:1.1.1",
7783
// https://github.com/ReactiveX/RxJava
78-
"rxjava" : "io.reactivex:rxjava:1.3.8",
79-
"rxjava2" : "io.reactivex.rxjava2:rxjava:2.2.3",
80-
"rxandroid" : "io.reactivex:rxandroid:2.1.0",
81-
"rxandroid2" : 'io.reactivex.rxjava2:rxandroid:2.1.0',
84+
"rxjava" : "io.reactivex:rxjava:1.3.8",
85+
"rxjava2" : "io.reactivex.rxjava2:rxjava:2.2.9",
86+
"rxandroid" : "io.reactivex:rxandroid:2.1.1",
87+
"rxandroid2" : 'io.reactivex.rxjava2:rxandroid:2.1.1',
8288
// https://github.com/JakeWharton/RxBinding
83-
"rxbinding" : 'com.jakewharton.rxbinding2:rxbinding:2.2.0',
89+
"rxbinding" : 'com.jakewharton.rxbinding2:rxbinding:2.2.0',
8490
// https://github.com/google/gson
85-
"gson" : "com.google.code.gson:gson:2.8.5",
91+
"gson" : "com.google.code.gson:gson:2.8.5",
8692
// https://github.com/alibaba/fastjson
87-
"fastjson" : "com.alibaba:fastjson:1.1.70.android",
93+
"fastjson" : "com.alibaba:fastjson:1.1.70.android",
8894
// https://github.com/apache/commons-lang
89-
"commons-lang3" : "org.apache.commons:commons-lang3:3.8",
95+
"commons-lang3" : "org.apache.commons:commons-lang3:3.9",
9096
// https://github.com/square/leakcanary
91-
"leakcanary" : "com.squareup.leakcanary:leakcanary-android:1.6.2",
92-
"leakcanary-release" : "com.squareup.leakcanary:leakcanary-android-no-op:1.6.2",
93-
"leakcanary-fragment" : "com.squareup.leakcanary:leakcanary-support-fragment:1.6.2",
97+
"leakcanary" : "com.squareup.leakcanary:leakcanary-android:${android["leakcanary"]}",
98+
"leakcanary-release" : "com.squareup.leakcanary:leakcanary-android-no-op:${android["leakcanary"]}",
99+
"leakcanary-fragment" : "com.squareup.leakcanary:leakcanary-support-fragment:${android["leakcanary"]}",
94100
// https://github.com/YoKeyword/Fragmentation
95-
"fragmentation" : "me.yokeyword:fragmentation:1.3.6",
101+
"fragmentation" : "me.yokeyword:fragmentation:1.3.7",
96102
// https://github.com/airbnb/lottie-android，2.8.0+是为了兼容AndroidX，没有用到AndroidX，则使用版本2.7.0，否则莫名其妙会报错
97-
"lottie" : "com.airbnb.android:lottie:2.7.0",
103+
"lottie" : "com.airbnb.android:lottie:2.7.0",
104+
// https://github.com/google/ExoPlayer，2.8.4+是为了兼容AndroidX
105+
"exoplayer" : "com.google.android.exoplayer:exoplayer:${android["exoplayer"]}",
106+
"exoplayer-core" : "com.google.android.exoplayer:exoplayer-core:${android["exoplayer"]}",
107+
"exoplayer-dash" : "com.google.android.exoplayer:exoplayer-dash:${android["exoplayer"]}",
108+
"exoplayer-hls" : "com.google.android.exoplayer:exoplayer-hls:${android["exoplayer"]}",
109+
"exoplayer-smoothstreaming" : "com.google.android.exoplayer:exoplayer-smoothstreaming:${android["exoplayer"]}",
110+
"exoplayer-ui" : "com.google.android.exoplayer:exoplayer-ui:${android["exoplayer"]}",
111+
"exoplayer-extension-gvr" : "com.google.android.exoplayer:extension-gvr:${android["exoplayer"]}",
112+
"exoplayer-extension-mediasession": "com.google.android.exoplayer:extension-mediasession:${android["exoplayer"]}",
113+
"exoplayer-extension-okhttp" : "com.google.android.exoplayer:extension-okhttp:${android["exoplayer"]}",
114+
"exoplayer-extension-rtmp" : "com.google.android.exoplayer:extension-rtmp:${android["exoplayer"]}",
98115

99116
/*************************个人依赖*************************/
100117
// https://github.com/VeiZhang/BaseToolsLibrary
101-
"basetools" : "com.excellence:basetools:1.2.6",
118+
"basetools" : "com.excellence:basetools:1.2.6",
102119
// https://github.com/VeiZhang/Permission
103-
"permission" : "com.excellence:permission:1.0.1",
120+
"permission" : "com.excellence:permission:1.0.2",
104121
// https://github.com/VeiZhang/RetrofitClient
105-
"retrofit-client" : "com.excellence:retrofit:1.0.5",
106-
"retrofit-client2" : "com.excellence.retrofit:retrofit2:2.0.0",
122+
"retrofit-client" : "com.excellence:retrofit:1.0.5",
123+
"retrofit-client2" : "com.excellence.retrofit:retrofit2:2.0.0",
107124
// https://github.com/VeiZhang/QSkinLoader
108-
"skinloader" : "com.excellence:skinloader:1.2.2",
125+
"skinloader" : "com.excellence:skinloader:1.2.2",
109126
// https://github.com/VeiZhang/ToastKit
110-
"toast" : "com.excellence:toast:1.1.0",
127+
"toast" : "com.excellence:toast:1.1.0",
111128
// https://github.com/VeiZhang/MailSender
112-
"mailsender" : "com.excellence:mailsender:1.0.0",
129+
"mailsender" : "com.excellence:mailsender:1.0.0",
113130
// https://github.com/VeiZhang/Downloader
114-
"downloader" : "com.excellence:downloader:1.2.0",
131+
"downloader" : "com.excellence:downloader:1.2.0",
115132
// https://github.com/VeiZhang/AppStatistics
116-
"app-statistics" : "com.excellence:app-statistics:1.0.1",
133+
"app-statistics" : "com.excellence:app-statistics:1.0.1",
117134
// https://github.com/VeiZhang/AndroidExec
118-
"exec" : "com.excellence:exec:1.1.1",
135+
"exec" : "com.excellence:exec:1.1.2",
119136
// https://github.com/VeiZhang/AndroidFFmpeg
120-
"ffmpeg" : "com.excellence:ffmpeg:1.2.1",
121-
"ffmpeg-java" : "com.excellence:ffmpeg-java:1.2.1",
122-
"ffmpeg-armeabi" : "com.excellence:ffmpeg-armeabi:1.2.1",
123-
"ffmpeg-armv7a" : "com.excellence:ffmpeg-armv7a:1.2.1",
124-
"ffmpeg-x86" : "com.excellence:ffmpeg-x86:1.2.1",
137+
"ffmpeg" : "com.excellence:ffmpeg:${android["ffmpeg"]}",
138+
"ffmpeg-java" : "com.excellence:ffmpeg-java:${android["ffmpeg"]}",
139+
"ffmpeg-armeabi" : "com.excellence:ffmpeg-armeabi:${android["ffmpeg"]}",
140+
"ffmpeg-armv7a" : "com.excellence:ffmpeg-armv7a:${android["ffmpeg"]}",
141+
"ffmpeg-x86" : "com.excellence:ffmpeg-x86:${android["ffmpeg"]}",
125142
// https://github.com/VeiZhang/ImageLoader
126-
"imageloader" : "com.excellence:imageloader:1.0.0",
127-
"imageloader-fresco" : "com.excellence:imageloader-fresco:1.0.0",
128-
"imageloader-picasso" : "com.excellence:imageloader-picasso:1.0.0",
129-
"imageloader-glide" : "com.excellence:imageloader-glide:1.0.0"
143+
"imageloader" : "com.excellence:imageloader:${android["imageloader"]}",
144+
"imageloader-fresco" : "com.excellence:imageloader-fresco:${android["imageloader"]}",
145+
"imageloader-picasso" : "com.excellence:imageloader-picasso:${android["imageloader"]}",
146+
"imageloader-glide" : "com.excellence:imageloader-glide:${android["imageloader"]}",
147+
// https://github.com/VeiZhang/DIY-EpgView
148+
"epgview" : "com.excellence:diy-epgview:1.0.2"
130149
]
131150
}
132151

@@ -185,12 +204,12 @@ def getVersionCode() {
185204
/***********************读取Git信息***********************/
186205

187206
/**
188-
* 读取最近的一次git tag
207+
* 读取当前分支最近的一次git tag
189208
* @return tag
190209
*/
191210
def getGitTag() {
192211
try {
193-
def process = ("git describe --abbrev=0 --tags origin").execute()
212+
def process = ("git describe --abbrev=0 --tags").execute()
194213
def tag = process.text.trim()
195214
return tag
196215
} catch (e) {

0 commit comments

Comments
 (0)