Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump: Gradle to 7.0 and plugins #1451

Merged
merged 1 commit into from
May 3, 2021
Merged

Bump: Gradle to 7.0 and plugins #1451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ subprojects {
configure<MavenPublishPluginExtension> {
val sign = Config.BuildPlugins.shouldSignArtifacts(project.version.toString())
releaseSigningEnabled = sign
nexus {
stagingProfile = Config.Sentry.group
}
}

// signing info and maven central info go to:
Expand All @@ -108,8 +105,8 @@ subprojects {
// signing.secretKeyRingFile=file path

// maven central info:
// mavenCentralRepositoryUsername=user name
// mavenCentralRepositoryPassword=password
// mavenCentralUsername=user name
// mavenCentralPassword=password
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/java/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) &&
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion sentry-samples/sentry-samples-spring/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down