Skip to content

Commit

Permalink
Merge branch 'main' into rh/continue-upgrade-workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
CodingDepot authored Jul 17, 2024
2 parents b000066 + efd0661 commit a0a4f83
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 5 deletions.
4 changes: 4 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
{
"matchPackagePrefixes": ["com.github.Fraunhofer-AISEC"],
"registryUrls": ["https://jitpack.io/"]
},
{
"groupName": "PMD packages",
"matchPackagePrefixes": ["net.sourceforge.pmd:pmd-"]
}
]
}
4 changes: 2 additions & 2 deletions codyze-plugins/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ dependencies {
implementation("com.h3xstream.findsecbugs:findsecbugs-plugin:1.13.0")

// https://mvnrepository.com/artifact/net.sourceforge.pmd/
implementation("net.sourceforge.pmd:pmd-core:7.2.0")
implementation("net.sourceforge.pmd:pmd-java:7.2.0")
implementation("net.sourceforge.pmd:pmd-core:7.3.0")
implementation("net.sourceforge.pmd:pmd-java:7.3.0")
}

publishing {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting",

# test
junit-bom = { module = "org.junit:junit-bom", version = "5.10.3" }
mockk = { module = "io.mockk:mockk", version = "1.13.11"}
mockk = { module = "io.mockk:mockk", version = "1.13.12"}

# this is necessary for the plugins to be used in the buildSrc folder
kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down

0 comments on commit a0a4f83

Please sign in to comment.