diff --git a/build.gradle b/build.gradle index 444af31..b5bd302 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,6 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.1.0' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2' - classpath 'com.github.dcendents:android-maven-plugin:1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -19,4 +17,4 @@ allprojects { repositories { jcenter() } -} +} \ No newline at end of file diff --git a/demo-project/DrawAPictiure/build.gradle b/demo-project/DrawAPictiure/build.gradle index a7a8ccd..81070e9 100644 --- a/demo-project/DrawAPictiure/build.gradle +++ b/demo-project/DrawAPictiure/build.gradle @@ -7,7 +7,6 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:1.2.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/demo-project/DrawAPictiure/cirlib/build.gradle b/demo-project/DrawAPictiure/cirlib/build.gradle index 47e81e1..c5bdd9a 100755 --- a/demo-project/DrawAPictiure/cirlib/build.gradle +++ b/demo-project/DrawAPictiure/cirlib/build.gradle @@ -28,4 +28,4 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) } -// apply from: '../gradle-mvn-push.gradle' +// apply from: 'https://raw.github.com/Vorlonsoft/GradleMavenPush/master/maven-push.gradle' diff --git a/demo-project/DrawAPictiure/color-picker-view/bintrayupl.gradle b/demo-project/DrawAPictiure/color-picker-view/bintrayupl.gradle deleted file mode 100755 index 6895b0d..0000000 --- a/demo-project/DrawAPictiure/color-picker-view/bintrayupl.gradle +++ /dev/null @@ -1,87 +0,0 @@ -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: 'com.jfrog.bintray' - -version = libraryVersion -group = publishedGroupId // Maven Group ID for the artifact - - -install { - repositories.mavenInstaller { - // This generates POM.xml with proper parameters - pom { - project { - packaging 'aar' - groupId publishedGroupId - artifactId artifact - - // Add your description here - name libraryName - description libraryDescription - url siteUrl - - // Set your license - licenses { - license { - name licenseName - url licenseUrl - } - } - developers { - developer { - id developerId - name developerName - email developerEmail - } - } - scm { - connection gitUrl - developerConnection gitUrl - url siteUrl - - } - } - } - } -} - - - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} -artifacts { - archives javadocJar - archives sourcesJar -} - -// Bintray -Properties properties = new Properties() -properties.load(project.rootProject.file('local.properties').newDataInputStream()) - -bintray { - user = properties.getProperty("bintray.user") - key = properties.getProperty("bintray.apikey") - - configurations = ['archives'] - pkg { - repo = bintrayRepo - name = bintrayName - desc = libraryDescription - websiteUrl = siteUrl - vcsUrl = gitUrl - licenses = allLicenses - publish = true - publicDownloadNumbers = true - } -} \ No newline at end of file diff --git a/demo-project/DrawAPictiure/color-picker-view/build.gradle b/demo-project/DrawAPictiure/color-picker-view/build.gradle index 8290d28..7ffc4cf 100755 --- a/demo-project/DrawAPictiure/color-picker-view/build.gradle +++ b/demo-project/DrawAPictiure/color-picker-view/build.gradle @@ -19,28 +19,4 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) } -ext { - bintrayRepo = 'maven' - bintrayName = 'color-picker-view' - - publishedGroupId = 'afzkl.development' - libraryName = 'ColorPickerView' - artifact = 'color-picker-view' - - libraryDescription = 'A simple good looking color picker component for Android.' - - siteUrl = 'https://github.com/danielnilsson9/color-picker-view' - gitUrl = 'https://github.com/danielnilsson9/color-picker-view.git' - - libraryVersion = '1.3.0' - - developerId = 'danielnilsson9' - developerName = 'Daniel Nilsson' - developerEmail = 'daniel.nilsson.9@gmail.com' - - licenseName = 'The Apache Software License, Version 2.0' - licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt' - allLicenses = ["Apache-2.0"] -} - -apply from: 'bintrayupl.gradle' \ No newline at end of file +apply from: 'https://raw.github.com/Vorlonsoft/GradleMavenPush/master/maven-push.gradle' \ No newline at end of file diff --git a/demo-project/DrawAPictiure/color-picker-view/gradle.properties b/demo-project/DrawAPictiure/color-picker-view/gradle.properties new file mode 100644 index 0000000..cc4a71b --- /dev/null +++ b/demo-project/DrawAPictiure/color-picker-view/gradle.properties @@ -0,0 +1,22 @@ +IS_JCENTER = true +NEXUS_USERNAME = ... +NEXUS_PASSWORD = ... + +signing.keyId = ... +signing.password = ... +signing.secretKeyRingFile = ... + +POM_ARTIFACT_ID = color-picker-view +POM_NAME = ColorPickerView + +GROUP = afzkl.development +VERSION_NAME = 1.3.0 + +POM_DESCRIPTION = A simple good looking color picker component for Android. +POM_URL = https://github.com/danielnilsson9/color-picker-view +POM_LICENCE_NAME = The Apache Software License, Version 2.0 +POM_LICENCE_URL = http://www.apache.org/licenses/LICENSE-2.0.txt +POM_DEVELOPER_ID = danielnilsson9 +POM_DEVELOPER_NAME = Daniel Nilsson +POM_DEVELOPER_EMAIL = daniel.nilsson.9@gmail.com +POM_SCM_CONNECTION = scm:git@github.com:danielnilsson9/color-picker-view.git \ No newline at end of file diff --git a/demo-project/DrawAPictiure/materiallog/build.gradle b/demo-project/DrawAPictiure/materiallog/build.gradle index b09d260..def437f 100755 --- a/demo-project/DrawAPictiure/materiallog/build.gradle +++ b/demo-project/DrawAPictiure/materiallog/build.gradle @@ -22,8 +22,8 @@ android { dependencies { } -//apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' -apply from: './gradle-mvn-push.gradle' + +apply from: 'https://raw.github.com/Vorlonsoft/GradleMavenPush/master/maven-push.gradle' diff --git a/demo-project/DrawAPictiure/materiallog/gradle-mvn-push.gradle b/demo-project/DrawAPictiure/materiallog/gradle-mvn-push.gradle deleted file mode 100755 index f5f4129..0000000 --- a/demo-project/DrawAPictiure/materiallog/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/demo-project/DrawAPictiure/materiallog/gradle.properties b/demo-project/DrawAPictiure/materiallog/gradle.properties index 45f57be..328c127 100755 --- a/demo-project/DrawAPictiure/materiallog/gradle.properties +++ b/demo-project/DrawAPictiure/materiallog/gradle.properties @@ -19,7 +19,6 @@ POM_NAME=MaterialDialog Library POM_ARTIFACT_ID=library -POM_PACKAGING=aar VERSION_NAME=1.2.3 VERSION_CODE=9 @@ -27,11 +26,9 @@ GROUP=me.drakeet.materialdialog POM_DESCRIPTION=An Android library for conveniently building Material Design Dialog in Android version 2.2 ~ L. POM_URL=https://github.com/drakeet/MaterialDialog -POM_SCM_URL=https://github.com/drakeet/MaterialDialog POM_SCM_CONNECTION=scm:git@github.com:drakeet/MaterialDialog.git -POM_SCM_DEV_CONNECTION=scm:git@github.com:drakeet/MaterialDialog.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=drakeet -POM_DEVELOPER_NAME=drakeet \ No newline at end of file +POM_DEVELOPER_NAME=drakeet +POM_DEVELOPER_EMAIL=drakeet@github.com \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f30a0a1..b11c3d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,12 +17,9 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #project -project.name=just-we-tools -project.groupId=com.github.lfkdsk -project.artifactId=just-we-tools -project.packaging=aar -project.siteUrl=https://github.com/lfkdsk/JustWeTools -project.gitUrl=https://github.com/lfkdsk/JustWeTools.git -project.packageName=com.lfk.justwetools -#javadoc -javadoc.name=just-we-tools \ No newline at end of file +GROUP = com.github.lfkdsk + +POM_ARTIFACT_ID = just-we-tools +POM_NAME = just-we-tools +POM_URL = https://github.com/lfkdsk/JustWeTools +POM_SCM_CONNECTION = scm:git@github.com:lfkdsk/JustWeTools.git diff --git a/simple/build.gradle b/simple/build.gradle index 3cd8722..336aa9c 100644 --- a/simple/build.gradle +++ b/simple/build.gradle @@ -1,28 +1,4 @@ apply plugin: 'com.android.application' -ext { - - bintrayRepo = 'maven' - bintrayName = 'just-we-tools' - - publishedGroupId = 'com.github.lfkdsk' - libraryName = 'just-we-tools' - artifact = 'just-we-tools' - - libraryDescription = 'Some useful tools' - - siteUrl = 'https://github.com/lfkdsk/JustWeTools' - gitUrl = 'https://github.com/lfkdsk/JustWeTools.git' - - libraryVersion = '0.9.2' - - developerId = 'JustWe' - developerName = 'lfkdsk' - developerEmail = 'lfk_dsk@hotmail.com' - - licenseName = 'The Apache Software License, Version 2.0' - licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt' - allLicenses = ["Apache-2.0"] -} android { compileSdkVersion 23 buildToolsVersion '23.0.2' @@ -50,3 +26,5 @@ dependencies { compile 'com.android.support:appcompat-v7:23.1.1' compile project(':justwetools') } + +apply from: 'https://raw.github.com/Vorlonsoft/GradleMavenPush/master/maven-push.gradle' \ No newline at end of file diff --git a/simple/gradle.properties b/simple/gradle.properties new file mode 100644 index 0000000..d17dc76 --- /dev/null +++ b/simple/gradle.properties @@ -0,0 +1,22 @@ +IS_JCENTER = true +NEXUS_USERNAME = ... +NEXUS_PASSWORD = ... + +signing.keyId = ... +signing.password = ... +signing.secretKeyRingFile = ... + +POM_ARTIFACT_ID = just-we-tools +POM_NAME = just-we-tools + +GROUP = com.github.lfkdsk +VERSION_NAME = 0.9.2 + +POM_DESCRIPTION = Some useful tools +POM_URL = https://github.com/lfkdsk/JustWeTools +POM_LICENCE_NAME = The Apache Software License, Version 2.0 +POM_LICENCE_URL = http://www.apache.org/licenses/LICENSE-2.0.txt +POM_DEVELOPER_ID = JustWe +POM_DEVELOPER_NAME = lfkdsk +POM_DEVELOPER_EMAIL = lfk_dsk@hotmail.com +POM_SCM_CONNECTION = scm:git@github.com:lfkdsk/JustWeTools.git \ No newline at end of file