From 9eba71cd38d275ad9a3fc2743c4d20f895c1e341 Mon Sep 17 00:00:00 2001 From: Jiangdg <765067602@qq.com> Date: Sun, 16 Jun 2019 00:18:26 +0800 Subject: [PATCH] upgrade SDK version to 27 and common lib to 2.12.4 --- app/build.gradle | 27 +++++++++++++--------- build.gradle | 18 +++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- libusbcamera/build.gradle | 29 ++++++++++++++---------- 4 files changed, 43 insertions(+), 33 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 015f4f1..55d056d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion '26.0.2' + compileSdkVersion rootProject.ext.versionCompiler defaultConfig { applicationId "com.jiangdg.usbcamera" - minSdkVersion 16 - targetSdkVersion 22 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.versionTarget versionCode 1 - versionName "1.0" + versionName rootProject.ext.versionNameString testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -17,16 +16,22 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + // solving com.android.tools.r8.CompilationFailedException: Compilation failed to complete + compileOptions { + sourceCompatibility rootProject.ext.javaSourceCompatibility + targetCompatibility rootProject.ext.javaTargetCompatibility + } } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestImplementation('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' - testCompile 'junit:junit:4.12' - compile project(':libusbcamera') - compile 'com.jakewharton:butterknife:8.8.1' + implementation "com.android.support:appcompat-v7:${supportLibVersion}" + implementation "com.android.support:support-annotations:${supportLibVersion}" + testImplementation 'junit:junit:4.12' + implementation 'com.jakewharton:butterknife:8.8.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' + implementation project(':libusbcamera') } diff --git a/build.gradle b/build.gradle index 0f76a05..d525477 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { // gradle插件版本 - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' } } @@ -24,12 +24,12 @@ task clean(type: Delete) { } ext { - supportLibVersion = '25.3.1' // variable that can be referenced to keep support libs consistent - commonLibVersion= '1.5.20' - //versionBuildTool = '26.0.2' - //versionCompiler = 25 - //versionTarget = 22 - //versionNameString = '1.0.0' - javaSourceCompatibility = JavaVersion.VERSION_1_7 - javaTargetCompatibility = JavaVersion.VERSION_1_7 + supportLibVersion = '27.1.1' // variable that can be referenced to keep support libs consistent + commonLibVersion= '2.12.4' + versionCompiler = 27 + versionTarget = 27 + minSdkVersion = 21 + versionNameString = '1.0.0' + javaSourceCompatibility = JavaVersion.VERSION_1_8 + javaTargetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdd1a53..df6fe56 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/libusbcamera/build.gradle b/libusbcamera/build.gradle index d11e039..e8afe66 100644 --- a/libusbcamera/build.gradle +++ b/libusbcamera/build.gradle @@ -3,15 +3,12 @@ apply plugin: 'com.github.dcendents.android-maven' group='com.github.jiangdongguo' android { - compileSdkVersion 25 - buildToolsVersion '26.0.2' - + compileSdkVersion rootProject.ext.versionCompiler defaultConfig { - minSdkVersion 16 - targetSdkVersion 22 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.versionTarget versionCode 1 - versionName "1.0" - + versionName rootProject.ext.versionNameString testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -20,17 +17,25 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + // solving com.android.tools.r8.CompilationFailedException: Compilation failed to complete + compileOptions { + sourceCompatibility rootProject.ext.javaSourceCompatibility + targetCompatibility rootProject.ext.javaTargetCompatibility + } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: new File(buildDir, 'libs'), include: '*.jar') + androidTestImplementation('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' - testCompile 'junit:junit:4.12' - compile("com.serenegiant:common:${commonLibVersion}") { + testImplementation 'junit:junit:4.12' + implementation "com.android.support:appcompat-v7:${supportLibVersion}" + implementation "com.android.support:support-annotations:${supportLibVersion}" + // when changing compile to implementation + // AS will report exception of com.serenegiant.widget.IAspectRatioView + api("com.serenegiant:common:${commonLibVersion}") { exclude module: 'support-v4' } }