Skip to content

Commit fc73086

Browse files
committed
更新gradle的sdk编译版本
更新gradle的sdk编译版本
1 parent 1f550fa commit fc73086

5 files changed

Lines changed: 31 additions & 32 deletions

File tree

Live/build.gradle

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion '26.0.2'
4+
compileSdkVersion rootProject.ext.compileSdkVersion
5+
buildToolsVersion rootProject.ext.buildToolsVersion
66
defaultConfig {
77
// applicationId "com.frank.live"
8-
minSdkVersion 15
9-
targetSdkVersion 25
10-
versionCode 1
11-
versionName "1.0"
12-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
8+
minSdkVersion rootProject.ext.minSdkVersion
9+
targetSdkVersion rootProject.ext.targetSdkVersion
10+
versionCode rootProject.ext.versionCode
11+
versionName rootProject.ext.versionName
1312
externalNativeBuild {
1413
cmake {
1514
cppFlags ""
@@ -34,10 +33,5 @@ android {
3433

3534
dependencies {
3635
compile fileTree(dir: 'libs', include: ['*.jar'])
37-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
38-
exclude group: 'com.android.support', module: 'support-annotations'
39-
})
4036
compile 'com.android.support:appcompat-v7:25.3.1'
41-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
42-
testCompile 'junit:junit:4.12'
4337
}

OnLive/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion '26.0.2'
4+
compileSdkVersion rootProject.ext.compileSdkVersion
5+
buildToolsVersion rootProject.ext.buildToolsVersion
66

77
lintOptions {
88
abortOnError false
99
}
1010
defaultConfig {
1111
applicationId "com.frank.living"
12-
minSdkVersion 17
13-
targetSdkVersion 25
14-
versionCode 1001
15-
versionName "1.0.1"
12+
minSdkVersion rootProject.ext.minSdkVersion
13+
targetSdkVersion rootProject.ext.targetSdkVersion
14+
versionCode rootProject.ext.versionCode
15+
versionName rootProject.ext.versionName
1616
flavorDimensions "800400"
1717

1818
ndk {
19-
abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a'
19+
abiFilters 'armeabi-v7a', 'arm64-v8a'
2020
}
2121
}
2222
buildTypes {
@@ -26,8 +26,8 @@ android {
2626
}
2727
}
2828
productFlavors {
29-
all32 { minSdkVersion 17 }
30-
all64 { minSdkVersion 17 }
29+
all32 { minSdkVersion rootProject.ext.minSdkVersion }
30+
all64 { minSdkVersion rootProject.ext.minSdkVersion }
3131
}
3232

3333
sourceSets {

app/build.gradle

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion '26.0.2'
4+
compileSdkVersion rootProject.ext.compileSdkVersion
5+
buildToolsVersion rootProject.ext.buildToolsVersion
66
defaultConfig {
77
applicationId "com.frank.ffmpeg"
8-
minSdkVersion 17
9-
targetSdkVersion 25
10-
versionCode 1
11-
versionName "1.0"
8+
minSdkVersion rootProject.ext.minSdkVersion
9+
targetSdkVersion rootProject.ext.targetSdkVersion
10+
versionCode rootProject.ext.versionCode
11+
versionName rootProject.ext.versionName
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1313

1414
externalNativeBuild {
@@ -42,10 +42,6 @@ android {
4242

4343
dependencies {
4444
compile fileTree(include: ['*.jar'], dir: 'libs')
45-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
46-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
47-
exclude group: 'com.android.support', module: 'support-annotations'
48-
})
4945
compile 'com.android.support:appcompat-v7:25.4.0'
5046
compile 'com.android.support:recyclerview-v7:25.4.0'
5147
testCompile 'junit:junit:4.12'

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@
6868
<string name="please_click_select">请点击右上角菜单选择文件</string>
6969
<string name="wrong_audio_format">非音频文件</string>
7070
<string name="wrong_video_format">非视频文件</string>
71-
<string name="converting_video">正在反转视频...</string>
71+
<string name="converting_video">正在反转视频&#8230;</string>
7272

7373
</resources>

build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,12 @@ allprojects {
2929
task clean(type: Delete) {
3030
delete rootProject.buildDir
3131
}
32+
33+
ext {
34+
compileSdkVersion = 28
35+
buildToolsVersion = '28.0.2'
36+
minSdkVersion = 17
37+
targetSdkVersion = 28
38+
versionCode = 101000
39+
versionName = "1.1.0"
40+
}

0 commit comments

Comments
 (0)