Replace publishing to Bintray with Maven Central

Makefile

@@ -1,4 +1,4 @@
-.PHONY: clean compile dryRelease doRelease release update stop checkFormat
+.PHONY: all, clean compile dryRelease doRelease release update stop checkFormat format
 
 all: clean checkFormat compile dryRelease
 
@@ -11,18 +11,19 @@ compile:
 	./gradlew build
 
 # do a dry release (like a local deploy)
+# remember to add the -SNAPSHOT suffix to the version
 dryRelease:
-	./gradlew bintrayUpload -PbintrayUser=dryUser -PbintrayKey=dryKey
+	./gradlew publishToMavenLocal --no-daemon --no-parallel
 
-# deploy the current build to bintray, jcenter and maven central
+# deploy the current build to maven central
+# remember to remove the -SNAPSHOT suffix from the version
+# promotes the release to maven central
 doRelease:
-	./gradlew bintrayUpload -PbintrayUser="$(BINTRAY_USERNAME)" -PbintrayKey="$(BINTRAY_KEY)" -PmavenCentralUser="$(MAVEN_USER)" -PmavenCentralPassword="$(MAVEN_PASS)" -PmavenCentralSync=true -PdryRun=false --info
+	./gradlew publish --no-daemon --no-parallel
+	./gradlew closeAndReleaseRepository
 
-distZip:
-	./gradlew distZip
-
-# deep clean, build and deploy to bintray, jcenter and maven central
-release: clean checkFormat compile dryRelease distZip
+# clean, build, deploy and promote to maven central
+release: clean checkFormat compile doRelease
 
 # check for dependencies update
 update:
@@ -33,8 +34,10 @@ update:
 stop:
 	./gradlew --stop
 
+# Spotless check's code
 checkFormat:
 	./gradlew spotlessJavaCheck spotlessKotlinCheck
 
+# Spotless format's code
 format:
 	./gradlew spotlessApply

build.gradle.kts

@@ -1,6 +1,6 @@
 import com.diffplug.spotless.LineEnding
-import com.novoda.gradle.release.PublishExtension
-import com.novoda.gradle.release.ReleasePlugin
+import com.vanniktech.maven.publish.MavenPublishPlugin
+import com.vanniktech.maven.publish.MavenPublishPluginExtension
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
@@ -9,6 +9,7 @@ plugins {
     id(Config.QualityPlugins.spotless) version Config.QualityPlugins.spotlessVersion apply true
     jacoco
     id(Config.QualityPlugins.detekt) version Config.QualityPlugins.detektVersion
+    `maven-publish`
 }
 
 buildscript {
@@ -21,8 +22,10 @@ buildscript {
     dependencies {
         classpath(Config.BuildPlugins.androidGradle)
         classpath(kotlin(Config.BuildPlugins.kotlinGradlePlugin, version = Config.kotlinVersion))
+        classpath(Config.BuildPlugins.gradleMavenPublishPlugin)
+        // dokka is required by gradle-maven-publish-plugin.
+        classpath(Config.BuildPlugins.dokkaPlugin)
         classpath(Config.QualityPlugins.errorpronePlugin)
-        classpath(Config.Deploy.novodaBintrayPlugin)
         classpath(Config.QualityPlugins.gradleVersionsPlugin)
 
         // add classpath of androidNativeBundle
@@ -86,29 +89,25 @@ subprojects {
                 if (file.length() == 0L) throw IllegalStateException("Distribution file: $distributionFilePath is empty")
             }
         }
+        afterEvaluate {
+            apply<MavenPublishPlugin>()
 
-        apply<ReleasePlugin>()
-
-        configure<PublishExtension> {
-            userOrg = Config.Sentry.userOrg
-            groupId = project.group.toString()
-            publishVersion = project.version.toString()
-            desc = Config.Sentry.description
-            website = Config.Sentry.website
-            repoName = if (project.name.contains("android")) Config.Sentry.androidBintrayRepoName else Config.Sentry.javaBintrayRepoName
-            setLicences(Config.Sentry.licence)
-            setLicenceUrls(Config.Sentry.licenceUrl)
-            issueTracker = Config.Sentry.issueTracker
-            repository = Config.Sentry.repository
-            sign = Config.Deploy.sign
-            artifactId = project.name
-            uploadName = "${project.group}:${project.name}"
-            devId = Config.Sentry.userOrg
-            devName = Config.Sentry.devName
-            devEmail = Config.Sentry.devEmail
-            scmConnection = Config.Sentry.scmConnection
-            scmDevConnection = Config.Sentry.scmDevConnection
-            scmUrl = Config.Sentry.scmUrl
+            configure<MavenPublishPluginExtension> {
+                val sign = Config.BuildPlugins.shouldSignArtifacts(project.version.toString())
+                releaseSigningEnabled = sign
+            }
+
+            // signing info and maven central info go to:
+            // ~/.gradle/gradle.properties
+
+            // signing info:
+            // signing.keyId=id
+            // signing.password=password
+            // signing.secretKeyRingFile=file path
+
+            // maven central info:
+            // mavenCentralRepositoryUsername=user name
+            // mavenCentralRepositoryPassword=password
         }
     }
 }

buildSrc/src/main/java/Config.kt

@@ -1,10 +1,10 @@
 import java.math.BigDecimal
 
 object Config {
-    val kotlinVersion = "1.4.10"
+    val kotlinVersion = "1.4.30"
     val kotlinStdLib = "stdlib-jdk8"
 
-    val springBootVersion = "2.3.4.RELEASE"
+    val springBootVersion = "2.4.4"
     // Spring is currently not compatible with Kotlin 1.4
     val springKotlinCompatibleLanguageVersion = "1.3"
 
@@ -15,9 +15,16 @@ object Config {
         val buildConfigVersion = "3.0.0"
         val springBoot = "org.springframework.boot"
         val springDependencyManagement = "io.spring.dependency-management"
-        val springDependencyManagementVersion = "1.0.10.RELEASE"
+        val springDependencyManagementVersion = "1.0.11.RELEASE"
         val gretty = "org.gretty"
         val grettyVersion = "3.0.3"
+        val gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.14.2"
+        val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.4.30"
+
+        fun shouldSignArtifacts(version: String): Boolean {
+            return !(System.getenv("CI")?.toBoolean() ?: false) &&
+                    !version.toUpperCase().endsWith("SNAPSHOT")
+        }
     }
 
     object Android {
@@ -122,19 +129,6 @@ object Config {
         val SENTRY_SPRING_BOOT_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.spring-boot"
         val group = "io.sentry"
         val description = "SDK for sentry.io"
-        val website = "https://sentry.io"
-        val userOrg = "getsentry"
-        val androidBintrayRepoName = "sentry-android"
-        val javaBintrayRepoName = "sentry-java"
-        val licence = "MIT"
-        val licenceUrl = "http://www.opensource.org/licenses/mit-license.php"
-        val issueTracker = "https://github.com/getsentry/sentry-java/issues"
-        val repository = "https://github.com/getsentry/sentry-java"
-        val devName = "Sentry Team and Contributors"
-        val devEmail = "sdks@sentry.io"
-        val scmConnection = "scm:git:git://github.com/getsentry/sentry-java.git"
-        val scmDevConnection = "scm:git:ssh://github.com:getsentry/sentry-java.git"
-        val scmUrl = "https://github.com/getsentry/sentry-java/tree/main"
         val versionNameProp = "versionName"
         val buildVersionCodeProp = "buildVersionCode"
     }
@@ -149,11 +143,6 @@ object Config {
         val errorProneJavac8 = "com.google.errorprone:javac:9+181-r4173-1"
     }
 
-    object Deploy {
-        val novodaBintrayPlugin = "com.novoda:bintray-release:1.0.3"
-        val sign = true
-    }
-
     object NativePlugins {
         val nativeBundlePlugin = "com.ydq.android.gradle.build.tool:nativeBundle:1.0.7"
         val nativeBundleExport = "com.ydq.android.gradle.native-aar.export"

gradle.properties

@@ -1,12 +1,13 @@
 # Daemon’s heap size
-org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m -XX:MaxMetaspaceSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m -XX:MaxMetaspaceSize=1536m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # AndroidX required by AGP >= 3.6.x
 android.useAndroidX=true
 
 # Release information
 buildVersionCode=20059
-versionName=4.4.0-alpha.2
+# -SNAPSHOT avoids signing
+versionName=4.4.0-alpha.2-SNAPSHOT
 
 # disable renderscript, it's enabled by default
 android.defaults.buildfeatures.renderscript=false
@@ -26,3 +27,16 @@ kotlin.stdlib.default.dependency=false
 # TODO: Enable Prefab https://android-developers.googleblog.com/2020/02/native-dependencies-in-android-studio-40.html
 # android.enablePrefab=true
 # android.prefabVersion=1.0.0
+
+# publication pom properties
+POM_DESCRIPTION=SDK for sentry.io
+POM_URL=https://github.com/getsentry/sentry-java
+POM_SCM_URL=https://github.com/getsentry/sentry-java
+POM_SCM_CONNECTION=scm:git:git://github.com/getsentry/sentry-java.git
+POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/getsentry/sentry-java.git
+
+POM_LICENCE_NAME=MIT
+POM_LICENCE_URL=http://www.opensource.org/licenses/mit-license.php
+
+POM_DEVELOPER_ID=getsentry
+POM_DEVELOPER_NAME=Sentry Team and Contributors

scripts/release.kts

@@ -19,7 +19,7 @@
  * To execute the script two environment variables that are used by Maven have to be present: BINTRAY_USERNAME, BINTRAY_API_KEY
  *
  * Example usage (assuming that the script is executed from the `<project-root>/scripts` directory and the distribution files are in `<project-root>/dist`):
- * $ kotlinc -script release.kts -- -d ../dist  -javaRepositoryUrl https://api.bintray.com/maven/sentry/sentry-java/sentry-java/ -androidRepositoryUrl https://api.bintray.com/maven/sentry/sentry-android/sentry-java/ | sh
+ * $ kotlinc -script release.kts -- -d ../dist | sh
  *
  */
 import java.io.File
@@ -35,24 +35,14 @@ val path = argOrDefault("d", ".")
 val settingsPath = argOrDefault("s", "./settings.xml")
 
 /**
- * Bintray repository URL for non-Android projects.
+ * Maven repository URL.
  */
-val javaRepositoryUrl = requiredArg("javaRepositoryUrl")
-
-/**
- * Bintray repository URL for Android projects.
- */
-val androidRepositoryUrl = requiredArg("androidRepositoryUrl")
+val repositoryUrl = argOrDefault("repositoryUrl", "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
 
 /**
  * Maven server id in the settings.xml file.
  */
-val repositoryId = argOrDefault("repositoryId", "bintray")
-
-/**
- * If package should be published on bintray or just uploaded but not published.
- */
-val publish = if (argOrDefault("publish", "false") == "true") 1 else 0
+val repositoryId = argOrDefault("repositoryId", "ossrh")
 
 File(path)
     .listFiles { file -> file.isDirectory() }
@@ -61,21 +51,18 @@ File(path)
         val module = folder.name
 
         val file: String
-        val repositoryUrl: String
 
         val androidFile = folder.listFiles { it -> it.name.contains("release") && it.extension == "aar" }.firstOrNull()
         if (androidFile != null) {
             file = androidFile.path
-            repositoryUrl = androidRepositoryUrl
         } else {
             file = "$path/$module.jar"
-            repositoryUrl = javaRepositoryUrl
         }
         val javadocFile = "$path/$module-javadoc.jar"
         val sourcesFile = "$path/$module-sources.jar"
         val pomFile = "$path/pom-default.xml"
 
-        val command = "./mvnw deploy:deploy-file -Dfile=$file -Dfiles=$javadocFile,$sourcesFile -Dclassifiers=sources,javadoc -Dtypes=jar,jar -DpomFile=$pomFile -DrepositoryId=$repositoryId -Durl=$repositoryUrl\\;publish\\=$publish --settings $settingsPath"
+        val command = "./mvnw deploy:deploy-file -Dfile=$file -Dfiles=$javadocFile,$sourcesFile -Dclassifiers=sources,javadoc -Dtypes=jar,jar -DpomFile=$pomFile -DrepositoryId=$repositoryId -Durl=$repositoryUrl --settings $settingsPath"
         println(command)
     }
 

scripts/settings.xml

@@ -4,9 +4,9 @@
                           https://maven.apache.org/xsd/settings-1.0.0.xsd">
   <servers>
     <server>
-      <id>bintray</id>
-      <username>${env.BINTRAY_USERNAME}</username>
-      <password>${env.BINTRAY_API_KEY}</password>
+      <id>ossrh</id>
+      <username>${env.OSSRH_USERNAME}</username>
+      <password>${env.OSSRH_PASSWORD}</password>
     </server>
   </servers>
 </settings>

sentry-android-timber/build.gradle.kts

@@ -1,6 +1,7 @@
 import io.gitlab.arturbosch.detekt.Detekt
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("com.android.library")
@@ -69,6 +70,11 @@ kotlin {
     explicitApi()
 }
 
+tasks.withType<KotlinCompile>().configureEach {
+    // Timber uses Kotlin 1.2
+    kotlinOptions.languageVersion = "1.2"
+}
+
 dependencies {
     api(project(":sentry"))
 

sentry-jul/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `java-library`
     kotlin("jvm")
@@ -12,7 +14,7 @@ configure<JavaPluginConvention> {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
 }
 

sentry-log4j2/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `java-library`
     kotlin("jvm")
@@ -12,7 +14,7 @@ configure<JavaPluginConvention> {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
 }
 

sentry-logback/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `java-library`
     kotlin("jvm")
@@ -12,7 +14,7 @@ configure<JavaPluginConvention> {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
 }
 

sentry-servlet/build.gradle.kts

@@ -83,8 +83,10 @@ repositories {
 val compileKotlin: KotlinCompile by tasks
 compileKotlin.kotlinOptions {
     jvmTarget = "1.8"
+    languageVersion = Config.springKotlinCompatibleLanguageVersion
 }
 val compileTestKotlin: KotlinCompile by tasks
 compileTestKotlin.kotlinOptions {
     jvmTarget = "1.8"
+    languageVersion = Config.springKotlinCompatibleLanguageVersion
 }

sentry-spring/src/main/java/io/sentry/spring/tracing/SentrySpanAdvice.java

@@ -26,6 +26,7 @@ public SentrySpanAdvice(final @NotNull IHub hub) {
     this.hub = Objects.requireNonNull(hub, "hub is required");
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public Object invoke(final @NotNull MethodInvocation invocation) throws Throwable {
     final ISpan activeSpan = hub.getSpan();
@@ -62,6 +63,7 @@ public Object invoke(final @NotNull MethodInvocation invocation) throws Throwabl
     }
   }
 
+  @SuppressWarnings("deprecation")
   private String resolveSpanOperation(
       Class<?> targetClass, Method method, @Nullable SentrySpan sentrySpan) {
     return sentrySpan == null || StringUtils.isEmpty(sentrySpan.value())

sentry-spring/src/main/java/io/sentry/spring/tracing/SentryTransactionAdvice.java

@@ -27,6 +27,7 @@ public SentryTransactionAdvice(final @NotNull IHub hub) {
     this.hub = Objects.requireNonNull(hub, "hub is required");
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public Object invoke(final @NotNull MethodInvocation invocation) throws Throwable {
     final Method mostSpecificMethod =
@@ -64,6 +65,7 @@ public Object invoke(final @NotNull MethodInvocation invocation) throws Throwabl
     }
   }
 
+  @SuppressWarnings("deprecation")
   private @NotNull String resolveTransactionName(
       MethodInvocation invocation, @Nullable SentryTransaction sentryTransaction) {
     return sentryTransaction == null || StringUtils.isEmpty(sentryTransaction.value())