Skip to content

Commit

Permalink
Merge branch 'main' into rh/windows-path-issues
Browse files Browse the repository at this point in the history
  • Loading branch information
fwendland authored Sep 17, 2024
2 parents 06366b1 + 3868a52 commit 381845e
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
# store version in GitHub environment file
echo "version=$VERSION" >> $GITHUB_ENV
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
- name: Build ${{ env.version }}
run: ./gradlew :codyze-cli:build -x check --parallel -Pversion=${{ env.version }}
- name: Push Release Docker Image
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
distribution: "temurin"
java-version: 17
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
- name: Generate coverage report
run: ./gradlew testCodeCoverageReport --continue
- name: Archive test reports
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/detekt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
- name: Run analysis
run: ./gradlew detektMain detektTest --continue

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
distribution: "temurin"
java-version: 17
- name: 'Setup Gradle'
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
- name: 'Build API pages'
run: |
./gradlew dokkaHtmlMultiModule \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
distribution: "temurin"
java-version: ${{ matrix.java-lts }}
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
- name: Build and Test
id: build-and-test
run: ./gradlew build --parallel
Expand Down
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.3.0")
implementation("net.sourceforge.pmd:pmd-java:7.3.0")
implementation("net.sourceforge.pmd:pmd-core:7.5.0")
implementation("net.sourceforge.pmd:pmd-java:7.5.0")
}

publishing {
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ kotlin = "1.9.25"
cpg = "8.3.0"
koin = "3.5.6"
koin-test = "3.5.6"
detekt = "1.23.6"
detekt = "1.23.7"
spotless = "6.25.0"
dokka = "1.9.20"


[libraries]
sarif4k = { module = "io.github.detekt.sarif4k:sarif4k", version = "0.6.0"} # The code can be found here: https://github.com/detekt/sarif4k. It was generated using https://app.quicktype.io/
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.7.1"}
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.7.2"}
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin"}

# CPG official releases
Expand All @@ -29,7 +29,7 @@ cpg-language-java = { module = "de.fraunhofer.aisec:cpg-language-java", version.
#cpg-language-go = { module = "com.github.Fraunhofer-AISEC.cpg:cpg-language-go", version.ref = "cpg"}

kotlin-logging = { module = "io.github.oshai:kotlin-logging-jvm", version = "7.0.0" }
log4j-impl = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", version = "2.23.1"}
log4j-impl = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", version = "2.24.0"}
clikt = { module = "com.github.ajalt.clikt:clikt", version = "4.4.0"}
koin = { module = "io.insert-koin:koin-core", version.ref = "koin"}
koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin-test"}
Expand All @@ -41,7 +41,7 @@ kotlin-scripting-dependencies = { module = "org.jetbrains.kotlin:kotlin-scriptin
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt"}

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

# this is necessary for the plugins to be used in the buildSrc folder
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.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 381845e

Please sign in to comment.