diff --git a/CHANGELOG.md b/CHANGELOG.md index fa49b8be..cee33081 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,21 @@ # Change Log -Version 0.7.0 *(In development)* --------------------------------- +Version 0.7.0 *(2018-01-15)* +---------------------------- + +- Remove duplicate jar task from archives configuration [\#39](https://github.com/vanniktech/gradle-maven-publish-plugin/pull/39) ([marcphilipp](https://github.com/marcphilipp)) +- Remove sudo: false from travis config. [\#36](https://github.com/vanniktech/gradle-maven-publish-plugin/pull/36) ([vanniktech](https://github.com/vanniktech)) +- Migrate general parts of the plugin to Kotlin [\#35](https://github.com/vanniktech/gradle-maven-publish-plugin/pull/35) ([gabrielittner](https://github.com/gabrielittner)) +- Migrate Upload task creation to Kotlin [\#33](https://github.com/vanniktech/gradle-maven-publish-plugin/pull/33) ([gabrielittner](https://github.com/gabrielittner)) +- Experimental implementation of Configurer that uses maven-publish [\#32](https://github.com/vanniktech/gradle-maven-publish-plugin/pull/32) ([gabrielittner](https://github.com/gabrielittner)) +- Create interface to capsulate maven plugin specific configuration [\#31](https://github.com/vanniktech/gradle-maven-publish-plugin/pull/31) ([gabrielittner](https://github.com/gabrielittner)) +- Improve when signing tasks run, consider all targets for signing [\#30](https://github.com/vanniktech/gradle-maven-publish-plugin/pull/30) ([gabrielittner](https://github.com/gabrielittner)) +- Cosmetic changes. [\#26](https://github.com/vanniktech/gradle-maven-publish-plugin/pull/26) ([vanniktech](https://github.com/vanniktech)) +- Combined configuration and task creation for targets [\#25](https://github.com/vanniktech/gradle-maven-publish-plugin/pull/25) ([gabrielittner](https://github.com/gabrielittner)) +- Reuse MavenDeployer configuration [\#24](https://github.com/vanniktech/gradle-maven-publish-plugin/pull/24) ([gabrielittner](https://github.com/gabrielittner)) +- Add the ability to specify targets and push to multiple maven repos. [\#23](https://github.com/vanniktech/gradle-maven-publish-plugin/pull/23) ([budius](https://github.com/budius)) + +Thanks to @gabrielittner @marcphilipp @budius & @WellingtonCosta for their contributions. Version 0.6.0 *(2018-09-11)* ---------------------------- diff --git a/README.md b/README.md index 1512b902..ab6b0316 100755 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.vanniktech:gradle-maven-publish-plugin:0.6.0' + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.7.0' } } @@ -31,19 +31,44 @@ classpath 'com.vanniktech:gradle-maven-publish-plugin:0.7.0-SNAPSHOT' ## Configuration -Those are all the available configurations - shown with default values and their types. More information can be found in the [Documentation of the Extension](src/test/kotlin/com/vanniktech/maven/publish/MavenPublishPluginExtensionTest.kt). +Those are all the available configurations - shown with default values and their types. More information can be found in the [Documentation of the Extension](src/main/kotlin/com/vanniktech/maven/publish/MavenPublishPluginExtension.kt). ```groovy mavenPublish { - releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" - snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/" - repositoryUsername = null // This defaults to either the SONATYPE_NEXUS_USERNAME Gradle property or the system environment variable. - repositoryPassword = null // This defaults to either the SONATYPE_NEXUS_PASSWORD Gradle property or the system environment variable. + targets { + uploadArchives { + releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" + snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/" + repositoryUsername = null // This defaults to either the SONATYPE_NEXUS_USERNAME Gradle property or the system environment variable. + repositoryPassword = null // This defaults to either the SONATYPE_NEXUS_PASSWORD Gradle property or the system environment variable. + } + } } ``` Once you've configured this and defined the typical pom attributes via Gradle properties you can upload your library using the `uploadArchives` task. +If you need to upload to multiple repositories you can also add additional targets. + +```groovy +mavenPublish { + targets { + uploadArchives { + // Configure as above. + } + + internalRepo { + // Configure as above. + } + + betaRepo { + // Configure as above. + } + } +} + +This will create `uploadArchivesInternalRepo` and `uploadArchivesBetaRepo` tasks. + __Note:__ To prevent looping behavior, especially in Kotlin projects / modules, you need to run the `uploadArchives` task with `--no-daemon`and `--no-parallel` flags: `./gradlew uploadArchives --no-daemon --no-parallel` diff --git a/build.gradle b/build.gradle index c4ae3fb0..303ea78f 100755 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0' classpath 'com.vanniktech:gradle-code-quality-tools-plugin:0.10.0' classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.11.0' - classpath 'com.vanniktech:gradle-maven-publish-plugin:0.6.0' + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.7.0' } } @@ -100,7 +100,7 @@ pluginBundle { } } -task wrapper(type: Wrapper) { - gradleVersion = '4.10.2' +wrapper { + gradleVersion = '5.1.1' distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle.properties b/gradle.properties index 31256c79..d211b9dd 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.vanniktech -VERSION_NAME=0.7.0-SNAPSHOT +VERSION_NAME=0.7.0 POM_ARTIFACT_ID=gradle-maven-publish-plugin POM_NAME=Gradle Maven Publish Plugin diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 29953ea1..87b738cb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d76b502e..c4486d47 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists