diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..6564d52 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Switcher.iml b/Switcher.iml index c99efc0..5a92902 100644 --- a/Switcher.iml +++ b/Switcher.iml @@ -1,5 +1,5 @@ - + diff --git a/build.gradle b/build.gradle index 741f70e..2689390 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,19 @@ buildscript { } allprojects { + + version = VERSION_NAME + + group = GROUP + repositories { - jcenter() + mavenCentral() } } + +def isReleaseBuild() { + + return version.contains("SNAPSHOT") == false + +} + diff --git a/maven.gradle b/maven.gradle deleted file mode 100644 index 1bd7cc7..0000000 --- a/maven.gradle +++ /dev/null @@ -1,112 +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.allJava - //} - - //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 - } -} diff --git a/sample/sample.iml b/sample/sample.iml index 5fe8c3a..8167d35 100644 --- a/sample/sample.iml +++ b/sample/sample.iml @@ -1,5 +1,5 @@ - + diff --git a/switcher-library/build.gradle b/switcher-library/build.gradle index 2d2213c..188d8df 100644 --- a/switcher-library/build.gradle +++ b/switcher-library/build.gradle @@ -21,3 +21,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) } + +//apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' diff --git a/switcher-library/switcher-library.iml b/switcher-library/switcher-library.iml index 7e415c6..ddaa637 100644 --- a/switcher-library/switcher-library.iml +++ b/switcher-library/switcher-library.iml @@ -1,5 +1,5 @@ - + @@ -63,6 +63,7 @@ + @@ -82,6 +83,7 @@ +