Merge pull request #295 from intercom/jn/migrate-publishing

Migrate publishing to maven central

Author: johnnynader

README.md

@@ -1,39 +1,34 @@
-[![Circle CI](https://circleci.com/gh/intercom/intercom-java.png?style=badge)](https://circleci.com/gh/intercom/intercom-java)
-
 # intercom-java
 
-Java bindings for the [Intercom API](https://api.intercom.io/docs)
+[![Circle CI](https://circleci.com/gh/intercom/intercom-java.svg?style=shield)](https://circleci.com/gh/intercom/intercom-java)
+[![Maven Central](https://img.shields.io/maven-central/v/io.intercom/intercom-java.svg?label=Maven%20Central)](https://search.maven.org/artifact/io.intercom/intercom-java)
+![Intercom API Version](https://img.shields.io/badge/Intercom%20API%20Version-1.3-blue)
 
- - [Installation](#add-a-dependency)
- - [Resources](#resources)
- - [Authorization](#authorization)
- - [Usage](#usage)
- - [Idioms](#idioms)
- - [Configuration](#configuration)
+Java bindings for the [Intercom API](https://api.intercom.io/docs)
 
+## Project Updates
 
-## Add a dependency
+### Retirement of Bintray/JCenter
 
-[ ![Download](https://api.bintray.com/packages/intercom/intercom-maven/intercom-java/images/download.svg) ](https://bintray.com/intercom/intercom-maven/intercom-java/_latestVersion)
+This project was previously publishing releases to JCenter, which is being retired by JFrog on May 1st 2021.
 
-The distribution is hosted on [bintray](https://bintray.com/intercom/intercom-maven/intercom-java/view).
-To use the client, you can add the jcenter repository to your dependencies.
+To allow continued access to past versions, we've migrated them to Maven Central.
 
-### Maven
+- [Installation](#add-a-dependency)
+- [Resources](#resources)
+- [Authorization](#authorization)
+- [Usage](#usage)
+- [Idioms](#idioms)
+- [Configuration](#configuration)
 
+## Add a dependency
 
-Add jcenter to your repositories in `pom.xml` or `settings.xml`:
+The distribution is hosted on [mavenCentral](https://search.maven.org/artifact/io.intercom/intercom-java).
+To use the client, you can add the mavenCentral repository to your dependencies.
 
-```xml
-<repositories>
-  <repository>
-    <id>jcenter</id>
-    <url>https://jcenter.bintray.com</url>
-  </repository>
-</repositories>
-```  
+### Maven
 
-and add the project declaration to your `pom.xml`:
+Add the project declaration to your `pom.xml`:
 
 ```xml
 <dependency>
@@ -45,28 +40,28 @@ and add the project declaration to your `pom.xml`:
 
 ### Gradle
 
-Add jcenter to your `repositories` block:
+Add mavenCentral to your `repositories` block:
 
 ```groovy
 repositories {
- jcenter()
+ mavenCentral()
 }
 ```
 
 and add the project to the `dependencies` block in your `build.gradle`:
 
 ```groovy
 dependencies {
-  compile 'io.intercom:intercom-java:2.8.1'
+  implementation 'io.intercom:intercom-java:2.8.1'
 }  
 ```
 
 ### SBT
 
-Add jcenter to your `resolvers` in your `build.sbt`:
+Add mavenCentral to your `resolvers` in your `build.sbt`:
 
 ```scala
-resolvers += "jcenter" at "https://jcenter.bintray.com"
+resolvers += "mavenCentral" at "https://repo1.maven.org/maven2"
 ```
 
 and add the project to your `libraryDependencies` in your `build.sbt`:
@@ -75,7 +70,6 @@ and add the project to your `libraryDependencies` in your `build.sbt`:
 libraryDependencies += "io.intercom" % "intercom-java" % "2.8.1"
 ```
 
-
 ## Resources
 
 Resources this API supports:
@@ -90,10 +84,8 @@ Resources this API supports:
 - [Segments](#segments)
 - [Notes](#notes)
 - [Conversations](#conversations)
-- [Counts](#counts)
 - [Webhooks](#webhooks)
-
-
+- [Counts](#counts)
 
 ## Authorization
 
@@ -103,8 +95,8 @@ Resources this API supports:
 # With an OAuth or Access token:
 Intercom.setToken("da39a3ee5e6b4b0d3255bfef95601890afd80709");
 ```
-If you are building a third party application you can get your OAuth token by [setting-up-oauth](https://developers.intercom.io/page/setting-up-oauth) for Intercom.
 
+If you are building a third party application you can get your OAuth token by [setting-up-oauth](https://developers.intercom.io/page/setting-up-oauth) for Intercom.
 
 ## Usage
 
@@ -250,6 +242,7 @@ User converted = Contact.convert(contact, user);
 ```
 
 ### Visitors
+
 ```java
 // Find visitor by ID
 Visitor visitor = Visitor.findByID("5b69565fa737210d1c2127f1");
@@ -348,7 +341,6 @@ Admin admin = Admin.find("123456");
 Admin admin = Admin.setAwayMode("123456", true, true);
 ```
 
-
 ### Events
 
 ```java
@@ -768,13 +760,12 @@ of IntercomException will be thrown. The exception will have Error objects
 
 The API throws the following runtime exceptions -
 
-  - AuthorizationException: for a 401 or 403 response
-  - InvalidException: for a 422 response or a local validation failure
-  - RateLimitException: for a 429 rate limit exceeded response
-  - ClientException: for a general 4xx response
-  - ServerException: for a 500 or 503 response
-  - IntercomException: general exception
-
+- AuthorizationException: for a 401 or 403 response
+- InvalidException: for a 422 response or a local validation failure
+- RateLimitException: for a 429 rate limit exceeded response
+- ClientException: for a general 4xx response
+- ServerException: for a 500 or 503 response
+- IntercomException: general exception
 
 ## Configuration
 
@@ -804,19 +795,18 @@ public class OkHttpSupplier implements HttpConnectorSupplier {
 
 and hand a supplier to the Intercom object -
 
-```
+```java
 final OkHttpClient client = new OkHttpClient();
 final OkUrlFactory factory = new OkUrlFactory(client);
 final OkHttpSupplier supplier = new OkHttpSupplier(factory);
 Intercom.setHttpConnectorSupplier(supplier);
-```            
+```
 
 #### Timeouts
 
 The default connection and request timeouts can be set in milliseconds using the
 `Intercom.setConnectionTimeout` and `Intercom.setRequestTimeout` methods.
 
-
 ### Target API Server
 
 The base URI to target can be changed for testing purposes

build.gradle

@@ -1,39 +1,10 @@
-buildscript {
-  repositories {
-    jcenter()
-    mavenCentral()
-  }
-  //noinspection GroovyAssignabilityCheck
-  dependencies {
-    classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.+'
-    classpath 'org.ajoberstar:grgit:1.9.3'
-  }
-}
-
 plugins {
-    id 'signing'
-}
-
-allprojects {
-  apply plugin: 'idea'
+  id 'idea'
+  id 'signing'
 }
 
 subprojects {
-
-  buildscript {
-    repositories {
-      jcenter()
-      mavenCentral()
-    }
-    //noinspection GroovyAssignabilityCheck
-    dependencies {
-      classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.+'
-      classpath 'org.ajoberstar:grgit:1.9.3'
-    }
-  }
-
   repositories {
-    jcenter()
     mavenCentral()
   }
 
@@ -46,7 +17,7 @@ subprojects {
   apply plugin: 'maven'
   apply plugin: 'maven-publish'
   apply plugin: 'java'
-  apply plugin: 'com.jfrog.bintray'
+  apply plugin: 'signing'
 
   sourceCompatibility = 1.7
   targetCompatibility = 1.7
@@ -65,6 +36,6 @@ subprojects {
   }
 }
 
-task wrapper(type: Wrapper) {
+wrapper {
   gradleVersion = '4.9'
 }

init.gradle

@@ -1,4 +1,3 @@
-import org.ajoberstar.grgit.Grgit
 import java.text.SimpleDateFormat
 
 final publicationVersion = new Version(version)
@@ -7,8 +6,11 @@ def rawVersion = version
 group = 'io.intercom'
 version = publicationVersion
 status = version.status
-ext.publish = true
 
+ext {
+  mvnUser = System.getenv('MVN_REPO_USER') ?: "dev"
+  mvnPass = System.getenv('MVN_REPO_PASS') ?: "dev"
+}
 
 task sourcesJar(type: Jar, dependsOn: classes) {
   classifier = 'sources'
@@ -40,65 +42,47 @@ publishing {
   }
 }
 
-
-bintray {
-  // gradle apslodes if the bintray* props aren't found and we never run this task in circle
-  if (System.getenv('release') != null) {
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_KEY')
-  }
-  publications = ['mavenJava']
-  dryRun = false
-  publish = project.publish
-  pkg {
-    repo = 'intercom-maven'
-    userOrg = 'intercom'
-    name = 'intercom-java'
-    desc = 'Java bindings for the Intercom API'
-    websiteUrl = 'https://github.com/intercom/intercom-java'
-    issueTrackerUrl = 'https://github.com/intercom/intercom-java/issues'
-    vcsUrl = 'https://github.com/intercom/intercom-java.git'
-    licenses = ['Apache-2.0']
-    labels = ['intercom', 'java', 'api']
-    publicDownloadNumbers = true
-    //noinspection GroovyAssignabilityCheck
-    version {
-      name = publicationVersion
-      vcsTag = publicationVersion
-    }
-  }
-}
-
 signing {
-    String keyId = System.getenv('keyId');
-    String gpgPassword = System.getenv('gpgPassword');
-    if (project.hasProperty('signing.keyId') != null  && gpgPassword != null && project.hasProperty('signing.secretKeyRingFile')) {
+    if (project.hasProperty('signing.keyId') && project.hasProperty('signing.secretKeyRingFile')) {
       sign configurations.archives
     }
 }
 
-ext.repo = Grgit.open(project.file('..'))
-
-task printVersion << {
-  println "publication version: ${publicationVersion}"
-  println "raw version: ${rawVersion}"
-}
-
-task tagRelease << {
-  repo.tag.add {
-    name = publicationVersion
-    message = "Release of ${rawVersion}"
+task printVersion {
+  doLast {
+    println "publication version: ${publicationVersion}"
+    println "raw version: ${rawVersion}"
   }
-  repo.push(tags: true)
 }
 
-/*
-  export release=1 && gradle publishRelease
-*/
-task publishRelease(dependsOn: ['clean', 'tagRelease', 'bintrayUpload'])
-tagRelease.mustRunAfter clean
-bintrayUpload.mustRunAfter tagRelease
+uploadArchives {
+  repositories.mavenDeployer {
+    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+    repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+      authentication(userName: mvnUser, password: mvnPass)
+    }
+
+    snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+      authentication(userName: mvnUser, password: mvnPass)
+    }
 
+    pom.project {
+      name 'intercom-java'
+      artifactId 'intercom-java'
+      packaging 'jar'
+      description 'Java bindings for the Intercom API'
+      url 'https://github.com/intercom/intercom-java'
+
+      licenses {
+        license {
+          name 'The Apache License, Version 2.0'
+          url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+        }
+      }
+    }
+  }
+}
 
 /**
  * A version object for use in the publication and tagging tasks.