diff --git a/EdgeEffectOverride/build.gradle b/EdgeEffectOverride/build.gradle index 22425fa..545ed18 100644 --- a/EdgeEffectOverride/build.gradle +++ b/EdgeEffectOverride/build.gradle @@ -21,5 +21,5 @@ dependencies { compile 'com.android.support:support-v4:18.0.+' } -// directions for mvn-push: https://github.com/chrisbanes/gradle-mvn-push -//apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' \ No newline at end of file +// directions for mvn-push: https://github.com/Vorlonsoft/GradleMavenPush +//apply from: 'https://raw.github.com/Vorlonsoft/GradleMavenPush/master/maven-push.gradle' \ No newline at end of file diff --git a/EdgeEffectOverride/gradle.properties b/EdgeEffectOverride/gradle.properties index 0306a6d..4fb6987 100644 --- a/EdgeEffectOverride/gradle.properties +++ b/EdgeEffectOverride/gradle.properties @@ -1,3 +1,2 @@ POM_NAME=Edge Effect Override - Library -POM_ARTIFACT_ID=edgeeffectoverride -POM_PACKAGING=aar \ No newline at end of file +POM_ARTIFACT_ID=edgeeffectoverride \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 388b79a..86538fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,11 +4,9 @@ GROUP=uk.co.androidalliance POM_DESCRIPTION=The Edge Effect Override is an Android Library designed to help override the overscroll_edge and overscroll_glow effects used by the EdgeEffect class. POM_URL=https://github.com/AndroidAlliance/EdgeEffectOverride -POM_SCM_URL=https://github.com/AndroidAlliance/EdgeEffectOverride POM_SCM_CONNECTION=scm:git://androidalliance.github.com/AndroidAlliance/EdgeEffectOverride.git -POM_SCM_DEV_CONNECTION=scm:git@androidalliance.github.com:AndroidAlliance/EdgeEffectOverride.git POM_LICENCE_NAME=The Apache Software License, Version 2.0 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt -POM_LICENCE_DIST=repo POM_DEVELOPER_ID=androidalliance POM_DEVELOPER_NAME=Android Alliance +POM_DEVELOPER_EMAIL=hello@androidalliance.co.uk diff --git a/maven_push.gradle b/maven_push.gradle deleted file mode 100644 index 7b2d95c..0000000 --- a/maven_push.gradle +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright 2013 Chris Banes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'maven' -apply plugin: 'signing' - -def isReleaseBuild() { - return VERSION_NAME.contains("SNAPSHOT") == false -} - -def getReleaseRepositoryUrl() { - return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL - : "https://oss.sonatype.org/service/local/staging/deploy/maven2/" -} - -def getSnapshotRepositoryUrl() { - return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL - : "https://oss.sonatype.org/content/repositories/snapshots/" -} - -def getRepositoryUsername() { - return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : "" -} - -def getRepositoryPassword() { - return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "" -} - -afterEvaluate { project -> - uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - pom.groupId = GROUP - pom.artifactId = POM_ARTIFACT_ID - pom.version = VERSION_NAME - - repository(url: getReleaseRepositoryUrl()) { - authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) - } - snapshotRepository(url: getSnapshotRepositoryUrl()) { - authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) - } - - 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.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - } - - task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { - classifier = 'javadoc' - from androidJavadocs.destinationDir - } - - task androidSourcesJar(type: Jar) { - classifier = 'sources' - from android.sourceSets.main.java.sourceFiles - } - - artifacts { - archives androidSourcesJar - archives androidJavadocsJar - } -} \ No newline at end of file