Skip to content

Commit 3bfbed9

Browse files
committed
Merge branch 'release/1.4.0'
2 parents 797b665 + 613f41d commit 3bfbed9

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'signing'
44

55
sourceCompatibility = 1.6
66
group = 'org.quanqi'
7-
version = "0.1.3"
7+
version = "0.1.4"
88

99
repositories {
1010
mavenCentral()

src/main/groovy/org/quanqi/gradle/signing/AndroidApplicationSigning.groovy

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ class AndroidApplicationSigning implements Plugin<Project> {
1111

1212
public static final String KEY_ANDROID_KEY_STORE_CONFIG = "ANDROID_KEY_STORE_CONFIG"
1313

14-
def String adjustPath(String path) {
14+
static def adjustPath(path) {
1515
if (path.startsWith('~/')) {
16-
// todo check this.
1716
path = path.replaceFirst('~', System.getProperty('user.home'))
1817
return path
1918
} else {
@@ -28,20 +27,22 @@ class AndroidApplicationSigning implements Plugin<Project> {
2827

2928
@Override
3029
void apply(Project project) {
30+
project.extensions.create("key_store", AndroidApplicationSigningExtension.class)
3131

3232
if (!project.plugins.findPlugin("com.android.application") && !project.plugins.findPlugin("android")) {
3333
throw new ProjectConfigurationException("The android plugin must be applied to the project", null)
3434
}
3535

36-
def keysXmlFile = null
36+
def keysXmlFile
3737
if (project.hasProperty(KEY_ANDROID_KEY_STORE_CONFIG)) {
3838
keysXmlFile = new File(KEY_ANDROID_KEY_STORE_CONFIG)
3939
} else {
4040
keysXmlFile = new File(System.getProperty('user.home'), '.android_key_store.xml')
4141
}
4242

4343
if (!keysXmlFile.exists()) {
44-
throw new FileNotFoundException(keysXmlFile.getAbsolutePath() + " dose not exits.")
44+
println("Signing config file not exist.")
45+
return
4546
}
4647

4748
def slurper = new XmlSlurper();
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package org.quanqi.gradle.signing
2+
3+
/**
4+
* Created by cindy on 12/29/14.
5+
*/
6+
class AndroidApplicationSigningExtension {
7+
}

0 commit comments

Comments
 (0)