diff --git a/build.gradle.kts b/build.gradle.kts index c710811cd0..a2ee5255ed 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -94,9 +94,6 @@ subprojects { configure { val sign = Config.BuildPlugins.shouldSignArtifacts(project.version.toString()) releaseSigningEnabled = sign - nexus { - stagingProfile = Config.Sentry.group - } } // signing info and maven central info go to: @@ -108,8 +105,8 @@ subprojects { // signing.secretKeyRingFile=file path // maven central info: - // mavenCentralRepositoryUsername=user name - // mavenCentralRepositoryPassword=password + // mavenCentralUsername=user name + // mavenCentralPassword=password } } } diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 712b67d9ac..590ec12032 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -18,9 +18,9 @@ object Config { val springDependencyManagement = "io.spring.dependency-management" 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" + val grettyVersion = "3.0.4" + val gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.15.1" + val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:$kotlinVersion" fun shouldSignArtifacts(version: String): Boolean { return !(System.getenv("CI")?.toBoolean() ?: false) && diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d9132ea..f371643eed 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-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sentry-samples/sentry-samples-spring/build.gradle.kts b/sentry-samples/sentry-samples-spring/build.gradle.kts index 269a79c821..ff0328dc43 100644 --- a/sentry-samples/sentry-samples-spring/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring/build.gradle.kts @@ -7,7 +7,8 @@ plugins { kotlin("jvm") kotlin("plugin.spring") version Config.kotlinVersion id("war") - id(Config.BuildPlugins.gretty) version Config.BuildPlugins.grettyVersion + // https://github.com/gretty-gradle-plugin/gretty/issues/206 + id(Config.BuildPlugins.gretty) version Config.BuildPlugins.grettyVersion apply false } group = "io.sentry.sample.spring"