From 21e89abc441c752b06894bde1efc7c6ac11b9ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Sj=C3=B6lander?= Date: Sun, 9 Feb 2014 20:55:18 +0100 Subject: [PATCH] bumped version and upgraded gradle wrapepr --- build.gradle | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 0 library/build.gradle | 6 +- maven_push.gradle | 81 ------------------------ 6 files changed, 6 insertions(+), 87 deletions(-) mode change 100644 => 100755 gradlew delete mode 100644 maven_push.gradle diff --git a/build.gradle b/build.gradle index 849b132..a098989 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.6.+' + classpath 'com.android.tools.build:gradle:0.7.+' } } diff --git a/gradle.properties b/gradle.properties index bd0f198..ab53b85 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=1.0.0 +VERSION_NAME=1.1.0 GROUP=se.emilsjolander POM_DESCRIPTION=A small android library for tagging views inside a ScrollView as "sticky" making them stick to the top of the scroll container until a new sticky view comes and takes it's place. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ab54246..6299cf9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/library/build.gradle b/library/build.gradle index 9b26536..a15de94 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'android-library' android { - compileSdkVersion 18 - buildToolsVersion '18.1.1' + compileSdkVersion 19 + buildToolsVersion '19.0.0' sourceSets { main { @@ -13,4 +13,4 @@ android { } } -apply from: '../maven_push.gradle' +apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/eaa6b5404b7594e6c23b884fdc5795f545db55dd/gradle-mvn-push.gradle' diff --git a/maven_push.gradle b/maven_push.gradle deleted file mode 100644 index 02b0037..0000000 --- a/maven_push.gradle +++ /dev/null @@ -1,81 +0,0 @@ -apply plugin: 'maven' -apply plugin: 'signing' - -if (isReleaseBuild()) { - println 'RELEASE BUILD' - sonatypeRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" -} else { - println 'DEBUG BUILD' - sonatypeRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/" -} - -afterEvaluate { project -> - uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - pom.artifactId = POM_ARTIFACT_ID - - repository(url: sonatypeRepositoryUrl) { - authentication(userName: SONATYPE_USERNAME, password: SONATYPE_PASSWORD) - } - - pom.project { - name POM_NAME - packaging POM_PACKAGING - description POM_DESCRIPTION - url POM_URL - - scm { - url POM_SCM_URL - connection POM_SCM_CONNECTION - developerConnection POM_SCM_DEV_CONNECTION - } - - licenses { - license { - name POM_LICENCE_NAME - url POM_LICENCE_URL - distribution POM_LICENCE_DIST - } - } - - developers { - developer { - id POM_DEVELOPER_ID - name POM_DEVELOPER_NAME - } - } - } - } - } - } - - signing { - required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } - sign configurations.archives - } - - task androidJavadocs(type: Javadoc) { - source = android.sourceSets.main.allJava - } - - task androidJavadocsJar(type: Jar) { - classifier = 'javadoc' - //basename = artifact_id - from androidJavadocs.destinationDir - } - - task androidSourcesJar(type: Jar) { - classifier = 'sources' - //basename = artifact_id - from android.sourceSets.main.allSource - } - - artifacts { - //archives packageReleaseJar - archives androidSourcesJar - archives androidJavadocsJar - } -}