Skip to content

Commit be7858f

Browse files
committed
gradle version upgrade
1 parent 8133ab1 commit be7858f

File tree

5 files changed

+43
-18
lines changed

5 files changed

+43
-18
lines changed

build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2+
apply from: 'dependencies.gradle'
23

34
buildscript {
45
repositories {
56
jcenter()
67
mavenCentral()
8+
google()
79
}
810
dependencies {
9-
classpath 'com.android.tools.build:gradle:2.3.3'
11+
classpath "com.android.tools.build:gradle:${build_gradle_version}"
1012

1113
// NOTE: Do not place your application dependencies here; they belong
1214
// in the individual module build.gradle files
13-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
14-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
15+
classpath "com.github.dcendents:android-maven-gradle-plugin:${android_maven_gradle_plugin}"
16+
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:${gradle_bintray_plugin}"
1517
}
1618
}
1719

cacheLib/build.gradle

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,19 @@ apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33
apply plugin: 'com.jfrog.bintray'
44

5-
version = "0.0.4"
6-
group = "com.dvsnier"
7-
85
def siteUrl = 'https://github.com/DovSnier/cacheKit'
96
def gitUrl = 'git@github.com:DovSnier/cacheKit.git'
107

118
android {
12-
compileSdkVersion 25
13-
buildToolsVersion "25.0.2"
9+
10+
compileSdkVersion rootProject.ext.compile_sdk_version
11+
buildToolsVersion rootProject.ext.build_tools_version
1412

1513
defaultConfig {
16-
minSdkVersion 10
17-
targetSdkVersion 26
18-
versionCode 4
19-
versionName version
14+
minSdkVersion rootProject.ext.min_sdk_version
15+
targetSdkVersion rootProject.ext.target_sdk_version
16+
versionCode rootProject.ext.version_code
17+
versionName rootProject.ext.version_name
2018

2119
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2220

@@ -31,11 +29,12 @@ android {
3129

3230
dependencies {
3331
compile fileTree(include: ['*.jar'], dir: 'libs')
34-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
32+
androidTestCompile("com.android.support.test.espresso:espresso-core:${rootProject.ext.espresso_core_version}", {
3533
exclude group: 'com.android.support', module: 'support-annotations'
3634
})
37-
testCompile 'junit:junit:4.12'
38-
compile 'com.android.support:support-compat:24.2.0'
35+
testCompile "junit:junit:${rootProject.ext.junit_version}"
36+
//noinspection GradleDependency
37+
compile "com.android.support:support-compat:${rootProject.ext.support_appcompat_version}"
3938
}
4039

4140
install {
@@ -58,7 +57,7 @@ install {
5857
developer {
5958
id 'dovsnier'
6059
name 'dovsnier'
61-
email '3086722095@qq.com'
60+
email 'dovsnier@qq.com'
6261
}
6362
}
6463

dependencies.gradle

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
ext {
2+
3+
//编译环境
4+
build_gradle_version = '3.1.3'
5+
compile_sdk_version = 27
6+
build_tools_version = '27.0.3'
7+
8+
// 配置环境
9+
min_sdk_version = 10
10+
target_sdk_version = 27
11+
version_code = 5
12+
version_name = "0.0.5"
13+
14+
// support SDK 配置
15+
support_appcompat_version = "24.2.0"
16+
junit_version = "4.12"
17+
espresso_core_version = "2.2.2"
18+
19+
}

gradle.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,8 @@ org.gradle.jvmargs=-Xmx4096m
1515
# This option should only be used with decoupled projects. More details, visit
1616
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1717
org.gradle.parallel=true
18+
org.gradle.daemon=true
19+
org.gradle.cache=true
20+
build_gradle_version=3.1.3
21+
android_maven_gradle_plugin=1.5
22+
gradle_bintray_plugin=1.7.1
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jun 23 12:32:53 CST 2017
1+
#Mon Jun 11 17:01:55 CST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

0 commit comments

Comments
 (0)