From 8b2a8eb21488fea4df0273ef9f369ac5f764bad2 Mon Sep 17 00:00:00 2001 From: mar-v-in Date: Mon, 17 Aug 2015 00:58:23 +0200 Subject: [PATCH] Update maven --- unifiednlp-api/build.gradle | 6 +- unifiednlp-api/gradle-mvn-push.gradle | 114 -------------------------- unifiednlp-api/gradle.properties | 2 +- 3 files changed, 6 insertions(+), 116 deletions(-) delete mode 100644 unifiednlp-api/gradle-mvn-push.gradle diff --git a/unifiednlp-api/build.gradle b/unifiednlp-api/build.gradle index 653185f..66ea83f 100644 --- a/unifiednlp-api/build.gradle +++ b/unifiednlp-api/build.gradle @@ -19,10 +19,14 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' } } + apply plugin: 'com.android.library' -apply from: 'gradle-mvn-push.gradle' +apply plugin: 'com.github.dcendents.android-maven' + +version = '1.3.3' android { compileSdkVersion 22 diff --git a/unifiednlp-api/gradle-mvn-push.gradle b/unifiednlp-api/gradle-mvn-push.gradle deleted file mode 100644 index f5f4129..0000000 --- a/unifiednlp-api/gradle-mvn-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 - } -} diff --git a/unifiednlp-api/gradle.properties b/unifiednlp-api/gradle.properties index d8f7b6c..f96670a 100644 --- a/unifiednlp-api/gradle.properties +++ b/unifiednlp-api/gradle.properties @@ -1,6 +1,6 @@ GROUP=org.microg POM_ARTIFACT_ID=unifiednlp-api -VERSION_NAME=1.3.2 +VERSION_NAME=1.3.3 POM_NAME=µg UnifiedNlp API POM_DESCRIPTION=API interfaces and helpers to create backends for UnifiedNlp