更新gradle的sdk编译版本

更新gradle的sdk编译版本
pull/107/head
xufulong 6 years ago
parent 1f550fa6be
commit fc73086d10
  1. 18
      Live/build.gradle
  2. 18
      OnLive/build.gradle
  3. 16
      app/build.gradle
  4. 2
      app/src/main/res/values/strings.xml
  5. 9
      build.gradle

@ -1,15 +1,14 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 25 compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion '26.0.2' buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig { defaultConfig {
// applicationId "com.frank.live" // applicationId "com.frank.live"
minSdkVersion 15 minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion 25 targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode rootProject.ext.versionCode
versionName "1.0" versionName rootProject.ext.versionName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild { externalNativeBuild {
cmake { cmake {
cppFlags "" cppFlags ""
@ -34,10 +33,5 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) 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:appcompat-v7:25.3.1'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
testCompile 'junit:junit:4.12'
} }

@ -1,22 +1,22 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 25 compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion '26.0.2' buildToolsVersion rootProject.ext.buildToolsVersion
lintOptions { lintOptions {
abortOnError false abortOnError false
} }
defaultConfig { defaultConfig {
applicationId "com.frank.living" applicationId "com.frank.living"
minSdkVersion 17 minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion 25 targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1001 versionCode rootProject.ext.versionCode
versionName "1.0.1" versionName rootProject.ext.versionName
flavorDimensions "800400" flavorDimensions "800400"
ndk { ndk {
abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a' abiFilters 'armeabi-v7a', 'arm64-v8a'
} }
} }
buildTypes { buildTypes {
@ -26,8 +26,8 @@ android {
} }
} }
productFlavors { productFlavors {
all32 { minSdkVersion 17 } all32 { minSdkVersion rootProject.ext.minSdkVersion }
all64 { minSdkVersion 17 } all64 { minSdkVersion rootProject.ext.minSdkVersion }
} }
sourceSets { sourceSets {

@ -1,14 +1,14 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 25 compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion '26.0.2' buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig { defaultConfig {
applicationId "com.frank.ffmpeg" applicationId "com.frank.ffmpeg"
minSdkVersion 17 minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion 25 targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode rootProject.ext.versionCode
versionName "1.0" versionName rootProject.ext.versionName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild { externalNativeBuild {
@ -42,10 +42,6 @@ android {
dependencies { dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs') 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:appcompat-v7:25.4.0'
compile 'com.android.support:recyclerview-v7:25.4.0' compile 'com.android.support:recyclerview-v7:25.4.0'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'

@ -68,6 +68,6 @@
<string name="please_click_select">请点击右上角菜单选择文件</string> <string name="please_click_select">请点击右上角菜单选择文件</string>
<string name="wrong_audio_format">非音频文件</string> <string name="wrong_audio_format">非音频文件</string>
<string name="wrong_video_format">非视频文件</string> <string name="wrong_video_format">非视频文件</string>
<string name="converting_video">正在反转视频...</string> <string name="converting_video">正在反转视频&#8230;</string>
</resources> </resources>

@ -29,3 +29,12 @@ allprojects {
task clean(type: Delete) { task clean(type: Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }
ext {
compileSdkVersion = 28
buildToolsVersion = '28.0.2'
minSdkVersion = 17
targetSdkVersion = 28
versionCode = 101000
versionName = "1.1.0"
}
Loading…
Cancel
Save