Skip to content
This repository was archived by the owner on Nov 13, 2025. It is now read-only.
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
3 changes: 1 addition & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ jobs:
# - windows-latest
# - macos-latest
java:
- 8
# - 17
- '21'
runs-on: ${{ matrix.os }}
timeout-minutes: 20
steps:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ jobs:
# pinned to macos-13 due to https://github.com/actions/runner-images/issues/9254
- macos-13
java:
- 8
- 17
- '21'
runs-on: ${{ matrix.os }}
timeout-minutes: 20
steps:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v5
- name: Set up JDK
uses: actions/[email protected]
with:
distribution: 'zulu'
java-version: '21'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ jobs:
# - windows-latest
# - macos-latest
java:
- 8
# - 17
- '21'
runs-on: ${{ matrix.os }}
timeout-minutes: 20
steps:
Expand Down
8 changes: 7 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ rootProject.extra.set("artifactVersion", SimpleDateFormat("yyyy-MM-dd\'T\'HH-mm-
plugins {
id("maven-publish")
id("com.github.ben-manes.versions") version "0.53.0"
id("net.ossindex.audit") version "0.4.11"
id("org.sonatype.gradle.plugins.scan") version "3.1.4"
id("io.freefair.maven-central.validate-poms") version "8.14.2"
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
}
Expand All @@ -15,6 +15,7 @@ val dependencyVersions = listOf(
"org.apache.commons:commons-lang3:3.19.0",
"org.jetbrains:annotations:26.0.2-1",
libs.junit4,
libs.junit5,
)

val dependencyGroupVersions = mapOf<String, String>(
Expand All @@ -35,6 +36,11 @@ subprojects {
}
}

ossIndexAudit {
username = System.getenv("SONATYPE_INDEX_USERNAME") ?: findProperty("sonatype.index.username")
password = System.getenv("SONATYPE_INDEX_PASSWORD") ?: findProperty("sonatype.index.password")
}

fun findProperty(s: String) = project.findProperty(s) as String?

val isSnapshot = project.version == "unspecified"
Expand Down
3 changes: 2 additions & 1 deletion engine/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
id("maven-publish")
id("signing")
id("com.github.ben-manes.versions")
id("net.ossindex.audit")
id("org.sonatype.gradle.plugins.scan")
id("io.freefair.maven-central.validate-poms")
}

Expand Down Expand Up @@ -79,6 +79,7 @@ dependencies {

testImplementation("org.spockframework:spock-core:2.3-groovy-4.0")
testRuntimeOnly("net.bytebuddy:byte-buddy:1.17.7")
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
}

java {
Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ sonatype.staging.url=https://oss.sonatype.org/service/local/staging/deploy/maven
sonatype.staging.profile.id=
sonatype.username=
sonatype.password=

sonatype.index.username=
sonatype.index.password=
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ slf4jVersionrange = "[1.7,3)"

[libraries]
junit4 = { module = "junit:junit", version = "4.13.2" }
junit5 = { module = "org.junit:junit-bom", version = "5.13.4" }
junixsocketCore = { module = "com.kohlschutter.junixsocket:junixsocket-core", version.ref = "junixsocket" }
junixsocketCommon = { module = "com.kohlschutter.junixsocket:junixsocket-common", version.ref = "junixsocket" }
kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 1 addition & 4 deletions gradlew

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

3 changes: 1 addition & 2 deletions gradlew.bat

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

3 changes: 2 additions & 1 deletion integrationtest/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
groovy
id("com.github.ben-manes.versions")
id("net.ossindex.audit")
id("org.sonatype.gradle.plugins.scan")
}

java {
Expand Down Expand Up @@ -55,6 +55,7 @@ dependencies {
testRuntimeOnly(libs.logback)
testImplementation("org.spockframework:spock-core:2.3-groovy-4.0")
testRuntimeOnly("net.bytebuddy:byte-buddy:1.17.7")
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
}
tasks.check.get().shouldRunAfter(project(":engine").tasks.check)

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ include("engine", "integrationtest")

// https://docs.gradle.org/current/userguide/toolchains.html#sub:download_repositories
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
}
Loading