Skip to content

Commit 82fd8b1

Browse files
author
zagum
committed
gradle refactoring & versions update
1 parent 0f2d2db commit 82fd8b1

File tree

4 files changed

+40
-29
lines changed

4 files changed

+40
-29
lines changed

build.gradle

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
11
buildscript {
2-
repositories {
3-
jcenter()
4-
}
5-
dependencies {
6-
classpath 'com.android.tools.build:gradle:2.3.0-beta1'
7-
}
2+
repositories {
3+
jcenter()
4+
}
5+
dependencies {
6+
classpath 'com.android.tools.build:gradle:2.3.0'
7+
}
88
}
99

1010
allprojects {
11-
repositories {
12-
jcenter()
13-
}
11+
repositories {
12+
jcenter()
13+
}
14+
}
15+
16+
ext {
17+
compileSdkVersion = 25
18+
buildToolsVersion = '25.0.2'
19+
minSdkVersion = 15
20+
targetSdkVersion = compileSdkVersion
21+
22+
supportLibVersion = '25.3.0'
1423
}
1524

1625
task clean(type: Delete) {
17-
delete rootProject.buildDir
26+
delete rootProject.buildDir
1827
}

expandicon-sample/build.gradle

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
apply plugin: 'com.android.application'
22

33
dependencies {
4-
compile project(':expandicon')
5-
compile 'com.android.support:appcompat-v7:25.1.0'
4+
compile project(':expandicon')
5+
compile "com.android.support:appcompat-v7:$supportLibVersion"
66
}
77

88
android {
9-
compileSdkVersion 25
10-
buildToolsVersion "25.0.2"
9+
compileSdkVersion rootProject.ext.compileSdkVersion
10+
buildToolsVersion rootProject.ext.buildToolsVersion
1111

12-
defaultConfig {
13-
applicationId "com.github.zagum.expandicon.sample"
14-
minSdkVersion 15
15-
targetSdkVersion 25
16-
versionCode 1
17-
versionName "1.0"
18-
}
12+
defaultConfig {
13+
applicationId "com.github.zagum.expandicon.sample"
14+
minSdkVersion rootProject.ext.minSdkVersion
15+
targetSdkVersion rootProject.ext.targetSdkVersion
16+
versionCode 1
17+
versionName "1.0"
18+
19+
vectorDrawables.useSupportLibrary = true
20+
}
1921
}

expandicon/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.library'
22

33
dependencies {
4-
compile 'com.android.support:support-annotations:25.1.0'
4+
compile "com.android.support:appcompat-v7:$supportLibVersion"
55
}
66

77
android {
8-
compileSdkVersion 25
9-
buildToolsVersion "25.0.2"
8+
compileSdkVersion rootProject.ext.compileSdkVersion
9+
buildToolsVersion rootProject.ext.buildToolsVersion
1010

11-
defaultConfig {
12-
minSdkVersion 15
13-
}
11+
defaultConfig {
12+
minSdkVersion rootProject.ext.minSdkVersion
13+
}
1414
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Jan 04 21:50:05 MSK 2017
1+
#Thu Mar 23 18:14:57 MSK 2017
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.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)