diff --git a/Live/build.gradle b/Live/build.gradle
index dad8062..37cb9a4 100644
--- a/Live/build.gradle
+++ b/Live/build.gradle
@@ -1,15 +1,14 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 25
- buildToolsVersion '26.0.2'
+ compileSdkVersion rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
// applicationId "com.frank.live"
- minSdkVersion 15
- targetSdkVersion 25
- versionCode 1
- versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ minSdkVersion rootProject.ext.minSdkVersion
+ targetSdkVersion rootProject.ext.targetSdkVersion
+ versionCode rootProject.ext.versionCode
+ versionName rootProject.ext.versionName
externalNativeBuild {
cmake {
cppFlags ""
@@ -34,10 +33,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
compile 'com.android.support:appcompat-v7:25.3.1'
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- testCompile 'junit:junit:4.12'
}
diff --git a/OnLive/build.gradle b/OnLive/build.gradle
index 14a7440..1f1bc32 100644
--- a/OnLive/build.gradle
+++ b/OnLive/build.gradle
@@ -1,22 +1,22 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 25
- buildToolsVersion '26.0.2'
+ compileSdkVersion rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
lintOptions {
abortOnError false
}
defaultConfig {
applicationId "com.frank.living"
- minSdkVersion 17
- targetSdkVersion 25
- versionCode 1001
- versionName "1.0.1"
+ minSdkVersion rootProject.ext.minSdkVersion
+ targetSdkVersion rootProject.ext.targetSdkVersion
+ versionCode rootProject.ext.versionCode
+ versionName rootProject.ext.versionName
flavorDimensions "800400"
ndk {
- abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a'
+ abiFilters 'armeabi-v7a', 'arm64-v8a'
}
}
buildTypes {
@@ -26,8 +26,8 @@ android {
}
}
productFlavors {
- all32 { minSdkVersion 17 }
- all64 { minSdkVersion 17 }
+ all32 { minSdkVersion rootProject.ext.minSdkVersion }
+ all64 { minSdkVersion rootProject.ext.minSdkVersion }
}
sourceSets {
diff --git a/app/build.gradle b/app/build.gradle
index 5ce1d51..30393f8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 25
- buildToolsVersion '26.0.2'
+ compileSdkVersion rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
applicationId "com.frank.ffmpeg"
- minSdkVersion 17
- targetSdkVersion 25
- versionCode 1
- versionName "1.0"
+ minSdkVersion rootProject.ext.minSdkVersion
+ targetSdkVersion rootProject.ext.targetSdkVersion
+ versionCode rootProject.ext.versionCode
+ versionName rootProject.ext.versionName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild {
@@ -42,10 +42,6 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
compile 'com.android.support:appcompat-v7:25.4.0'
compile 'com.android.support:recyclerview-v7:25.4.0'
testCompile 'junit:junit:4.12'
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d49e98d..464cccf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -68,6 +68,6 @@
请点击右上角菜单选择文件
非音频文件
非视频文件
- 正在反转视频...
+ 正在反转视频…
diff --git a/build.gradle b/build.gradle
index 0366ab0..f3dc3f8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,3 +29,12 @@ allprojects {
task clean(type: Delete) {
delete rootProject.buildDir
}
+
+ext {
+ compileSdkVersion = 28
+ buildToolsVersion = '28.0.2'
+ minSdkVersion = 17
+ targetSdkVersion = 28
+ versionCode = 101000
+ versionName = "1.1.0"
+}
\ No newline at end of file