diff --git a/.gitignore b/.gitignore index 565c6b8..82de854 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ local.properties Thumbs.db .DS_Store .idea -.gradle \ No newline at end of file +.gradle +*.iml diff --git a/MultiStateAnimation.iml b/MultiStateAnimation.iml deleted file mode 100644 index 8d49284..0000000 --- a/MultiStateAnimation.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/build.gradle b/build.gradle index 9bb7a31..97b85c0 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.3' - 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 + classpath 'com.android.tools.build:gradle:1.2.3' } } @@ -14,4 +11,4 @@ allprojects { repositories { mavenCentral() } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 593031d..baeac51 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,22 @@ -VERSION_NAME=0.1.0-SNAPSHOT +VERSION_NAME=1.0.0-SNAPSHOT VERSION_CODE=1 -GROUP=com.getkeepsafe +GROUP=com.getkeepsafe.android.multistateanimation + +POM_ARTIFACT_ID=MultiStateAnimation +POM_NAME=MultiStateAnimation +POM_PACKAGING=aar + +POM_DESCRIPTION=An Android library to create complex animations. +POM_INCEPTION_YEAR=2015 + +POM_URL=https://github.com/KeepSafe/MultiStateAnimation +POM_SCM_URL=https://github.com/KeepSafe/MultiStateAnimation +POM_SCM_CONNECTION=scm:git:git://github.com/KeepSafe/MultiStateAnimation.git +POM_SCM_DEV_CONNECTION=scm:git:git@github.com:KeepSafe/MultiStateAnimation.git -POM_DESCRIPTION=Android library to create complex animations. -POM_URL=https://github.com/KeepSafe/Android-DrawableAnimationSeries -POM_SCM_URL=https://github.com/KeepSafe/Android-DrawableAnimationSeries -POM_SCM_CONNECTION=scm:git:git://github.com/KeepSafe/Android-DrawableAnimationSeries.git -POM_SCM_DEV_CONNECTION=scm:git:git@github.com:KeepSafe/Android-DrawableAnimationSeries.git POM_LICENCE_NAME=Apache License 2.0 -POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0 +POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo -POM_DEVELOPER_ID=KeepSafe -POM_DEVELOPER_NAME=KeepSafe + +POM_DEVELOPER_ID=keepsafe +POM_DEVELOPER_NAME=KeepSafe Software, Inc. diff --git a/gradle/gradle-mvn-push.gradle b/gradle/gradle-mvn-push.gradle new file mode 100644 index 0000000..f5f4129 --- /dev/null +++ b/gradle/gradle-mvn-push.gradle @@ -0,0 +1,114 @@ +/* + * 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/library/build.gradle b/library/build.gradle index aab66c6..68f09cd 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,18 +1,21 @@ apply plugin: 'com.android.library' +group = GROUP +version = VERSION_NAME + repositories { mavenCentral() } android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" + compileSdkVersion 22 + buildToolsVersion '22.0.1' defaultConfig { minSdkVersion 1 - targetSdkVersion 21 + targetSdkVersion 22 versionCode 1 - versionName "1.0" + versionName '1.0.0' } sourceSets { @@ -31,4 +34,4 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) } -apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' \ No newline at end of file +apply from: file('../gradle/gradle-mvn-push.gradle') diff --git a/library/gradle.properties b/library/gradle.properties index fd709e9..081a7ab 100644 --- a/library/gradle.properties +++ b/library/gradle.properties @@ -1,3 +1,3 @@ -POM_NAME=Android-DrawableAnimationSeries +POM_NAME=MultiStateAnimation POM_ARTIFACT_ID=library -POM_PACKAGING=aar \ No newline at end of file +POM_PACKAGING=aar diff --git a/library/library.iml b/library/library.iml deleted file mode 100644 index 53ce146..0000000 --- a/library/library.iml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/build.gradle b/samples/build.gradle index 9bbe6ee..06afd4b 100644 --- a/samples/build.gradle +++ b/samples/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.0' + classpath 'com.android.tools.build:gradle:1.2.3' } } @@ -18,12 +18,12 @@ dependencies { } android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" + compileSdkVersion 22 + buildToolsVersion "22.0.1" defaultConfig { minSdkVersion 1 - targetSdkVersion 21 + targetSdkVersion 22 applicationId "com.getkeepsafe.android.multistateanimation.samples" versionCode 1 versionName "0.1.0" diff --git a/samples/samples.iml b/samples/samples.iml deleted file mode 100644 index c0ea637..0000000 --- a/samples/samples.iml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -