Skip to content

Commit 2d8123e

Browse files
committed
Clean gradle files
1 parent fad7205 commit 2d8123e

File tree

5 files changed

+44
-27
lines changed

5 files changed

+44
-27
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,6 @@ out/
2929
# Ignore gradle files
3030
.gradle/
3131
build/
32+
33+
# Private
34+
signing.properties

build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ buildscript {
66
}
77
dependencies {
88
classpath 'com.android.tools.build:gradle:1.2.3'
9-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
109
}
1110
}
1211

gradle/maven_push.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ afterEvaluate { project ->
108108

109109
task androidJavadocs(type: Javadoc) {
110110
source = android.sourceSets.main.java.srcDirs
111-
options {
112-
encoding = "UTF-8"
113-
}
111+
options {
112+
encoding = "UTF-8"
113+
}
114114
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
115115
}
116116

library/build.gradle

+12-22
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'com.github.dcendents.android-maven'
2+
3+
dependencies {
4+
testCompile 'junit:junit:4.12'
5+
testCompile 'org.robolectric:robolectric:3.0-rc3'
6+
testCompile 'com.squareup.assertj:assertj-android:1.0.0'
7+
}
38

49
android {
510
compileSdkVersion 22
@@ -9,20 +14,12 @@ android {
914
minSdkVersion 5
1015
targetSdkVersion 22
1116
}
12-
buildTypes {
13-
sourceSets {
14-
main {
15-
manifest.srcFile 'AndroidManifest.xml'
16-
java.srcDirs = ['src']
17-
resources.srcDirs = ['src']
18-
aidl.srcDirs = ['src']
19-
renderscript.srcDirs = ['src']
20-
res.srcDirs = ['res']
21-
}
22-
}
23-
release {
24-
minifyEnabled false
25-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
17+
18+
sourceSets {
19+
main {
20+
manifest.srcFile 'AndroidManifest.xml'
21+
java.srcDirs = ['src']
22+
res.srcDirs = ['res']
2623
}
2724
}
2825

@@ -32,13 +29,6 @@ android {
3229
}
3330
}
3431

35-
dependencies {
36-
testCompile 'com.squareup.assertj:assertj-android:1.0.0'
37-
testCompile 'org.robolectric:robolectric:2.4'
38-
testCompile 'junit:junit:4.12'
39-
compile 'com.android.support:support-v4:22.1.1'
40-
}
41-
4232
// build a jar with source files
4333
task sourcesJar(type: Jar) {
4434
from android.sourceSets.main.java.srcDirs

sample/build.gradle

+26-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@ apply plugin: 'com.android.application'
22

33
dependencies {
44
compile project(':library')
5+
compile 'com.android.support:support-v4:22.2.0'
56
compile 'com.squareup.okhttp:okhttp:2.4.0'
67
}
78

89
android {
910
compileSdkVersion 22
1011
buildToolsVersion "22.0.1"
1112

13+
defaultConfig {
14+
minSdkVersion 5
15+
targetSdkVersion 22
16+
}
17+
1218
sourceSets {
1319
main {
1420
manifest.srcFile 'AndroidManifest.xml'
@@ -19,6 +25,25 @@ android {
1925
}
2026

2127
lintOptions {
22-
abortOnError false
28+
abortOnError false
2329
}
2430
}
31+
32+
33+
File propFile = file('signing.properties');
34+
if (propFile.exists()) {
35+
def Properties props = new Properties()
36+
props.load(new FileInputStream(propFile))
37+
38+
if (props.containsKey('STORE_FILE') && props.containsKey('STORE_PASSWORD') &&
39+
props.containsKey('KEY_ALIAS') && props.containsKey('KEY_PASSWORD')) {
40+
android.signingConfigs.release.storeFile = file(props['STORE_FILE'])
41+
android.signingConfigs.release.storePassword = props['STORE_PASSWORD']
42+
android.signingConfigs.release.keyAlias = props['KEY_ALIAS']
43+
android.signingConfigs.release.keyPassword = props['KEY_PASSWORD']
44+
} else {
45+
android.buildTypes.release.signingConfig = null
46+
}
47+
} else {
48+
android.buildTypes.release.signingConfig = null
49+
}

0 commit comments

Comments
 (0)