From 6efa3da6d9c207451accee7c914cb58de46a3e91 Mon Sep 17 00:00:00 2001 From: "shilin.liu" Date: Mon, 6 Aug 2018 13:37:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0=201.0.6=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E7=8E=AF=E5=A2=83=E5=85=88=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/caches/build_file_checksums.ser | Bin 0 -> 595 bytes .idea/codeStyles/Project.xml | 29 +++++++++++++++++ .idea/compiler.xml | 22 ------------- .idea/copyright/profiles_settings.xml | 3 -- .idea/misc.xml | 38 +++-------------------- .idea/vcs.xml | 2 +- app/build.gradle | 21 ++++++------- build.gradle | 14 +++++++-- compresshelper/build.gradle | 24 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- 10 files changed, 69 insertions(+), 86 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..8d942042880618306d5f49d36c7113168f47a74c GIT binary patch literal 595 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}l-a(W(##Th_( zR`y#54~r#SWM*J;W8likPfT%3OfJbU@?_vF$tX%K&dAS6sVJ~_U;qK0athIMTs*DAJ4bhwl+T2;azkdvRBm;(x}g4Cjt%+%sixZ;fc z`)@AZv#930Ntvd|i%s4o3|ji3#i>Qb`Z<}U#Tl77nR)t98}t!@j$zCd*`AyI44YV9 zHgL{(^TVmGgh3h@a|J+u7iXmA0F~=wcdOv3gV&~Ql@7hYBD>wmI|S${K|Ho>>5UV< q_O;_t?1|t9t~XNG0ezNOP=Lee8G<+B9@W%r&}yko=q%h>Qvm=iw9;n) literal 0 HcmV?d00001 diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +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 e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 7158618..99202cc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,18 +1,16 @@ - - - @@ -27,36 +25,10 @@ - - - - - - - - - - - + - - - - - 1.8 - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 3150eb7..e0d4c44 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "com.nanchen.compressimage" - minSdkVersion 11 - 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" } buildTypes { @@ -20,11 +19,11 @@ android { } 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.1.1' - testCompile 'junit:junit:4.12' - compile project(':compresshelper') + implementation "com.android.support:appcompat-v7:$supportLibVersion" + testImplementation 'junit:junit:4.12' + implementation project(':compresshelper') } diff --git a/build.gradle b/build.gradle index 745805a..839c125 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,12 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:3.1.3' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' @@ -19,9 +20,18 @@ buildscript { allprojects { repositories { jcenter() + google() } } task clean(type: Delete) { delete rootProject.buildDir } +ext { + compileSdkVersion = 27 + minSdkVersion = 16 + targetSdkVersion = compileSdkVersion + supportLibVersion = '27.1.1' + versionCode = 6 + versionName = '1.1.6' +} diff --git a/compresshelper/build.gradle b/compresshelper/build.gradle index 564362b..18f55fa 100644 --- a/compresshelper/build.gradle +++ b/compresshelper/build.gradle @@ -1,17 +1,15 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' -group='com.github.nanchen2251' // 指定group，com.github.<用户名> +group = 'com.github.nanchen2251' // 指定group，com.github.<用户名> android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" - + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { - minSdkVersion 11 - 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" @@ -25,12 +23,12 @@ android { } 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.1.1' - testCompile 'junit:junit:4.12' + implementation "com.android.support:appcompat-v7:$supportLibVersion" + testImplementation 'junit:junit:4.12' } // build a jar with source files @@ -40,7 +38,7 @@ task sourcesJar(type: Jar) { } task javadoc(type: Javadoc) { - failOnError false + failOnError false source = android.sourceSets.main.java.sourceFiles classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) classpath += configurations.compile diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..24e7c39 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-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip