From 801eda470df303bfb57a3ee2e52477557249f8c8 Mon Sep 17 00:00:00 2001 From: Emux Date: Thu, 8 Sep 2016 22:32:42 +0300 Subject: [PATCH] SNAPSHOT builds publish to Sonatype OSSRH, closes #165 --- build.gradle | 2 +- deploy.gradle | 7 +++++-- docs/Changelog.md | 3 ++- docs/Integration.md | 9 ++++++++- vtm-android-gdx/build.gradle | 3 +-- vtm-android/build.gradle | 3 +-- vtm-desktop/build.gradle | 3 +-- vtm-extras/build.gradle | 3 +-- vtm-gdx/build.gradle | 3 +-- vtm-http/build.gradle | 3 +-- vtm-ios/build.gradle | 3 +-- vtm-jeo/build.gradle | 3 +-- vtm-jts/build.gradle | 3 +-- vtm-themes/build.gradle | 3 +-- vtm/build.gradle | 3 +-- 15 files changed, 27 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index febf01d4..f3470db6 100644 --- a/build.gradle +++ b/build.gradle @@ -16,11 +16,11 @@ allprojects { ext.androidBuildVersionTools = "24.0.2" ext.gdxVersion = "1.9.4" - // Disable Java 8 doclint if (JavaVersion.current().isJava8Compatible()) { tasks.withType(Javadoc) { options.addStringOption('Xdoclint:none', '-quiet') logging.captureStandardError LogLevel.INFO + logging.captureStandardOutput LogLevel.INFO } } } diff --git a/deploy.gradle b/deploy.gradle index 152f1842..d53b7202 100644 --- a/deploy.gradle +++ b/deploy.gradle @@ -1,6 +1,6 @@ apply plugin: 'signing' -if (project.hasProperty("android")) { // Android libraries +if (project.hasProperty("android")) { task sourcesJar(type: Jar) { classifier = 'sources' from android.sourceSets.main.java.srcDirs @@ -12,7 +12,7 @@ if (project.hasProperty("android")) { // Android libraries classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) exclude 'android-logger.properties' } -} else { // Java libraries +} else { task sourcesJar(type: Jar) { classifier = 'sources' from sourceSets.main.allSource @@ -42,6 +42,9 @@ uploadArchives { repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { authentication(userName: SONATYPE_USERNAME, password: SONATYPE_PASSWORD) } + snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { + authentication(userName: SONATYPE_USERNAME, password: SONATYPE_PASSWORD) + } pom.project { packaging 'jar' diff --git a/docs/Changelog.md b/docs/Changelog.md index 550a7ba5..60efc38b 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -18,6 +18,7 @@ - Graphics API platform enhancements [#92](https://github.com/mapsforge/vtm/issues/92) - vtm-jts module [#53](https://github.com/mapsforge/vtm/issues/53) - vtm-http module [#140](https://github.com/mapsforge/vtm/issues/140) -- Internal render themes various enhancements +- Internal render themes various enhancements [#41](https://github.com/mapsforge/mapsforge/issues/41) +- SNAPSHOT builds publish to Sonatype OSSRH [#165](https://github.com/mapsforge/mapsforge/issues/165) - Many other minor improvements and bug fixes - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aissue+is%3Aclosed+milestone%3A0.6.0) diff --git a/docs/Integration.md b/docs/Integration.md index 310d6556..da58529d 100644 --- a/docs/Integration.md +++ b/docs/Integration.md @@ -53,9 +53,16 @@ The dependencies for Maven are declared in a similar way. For example: ``` +## Snapshots + +We publish regularly SNAPSHOT builds to Sonatype OSS Repository Hosting. To use `master-SNAPSHOT` version add as repository, e.g. in Gradle: +```groovy +maven { url "https://oss.sonatype.org/content/groups/public/" } +``` + ## JitPack -We support also [JitPack](https://jitpack.io/#mapsforge/vtm) for publishing. This can be used for the releases, but it's also useful for integrating SNAPSHOT builds in your application (not available in Maven Central). +We support also [JitPack](https://jitpack.io/#mapsforge/vtm) for releases or SNAPSHOT builds. For example in order to include the `vtm` module `master-SNAPSHOT` with Gradle. diff --git a/vtm-android-gdx/build.gradle b/vtm-android-gdx/build.gradle index 14f8666a..28a4f607 100644 --- a/vtm-android-gdx/build.gradle +++ b/vtm-android-gdx/build.gradle @@ -93,8 +93,7 @@ task run(dependsOn: 'installDebug') { } } -// Automated Gradle project deployment to Sonatype OSSRH -if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) { +if (project.hasProperty("SONATYPE_USERNAME")) { afterEvaluate { project.apply from: "${rootProject.projectDir}/deploy.gradle" } diff --git a/vtm-android/build.gradle b/vtm-android/build.gradle index f39e5cc3..86274ae9 100644 --- a/vtm-android/build.gradle +++ b/vtm-android/build.gradle @@ -66,8 +66,7 @@ android.libraryVariants.all { variant -> artifacts.add('archives', fatJar); } -// Automated Gradle project deployment to Sonatype OSSRH -if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) { +if (project.hasProperty("SONATYPE_USERNAME")) { afterEvaluate { project.apply from: "${rootProject.projectDir}/deploy.gradle" } diff --git a/vtm-desktop/build.gradle b/vtm-desktop/build.gradle index d1c5812c..a701a7a3 100644 --- a/vtm-desktop/build.gradle +++ b/vtm-desktop/build.gradle @@ -47,8 +47,7 @@ artifacts { mainClassName = 'org.oscim.gdx.GdxMapApp' run { ignoreExitValue = true } -// Automated Gradle project deployment to Sonatype OSSRH -if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) { +if (project.hasProperty("SONATYPE_USERNAME")) { afterEvaluate { project.apply from: "${rootProject.projectDir}/deploy.gradle" } diff --git a/vtm-extras/build.gradle b/vtm-extras/build.gradle index 67f57e35..32503bc8 100644 --- a/vtm-extras/build.gradle +++ b/vtm-extras/build.gradle @@ -14,8 +14,7 @@ sourceSets { main.resources.srcDirs = ['src'] } -// Automated Gradle project deployment to Sonatype OSSRH -if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) { +if (project.hasProperty("SONATYPE_USERNAME")) { afterEvaluate { project.apply from: "${rootProject.projectDir}/deploy.gradle" } diff --git a/vtm-gdx/build.gradle b/vtm-gdx/build.gradle index 40425541..f030897d 100644 --- a/vtm-gdx/build.gradle +++ b/vtm-gdx/build.gradle @@ -12,8 +12,7 @@ sourceSets { main.resources.srcDirs = ['src'] } -// Automated Gradle project deployment to Sonatype OSSRH -if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) { +if (project.hasProperty("SONATYPE_USERNAME")) { afterEvaluate { project.apply from: "${rootProject.projectDir}/deploy.gradle" } diff --git a/vtm-http/build.gradle b/vtm-http/build.gradle index e16fd1fd..4aae9007 100644 --- a/vtm-http/build.gradle +++ b/vtm-http/build.gradle @@ -10,8 +10,7 @@ sourceSets { main.java.srcDirs = ['src'] } -// Automated Gradle project deployment to Sonatype OSSRH -if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) { +if (project.hasProperty("SONATYPE_USERNAME")) { afterEvaluate { project.apply from: "${rootProject.projectDir}/deploy.gradle" } diff --git a/vtm-ios/build.gradle b/vtm-ios/build.gradle index fd6aef51..cb6bcafb 100644 --- a/vtm-ios/build.gradle +++ b/vtm-ios/build.gradle @@ -73,8 +73,7 @@ artifacts { archives fatJar } -// Automated Gradle project deployment to Sonatype OSSRH -if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) { +if (project.hasProperty("SONATYPE_USERNAME")) { afterEvaluate { project.apply from: "${rootProject.projectDir}/deploy.gradle" } diff --git a/vtm-jeo/build.gradle b/vtm-jeo/build.gradle index 5e61c2aa..861bb088 100644 --- a/vtm-jeo/build.gradle +++ b/vtm-jeo/build.gradle @@ -16,8 +16,7 @@ sourceSets { main.resources.srcDirs = ['src'] } -// Automated Gradle project deployment to Sonatype OSSRH -if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) { +if (project.hasProperty("SONATYPE_USERNAME")) { afterEvaluate { project.apply from: "${rootProject.projectDir}/deploy.gradle" } diff --git a/vtm-jts/build.gradle b/vtm-jts/build.gradle index 7ee9b784..3fa4e6b9 100644 --- a/vtm-jts/build.gradle +++ b/vtm-jts/build.gradle @@ -10,8 +10,7 @@ sourceSets { main.java.srcDirs = ['src'] } -// Automated Gradle project deployment to Sonatype OSSRH -if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) { +if (project.hasProperty("SONATYPE_USERNAME")) { afterEvaluate { project.apply from: "${rootProject.projectDir}/deploy.gradle" } diff --git a/vtm-themes/build.gradle b/vtm-themes/build.gradle index f7e3f497..7285dd7f 100644 --- a/vtm-themes/build.gradle +++ b/vtm-themes/build.gradle @@ -10,8 +10,7 @@ sourceSets { main.resources.srcDirs = ['resources'] } -// Automated Gradle project deployment to Sonatype OSSRH -if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) { +if (project.hasProperty("SONATYPE_USERNAME")) { afterEvaluate { project.apply from: "${rootProject.projectDir}/deploy.gradle" } diff --git a/vtm/build.gradle b/vtm/build.gradle index 1a21b8ff..ad7de082 100644 --- a/vtm/build.gradle +++ b/vtm/build.gradle @@ -14,8 +14,7 @@ sourceSets { main.compileClasspath += configurations.providedCompile } -// Automated Gradle project deployment to Sonatype OSSRH -if (isReleaseVersion && project.hasProperty("SONATYPE_USERNAME")) { +if (project.hasProperty("SONATYPE_USERNAME")) { afterEvaluate { project.apply from: "${rootProject.projectDir}/deploy.gradle" }