Skip to content

Commit 4baaa56

Browse files
author
mcxiaoke
committed
fix and update gradle build
1 parent 79f7c78 commit 4baaa56

File tree

4 files changed

+5
-14
lines changed

4 files changed

+5
-14
lines changed

build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:2.0.0'
10-
classpath 'com.mcxiaoke.gradle:packer:1.0.+'
9+
classpath 'com.android.tools.build:gradle:2.2.2'
1110
}
1211
}
1312

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ POM_DEVELOPER_ID=mcxiaoke
1414
POM_DEVELOPER_NAME=Xiaoke Zhang
1515
POM_DEVELOPER_EMAIL=mail@mcxiaoke.com
1616

17-
ANDROID_BUILD_TARGET_SDK_VERSION=22
18-
ANDROID_BUILD_TOOLS_VERSION=22.0.1
19-
ANDROID_BUILD_SDK_VERSION=22
17+
ANDROID_BUILD_TARGET_SDK_VERSION=24
18+
ANDROID_BUILD_TOOLS_VERSION=24.0.3
19+
ANDROID_BUILD_SDK_VERSION=24
2020

2121
ANDROID_BUILD_MIN_SDK_VERSION=10

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-2.12-bin.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

samples/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'packer'
32

43
dependencies {
54
compile fileTree(dir: 'libs', include: ['*.jar'])
@@ -19,13 +18,6 @@ dependencies {
1918
compile 'io.reactivex:rxandroid:0.25.0'
2019
}
2120

22-
packer {
23-
archiveOutput = file(new File(project.rootProject.buildDir.path, "dist"))
24-
archiveNameFormat = 'myapp-${appPkg}-${flavorName}-${buildType}-v${versionName}'
25-
manifestMatcher = ['Promotion_Market']
26-
27-
}
28-
2921
android {
3022

3123
compileOptions {

0 commit comments

Comments
 (0)