Skip to content

Commit 81f4402

Browse files
committed
Fixed debug build, simplified sonatype for release only and updated gradle to 1.9 (gradle build tools 7.+
1 parent 707f970 commit 81f4402

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
}
55

66
dependencies {
7-
classpath 'com.android.tools.build:gradle:0.6.+'
7+
classpath 'com.android.tools.build:gradle:0.7.+'
88
}
99
}
1010

library/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ apply plugin: 'android-library'
33
android {
44
compileSdkVersion 19
55
buildToolsVersion '19.0.0'
6+
7+
lintOptions {
8+
abortOnError false
9+
}
610
}
711

812
android.libraryVariants.all { variant ->

maven_push.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if (isReleaseBuild()) {
1515
println 'DEBUG BUILD'
1616
sonatypeRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
1717
}
18-
18+
if(isReleaseBuild()){
1919
if (ext.properties.containsKey('signing.keyId') && !ext.properties.containsKey('signing.password')) {
2020
if (System.console())
2121
ext.set('signing.password', System.console().readPassword("\n\$ Type in GPG key password: "))
@@ -98,3 +98,4 @@ afterEvaluate { project ->
9898
archives androidJavadocsJar
9999
}
100100
}
101+
}

sample/build.gradle

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath 'com.android.tools.build:gradle:0.6.+'
6+
classpath 'com.android.tools.build:gradle:0.7.+'
77
}
88
}
99
apply plugin: 'android'
@@ -23,6 +23,16 @@ android {
2323
minSdkVersion 3
2424
targetSdkVersion 19
2525
}
26+
27+
lintOptions {
28+
abortOnError false
29+
}
30+
31+
packagingOptions {
32+
exclude 'META-INF/DEPENDENCIES'
33+
exclude 'META-INF/LICENSE'
34+
exclude 'META-INF/NOTICE'
35+
}
2636
}
2737

2838
dependencies {

0 commit comments

Comments
 (0)