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
2 changes: 1 addition & 1 deletion .github/PklProject
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ amends "pkl:Project"

dependencies {
["pkl.impl.ghactions"] {
uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.5.0"
uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.7.0"
}
["com.github.actions"] {
uri = "package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.3.0"
Expand Down
16 changes: 8 additions & 8 deletions .github/PklProject.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
"resolvedDependencies": {
"package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1": {
"type": "remote",
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.3.1",
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.6.0",
"checksums": {
"sha256": "fd515da685ea126678c3ec684e84a4f992d43481cc1d75cb866cd55775f675f9"
"sha256": "10e27d63df4a4520d8a9375962406ca5ffe74f396bd3cb1c19b1f8358505010a"
}
},
"package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1": {
"type": "remote",
"uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.5.0",
"uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.7.0",
"checksums": {
"sha256": "2c1e0d9efcd65b3c3207bf535c325ebc0ec2ab169187b324c4bb70821cac0e51"
"sha256": "962cdba703b50e86ecfda1a1345bf58caa7b4839dd090eae6120024d862793d0"
}
},
"package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.deepToTyped@1": {
Expand All @@ -24,16 +24,16 @@
},
"package://pkg.pkl-lang.org/pkl-pantry/pkl.github.dependabotManagedActions@1": {
"type": "remote",
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.github.dependabotManagedActions@1.0.3",
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.github.dependabotManagedActions@1.1.3",
"checksums": {
"sha256": "d368900942efb88ed51a98f9614748b06c74ba43423f045fcd6dedb5dbdc0bea"
"sha256": "521feb6f5ff12075ebad0758799fe7ec2675d231a0e0f5456694c8d4822a8171"
}
},
"package://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1": {
"type": "remote",
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1.0.0",
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1.0.3",
"checksums": {
"sha256": "02ef6f25bfca5b1d095db73ea15de79d2d2c6832ebcab61e6aba90554382abcb"
"sha256": "a8934d84ffd11992d7baf6acfd97bae31d6112fa8add5cc8b5b4a722ce5b9ffc"
}
}
}
Expand Down
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
version: 2
updates:
- package-ecosystem: gradle
cooldown:
default-days: 7
exclude:
- org.pkl-lang:*
directory: /
schedule:
interval: weekly
- package-ecosystem: github-actions
cooldown:
default-days: 7
directory: /
ignore:
- dependency-name: '*'
Expand Down
53 changes: 50 additions & 3 deletions .github/index.pkl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@ import "@pkl.impl.ghactions/helpers.pkl"

triggerDocsBuild = "release"

build = new {
testReports {
excludeJobs {
"dependency-submission"
}
}

build {
jobs {
["build-and-test"] {
name = "Build and test"
Expand All @@ -42,8 +48,22 @@ prb = build

releaseBranch = build

main = new {
main {
jobs {
["dependency-submission"] {
permissions {
contents = "write"
}
name = "Dependency submission"
`runs-on` = "ubuntu-latest"
steps = (setupSteps) {
(module.catalog.`gradle/actions/dependency-submission@v6`) {
with {
`dependency-graph-include-configurations` = ".*[rR]untimeClasspath|.*[cC]ompileClasspath"
}
}
}
}
["deploy-snapshot"] {
name = "Build and deploy snapshot"
`runs-on` = "ubuntu-latest"
Expand All @@ -58,7 +78,7 @@ main = new {
}
}

release = new {
release {
jobs {
["release-to-github"] {
name = "Release to GitHub"
Expand Down Expand Up @@ -118,3 +138,30 @@ local function setupStepsCache(jcache: ("maven"|"gradle"|"sbt")?): Listing<Workf
}
}
}

dependabot {
updates {
new {
`package-ecosystem` = "gradle"
directory = "/"
schedule {
interval = "weekly"
}
cooldown {
`default-days` = 7
exclude {
"org.pkl-lang:*"
}
}
}
}
}

codeql {
scans {
new {
language = "java-kotlin"
buildMode = "autobuild"
}
}
}
6 changes: 6 additions & 0 deletions .github/workflows/__lockfile__.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,9 @@ jobs:
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
- name: actions/upload-artifact@v5
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
- name: github/codeql-action/analyze@v4
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
- name: github/codeql-action/init@v4
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
- name: gradle/actions/dependency-submission@v6
uses: gradle/actions/dependency-submission@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
45 changes: 45 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Generated from Workflow.pkl. DO NOT EDIT.
'on':
pull_request:
branches:
- main
push:
branches:
- main
schedule:
- cron: 29 17 * * 4
jobs:
analyze-actions:
name: Analyze (actions)
permissions:
security-events: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
with:
persist-credentials: false
- uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
with:
languages: actions
build-mode: none
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
with:
category: /language:actions
analyze-java-kotlin:
name: Analyze (java-kotlin)
permissions:
security-events: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
with:
persist-credentials: false
- uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
with:
languages: java-kotlin
build-mode: autobuild
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
with:
category: /language:java-kotlin
19 changes: 19 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,25 @@ concurrency:
permissions:
contents: read
jobs:
dependency-submission:
name: Dependency submission
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
with:
persist-credentials: false
fetch-depth: 0
- name: Setup Java
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
with:
java-version: '21'
distribution: temurin
cache: gradle
- uses: gradle/actions/dependency-submission@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
with:
dependency-graph-include-configurations: .*[rR]untimeClasspath|.*[cC]ompileClasspath
deploy-snapshot:
name: Build and deploy snapshot
runs-on: ubuntu-latest
Expand Down
9 changes: 8 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import java.nio.charset.StandardCharsets
import java.util.*

@Suppress("DSL_SCOPE_VIOLATION")
plugins {
`java-library`
`maven-publish`
Expand All @@ -11,6 +10,14 @@ plugins {
signing
}

configurations {
all {
resolutionStrategy {
failOnDynamicVersions()
}
}
}

private val isReleaseBuild = System.getProperty("releaseBuild") != null

version = if (isReleaseBuild) version else "$version-SNAPSHOT"
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[versions]
# https://central.sonatype.com/artifact/org.assertj/assertj-core/versions
assertJ = "3.26.3"
assertJ = "3.27.7"
# https://github.com/google/google-java-format/releases/
googleJavaFormat = "1.35.0"
# only used in Kotlin sample
Expand All @@ -12,7 +12,7 @@ kotlin = "2.0.21"
ktfmt = "0.62"
# https://central.sonatype.com/artifact/org.junit.jupiter/junit-jupiter/versions
junit = "5.11.3"
junitPlatform = "1.+"
junitPlatform = "6.0.3"
pkl = "0.31.1"
# only used for testing; use same version as Spring Boot
# https://central.sonatype.com/artifact/org.springframework.boot/spring-boot/dependencies
Expand Down
Loading