Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id 'java'
id 'jacoco'
id 'com.jfrog.artifactory' version '5.2.5'
id 'org.sonarqube' version '3.5.0.2730'
id 'org.sonarqube' version '7.1.0.6387'
id 'de.thetaphi.forbiddenapis' version '3.0' apply false
id 'com.diffplug.spotless' version '6.15.0'
}
Expand Down Expand Up @@ -46,7 +46,7 @@ allprojects {
def artifactoryBearerToken = System.getenv("ARTIFACTORY_PRIVATE_PASSWORD") ?: project.findProperty("artifactoryPassword")
if (artifactoryBearerToken) {
maven {
url "https://repox.jfrog.io/repox/sonarsource"
url = "https://repox.jfrog.io/repox/sonarsource"
authentication {
header(HttpHeaderAuthentication)
}
Expand Down Expand Up @@ -102,7 +102,7 @@ subprojects {

test {
testLogging {
exceptionFormat 'full' // log the full stack trace (default is the 1st line of the stack trace)
exceptionFormat = 'full' // log the full stack trace (default is the 1st line of the stack trace)
events "skipped", "failed"
// verbose log for failed and skipped tests (by default the name of the tests are not logged)
}
Expand All @@ -116,12 +116,12 @@ subprojects {
}

task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
archiveClassifier = 'sources'
from sourceSets.main.allSource
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from javadoc.destinationDir
}

Expand Down Expand Up @@ -172,7 +172,7 @@ subprojects {
def signingKey = findProperty("signingKey")
def signingPassword = findProperty("signingPassword")
useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
required {
required = {
def branch = System.getenv()["GITHUB_REF_NAME"]
return (branch == 'master' || branch ==~ 'branch-[\\d.]+') &&
gradle.taskGraph.hasTask(":artifactoryPublish")
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
37 changes: 22 additions & 15 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 14 additions & 12 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sonar-ruby-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ buildscript{

plugins {
id 'com.github.johnrengelman.shadow' version '7.1.0'
id 'com.github.jruby-gradle.jar' version '2.0.2'
id 'com.github.jruby-gradle.base' version '2.0.2'
}

import com.github.jrubygradle.JRubyPrepare
Expand Down
Loading