Prepare release

Author: martijndwars

CHANGELOG.md

@@ -1,5 +1,6 @@
 # 4.0.0
 
-* Support [aes128gcm content encoding](https://tools.ietf.org/html/draft-ietf-httpbis-encryption-encoding-09#section-2)
+* Support [aes128gcm content encoding](https://tools.ietf.org/html/draft-ietf-httpbis-encryption-encoding-09#section-2) (#72)
   * Use `PushService.send(Notification, Encoding)` or the analogous `sendAsync` with `Encoding.AES128GCM`.
+* Remove Guava dependency (#69)
 

RELEASE.md

@@ -10,13 +10,13 @@
 
 ```
 git commit -m "Release NEW_VERSION"
-git tag -a NEW_VERSION
+git tag -a NEW_VERSION -m "Version NEW_VERSION"
 ```
 
 3. [Deploy to OSSRH with Gradle](http://central.sonatype.org/pages/gradle.html):
 
 ```
-./gradlew -Prelease uploadArchives
+./gradlew -Prelease clean publish
 ```
 
 4. [Releasing the Deployment](http://central.sonatype.org/pages/releasing-the-deployment.html):
@@ -25,11 +25,10 @@ git tag -a NEW_VERSION
 ./gradlew -Prelease closeAndReleaseRepository
 ```
 
-5. Increment to next version with -SNAPSHOT suffix
+5. Increment to next version and add a -SNAPSHOT suffix
 
 ```
 ./scripts/version.sh OLD_VERSION NEW_VERSION-SNAPSHOT
-...
 ```
 
 6. Create a commit for the new version "Set version to a.b.c-SNAPSHOT"

build.gradle

@@ -3,15 +3,11 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '4.0.2'
 
     // Used by release.gradle
-    id 'maven'
+    id 'maven-publish'
     id 'signing'
     id 'io.codearte.nexus-staging' version '0.12.0'
 }
 
-if (hasProperty('release')) {
-    apply from: 'release.gradle'
-}
-
 apply plugin: 'application'
 apply plugin: 'com.github.johnrengelman.shadow'
 
@@ -103,5 +99,10 @@ task sourcesJar(type: Jar) {
 }
 
 artifacts {
-    archives javadocJar, sourcesJar
+    archives javadocJar
+    archives sourcesJar
+}
+
+if (hasProperty('release')) {
+    apply from: 'release.gradle'
 }

release.gradle

@@ -1,55 +1,54 @@
-signing {
-    sign configurations.archives
-}
-
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            beforeDeployment { MavenDeployment deployment ->
-                signing.signPom(deployment)
-            }
-
-            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                authentication(
-                    userName: ossrhUsername,
-                    password: ossrhPassword
-                )
-            }
-
-            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                authentication(
-                    userName: ossrhUsername,
-                    password: ossrhPassword
-                )
-            }
-
-            pom.project {
-                name 'web-push'
-                packaging 'jar'
-                description 'A Web Push library for Java.'
-                url 'https://github.com/web-push-libs/webpush-java'
-
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            artifact sourcesJar
+            artifact javadocJar
+            pom {
+                name = 'web-push'
+                description = 'A Web Push library for Java.'
+                url = 'https://github.com/web-push-libs/webpush-java'
                 scm {
-                    connection 'scm:git:[email protected]:web-push-libs/webpush-java.git'
-                    developerConnection 'scm:git:[email protected]:web-push-libs/webpush-java.git'
-                    url '[email protected]:web-push-libs/webpush-java.git'
+                    connection = 'scm:git:[email protected]:web-push-libs/webpush-java.git'
+                    developerConnection = 'scm:git:[email protected]:web-push-libs/webpush-java.git'
+                    url = '[email protected]:web-push-libs/webpush-java.git'
                 }
-
                 licenses {
                     license {
-                        name 'MIT License'
-                        url 'https://opensource.org/licenses/MIT'
+                        name = 'MIT License'
+                        url = 'https://opensource.org/licenses/MIT'
                     }
                 }
-
                 developers {
                     developer {
-                        id 'martijndwars'
-                        name 'Martijn Dwars'
-                        email '[email protected]'
+                        id = 'martijndwars'
+                        name = 'Martijn Dwars'
+                        email = '[email protected]'
                     }
                 }
             }
+
+        }
+    }
+    repositories {
+        maven {
+            credentials {
+                username ossrhUsername
+                password ossrhPassword
+            }
+            url getRepositoryUrl()
         }
     }
 }
+
+signing {
+    sign publishing.publications.mavenJava
+}
+
+def getRepositoryUrl() {
+    if (version.endsWith('SNAPSHOT')) {
+        return 'https://oss.sonatype.org/content/repositories/snapshots/'
+    } else {
+        return 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+    }
+}