Skip to content

Commit

Permalink
Merge branch 'main' into windows
Browse files Browse the repository at this point in the history
  • Loading branch information
big-andy-coates authored Jan 26, 2024
2 parents f07c3a0 + dd086f1 commit f98cd17
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 12 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

version: 2
registries:
maven-central:
type: maven-repository
url: https://repo.maven.apache.org/maven2/
maven-snapshots:
type: maven-repository
url: https://s01.oss.sonatype.org/content/repositories/snapshots/
Expand All @@ -22,6 +25,7 @@ updates:
- package-ecosystem: gradle
directory: /
registries:
- maven-central
- maven-snapshots
- creek-github-packages
open-pull-requests-limit: 50
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
java-version: '17'
distribution: 'adopt'
- name: Setup Gradle
uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1
uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa # v2.12.0
with:
gradle-home-cache-cleanup: true
- name: Build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Initialize CodeQL
uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
with:
languages: ${{ matrix.language }}

Expand All @@ -39,12 +39,12 @@ jobs:
distribution: 'adopt'

- name: Setup Gradle
uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1
uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa # v2.12.0
with:
gradle-home-cache-cleanup: true

- name: Build
run: ./gradlew test

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
java-version: '17'
distribution: 'adopt'
- name: Setup Gradle
uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1
uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa # v2.12.0
with:
dependency-graph: generate-and-submit
gradle-home-cache-cleanup: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
distribution: 'adopt'

- name: Setup Gradle
uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1
uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa # v2.12.0
with:
gradle-home-cache-cleanup: true
- name: Ensure build is green
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
distribution: 'adopt'

- name: Setup Gradle
uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1
uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa # v2.12.0
with:
gradle-home-cache-cleanup: true
- name: Increment version
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ subprojects {

set("junitVersion", "5.10.1") // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
set("junitPioneerVersion", "2.2.0") // https://mvnrepository.com/artifact/org.junit-pioneer/junit-pioneer
set("mockitoVersion", "5.8.0") // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
set("mockitoVersion", "5.10.0") // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
set("hamcrestVersion", "2.2") // https://mvnrepository.com/artifact/org.hamcrest/hamcrest-core
}

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach

dependencies {
implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.6") // https://plugins.gradle.org/plugin/com.github.spotbugs
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.23.3") // https://plugins.gradle.org/plugin/com.diffplug.spotless
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0") // https://plugins.gradle.org/plugin/com.diffplug.spotless
implementation("gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.12.2") // https://plugins.gradle.org/plugin/com.github.kt3k.coveralls
implementation("org.javamodularity:moduleplugin:1.8.12") // https://plugins.gradle.org/plugin/org.javamodularity.moduleplugin
implementation("io.github.gradle-nexus:publish-plugin:1.3.0") // https://plugins.gradle.org/plugin/io.github.gradle-nexus.publish-plugin
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
*/

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ repositories {

dependencies {
spotbugsPlugins("com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0")
checkstyle("com.puppycrawl.tools:checkstyle:10.12.5")
}

configurations.all {
Expand Down

0 comments on commit f98cd17

Please sign in to comment.