From ee234b3162de1145ec4f5690e5f6d2eba347c726 Mon Sep 17 00:00:00 2001 From: fern-api <115122769+fern-api[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 22:04:02 +0000 Subject: [PATCH] SDK regeneration --- .publish/prepare.sh | 8 +++ build.gradle | 53 ++++++++++++++----- gradle.properties | 0 .../com/intercom/api/core/ClientOptions.java | 4 +- 4 files changed, 51 insertions(+), 14 deletions(-) create mode 100755 .publish/prepare.sh create mode 100644 gradle.properties diff --git a/.publish/prepare.sh b/.publish/prepare.sh new file mode 100755 index 00000000..df3948e3 --- /dev/null +++ b/.publish/prepare.sh @@ -0,0 +1,8 @@ +# Write key ring file +echo "$MAVEN_SIGNATURE_SECRET_KEY" > armored_key.asc +gpg -o publish_key.gpg --dearmor armored_key.asc + +# Generate gradle.properties file +echo "signing.keyId=$MAVEN_SIGNATURE_KID" > gradle.properties +echo "signing.secretKeyRingFile=publish_key.gpg" >> gradle.properties +echo "signing.password=$MAVEN_SIGNATURE_PASSWORD" >> gradle.properties diff --git a/build.gradle b/build.gradle index 89277717..6e06dae4 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,14 @@ plugins { id 'java-library' id 'maven-publish' id 'com.diffplug.spotless' version '6.11.0' + id 'signing' + id 'cl.franciscosolis.sonatype-central-upload' version '1.0.3' } repositories { mavenCentral() maven { - url 'https://s01.oss.sonatype.org/content/repositories/releases/' + url 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' } } @@ -44,7 +46,7 @@ java { group = 'io.intercom' -version = '3.0.0-alpha4' +version = '3.0.0-alpha5' jar { dependsOn(":generatePomFileForMavenPublication") @@ -59,6 +61,10 @@ javadocJar { archiveBaseName = "intercom-java" } +signing { + sign(publishing.publications) +} + test { useJUnitPlatform() testLogging { @@ -71,15 +77,24 @@ publishing { maven(MavenPublication) { groupId = 'io.intercom' artifactId = 'intercom-java' - version = '3.0.0-alpha4' + version = '3.0.0-alpha5' from components.java pom { + name = 'intercom' + description = 'The official SDK of intercom' + url = 'https://buildwithfern.com' licenses { license { name = 'The MIT License (MIT)' url = 'https://mit-license.org/' } } + developers { + developer { + name = 'intercom' + email = 'developers@intercom.com' + } + } scm { connection = 'scm:git:git://github.com/intercom/intercom-java.git' developerConnection = 'scm:git:git://github.com/intercom/intercom-java.git' @@ -88,14 +103,28 @@ publishing { } } } - repositories { - maven { - url "$System.env.MAVEN_PUBLISH_REGISTRY_URL" - credentials { - username "$System.env.MAVEN_USERNAME" - password "$System.env.MAVEN_PASSWORD" - } - } - } } +sonatypeCentralUpload { + username = "$System.env.MAVEN_USERNAME" + password = "$System.env.MAVEN_PASSWORD" + + archives = files( + "$buildDir/libs/intercom-java-" + version + ".jar", + "$buildDir/libs/intercom-java-" + version + "-sources.jar", + "$buildDir/libs/intercom-java-" + version + "-javadoc.jar" + ) + + pom = file("$buildDir/publications/maven/pom-default.xml") + signingKey = "$System.env.MAVEN_SIGNATURE_SECRET_KEY" + signingKeyPassphrase = "$System.env.MAVEN_SIGNATURE_PASSWORD" +} + +signing { + def signingKeyId = "$System.env.MAVEN_SIGNATURE_SECRET_KEY" + def signingPassword = "$System.env.MAVEN_SIGNATURE_PASSWORD" + useInMemoryPgpKeys(signingKeyId, signingPassword) + sign publishing.publications.maven +} + +sonatypeCentralUpload.dependsOn build diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/main/java/com/intercom/api/core/ClientOptions.java b/src/main/java/com/intercom/api/core/ClientOptions.java index 23633b57..ce1d5e06 100644 --- a/src/main/java/com/intercom/api/core/ClientOptions.java +++ b/src/main/java/com/intercom/api/core/ClientOptions.java @@ -41,10 +41,10 @@ private ClientOptions( this.headers.putAll(headers); this.headers.putAll(new HashMap() { { - put("User-Agent", "io.intercom:intercom-java/3.0.0-alpha4"); + put("User-Agent", "io.intercom:intercom-java/3.0.0-alpha5"); put("X-Fern-Language", "JAVA"); put("X-Fern-SDK-Name", "com.intercom.fern:api-sdk"); - put("X-Fern-SDK-Version", "3.0.0-alpha4"); + put("X-Fern-SDK-Version", "3.0.0-alpha5"); } }); this.headerSuppliers = headerSuppliers;