From 63b7c410c3cae1d53442df76cd55a829ede6cbda Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Wed, 2 Oct 2013 09:19:39 +0200 Subject: [PATCH] Prepared v0.1.1 --- EnhancedListView/build.gradle | 31 +++++++++++++------ EnhancedListView/src/main/AndroidManifest.xml | 4 +-- gradle/wrapper/gradle-wrapper.properties | 4 +-- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/EnhancedListView/build.gradle b/EnhancedListView/build.gradle index 79d5022..d04bf70 100644 --- a/EnhancedListView/build.gradle +++ b/EnhancedListView/build.gradle @@ -30,7 +30,7 @@ android { apply plugin: 'maven' apply plugin: 'signing' -version = "0.1.0" +version = "0.1.1" group = "de.timroes.android" configurations { @@ -39,12 +39,24 @@ configurations { } } -signing { - required { has("release") && gradle.taskGraph.hasTask("uploadArchives") } - sign configurations.archives -} +if(project.hasProperty("EnhancedListView.properties") && new File(project.property("EnhancedListView.properties")).exists()) { + + Properties props = new Properties() + props.load(new FileInputStream(file(project.property("EnhancedListView.properties")))) + + gradle.taskGraph.whenReady { taskGraph -> + if (taskGraph.allTasks.any { it instanceof Sign }) { + allprojects { ext."signing.keyId" = props['signing.keyId'] } + allprojects { ext."signing.secretKeyRingFile" = props['signing.secretKeyRingFile'] } + allprojects { ext."signing.password" = props['signing.password'] } + } + } + + signing { + required { has("release") && gradle.taskGraph.hasTask("uploadArchives") } + sign configurations.archives + } -if(project.hasProperty('sonatypeRepo') && project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) { uploadArchives { configuration = configurations.archives @@ -52,8 +64,8 @@ if(project.hasProperty('sonatypeRepo') && project.hasProperty('sonatypeUsername' beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - repository(url: sonatypeRepo) { - authentication(userName: sonatypeUsername, password: sonatypePassword ) + repository(url: props['sonatypeRepo']) { + authentication(userName: props['sonatypeUsername'], password: props['sonatypePassword']) } pom.project { @@ -89,4 +101,5 @@ if(project.hasProperty('sonatypeRepo') && project.hasProperty('sonatypeUsername' } } -} \ No newline at end of file + +} diff --git a/EnhancedListView/src/main/AndroidManifest.xml b/EnhancedListView/src/main/AndroidManifest.xml index 1201a7c..6debda4 100644 --- a/EnhancedListView/src/main/AndroidManifest.xml +++ b/EnhancedListView/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="2" + android:versionName="0.1.1"> diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6f78baf..fdb2b9a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Aug 30 00:06:34 CEST 2013 +#Wed Oct 02 09:18:15 CEST 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.7-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.7-all.zip