From 1ec9d801f8e9cbbc514ad8dad264a6f8c8976e3e Mon Sep 17 00:00:00 2001 From: JarvanMo Date: Fri, 29 Jun 2018 17:55:12 +0800 Subject: [PATCH] update dependencies , gradle, miniSdkVersion --- .idea/codeStyleSettings.xml | 322 ----------------------- .idea/copyright/Apache_License_2_0.xml | 6 - .idea/copyright/profiles_settings.xml | 3 - build.gradle | 13 +- demo/build.gradle | 14 +- gradle/wrapper/gradle-wrapper.properties | 4 +- library/build.gradle | 11 +- 7 files changed, 21 insertions(+), 352 deletions(-) delete mode 100644 .idea/codeStyleSettings.xml delete mode 100644 .idea/copyright/Apache_License_2_0.xml delete mode 100644 .idea/copyright/profiles_settings.xml diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 9efff03c..00000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,322 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/copyright/Apache_License_2_0.xml b/.idea/copyright/Apache_License_2_0.xml deleted file mode 100644 index 59fb8422..00000000 --- a/.idea/copyright/Apache_License_2_0.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index 45facecd..00000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/build.gradle b/build.gradle index 05f2c8cb..25bfb300 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:3.1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } @@ -23,9 +25,8 @@ task clean(type: Delete) { } ext { - buildToolsVersion = '25.0.2' - compileSdkVersion = 25 - minSdkVersion = 9 - targetSdkVersion = 25 - supportLibraryVersion = '25.3.1' + compileSdkVersion = 27 + minSdkVersion = 14 + targetSdkVersion = 27 + supportLibraryVersion = '27.1.1' } diff --git a/demo/build.gradle b/demo/build.gradle index 17730712..2b3ec12e 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -17,7 +17,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { applicationId 'com.google.android.cameraview.demo' @@ -34,19 +33,20 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + buildToolsVersion '27.0.3' } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile "com.android.support:design:$supportLibraryVersion" - compile project(':library') + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "com.android.support:design:$supportLibraryVersion" + implementation project(':library') // Tests - testCompile 'junit:junit:4.12' - androidTestCompile('com.android.support.test:runner:0.5') { + testImplementation 'junit:junit:4.12' + androidTestImplementation('com.android.support.test:runner:0.5') { exclude module: 'support-annotations' } - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2') { + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') { exclude module: 'support-annotations' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e0e97c4..38a5ec44 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Sep 06 09:02:59 JST 2016 +#Fri Jun 29 17:35:28 CST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/library/build.gradle b/library/build.gradle index 30b53bd8..c03300f4 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -16,7 +16,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion @@ -39,15 +38,15 @@ android { } dependencies { - compile "com.android.support:support-annotations:$supportLibraryVersion" - compile "com.android.support:support-v4:$supportLibraryVersion" + implementation "com.android.support:support-annotations:$supportLibraryVersion" + implementation "com.android.support:support-v4:$supportLibraryVersion" // Tests - testCompile 'junit:junit:4.12' - androidTestCompile('com.android.support.test:runner:0.5') { + testImplementation 'junit:junit:4.12' + androidTestImplementation('com.android.support.test:runner:0.5') { exclude module: 'support-annotations' } - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2') { + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') { exclude module: 'support-annotations' } }