Skip to content

Commit f41c092

Browse files
bioballbioball
committed
Add dependabot updates for Gradle, CodeQL scanning, prevent dynamic maven deps
1 parent 8efd741 commit f41c092

8 files changed

Lines changed: 88 additions & 18 deletions

File tree

‎.github/PklProject‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ amends "pkl:Project"
1717

1818
dependencies {
1919
["pkl.impl.ghactions"] {
20-
uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.5.0"
20+
uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.7.0"
2121
}
2222
["com.github.actions"] {
2323
uri = "package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.2.0"

‎.github/PklProject.deps.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"resolvedDependencies": {
44
"package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1": {
55
"type": "remote",
6-
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.3.1",
6+
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.6.0",
77
"checksums": {
8-
"sha256": "fd515da685ea126678c3ec684e84a4f992d43481cc1d75cb866cd55775f675f9"
8+
"sha256": "10e27d63df4a4520d8a9375962406ca5ffe74f396bd3cb1c19b1f8358505010a"
99
}
1010
},
1111
"package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1": {
1212
"type": "remote",
13-
"uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.5.0",
13+
"uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.7.0",
1414
"checksums": {
15-
"sha256": "2c1e0d9efcd65b3c3207bf535c325ebc0ec2ab169187b324c4bb70821cac0e51"
15+
"sha256": "962cdba703b50e86ecfda1a1345bf58caa7b4839dd090eae6120024d862793d0"
1616
}
1717
},
1818
"package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.deepToTyped@1": {
@@ -24,16 +24,16 @@
2424
},
2525
"package://pkg.pkl-lang.org/pkl-pantry/pkl.github.dependabotManagedActions@1": {
2626
"type": "remote",
27-
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.github.dependabotManagedActions@1.0.3",
27+
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.github.dependabotManagedActions@1.1.3",
2828
"checksums": {
29-
"sha256": "d368900942efb88ed51a98f9614748b06c74ba43423f045fcd6dedb5dbdc0bea"
29+
"sha256": "521feb6f5ff12075ebad0758799fe7ec2675d231a0e0f5456694c8d4822a8171"
3030
}
3131
},
3232
"package://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1": {
3333
"type": "remote",
34-
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1.0.0",
34+
"uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1.0.3",
3535
"checksums": {
36-
"sha256": "02ef6f25bfca5b1d095db73ea15de79d2d2c6832ebcab61e6aba90554382abcb"
36+
"sha256": "a8934d84ffd11992d7baf6acfd97bae31d6112fa8add5cc8b5b4a722ce5b9ffc"
3737
}
3838
}
3939
}

‎.github/dependabot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
version: 2
22
updates:
3+
- package-ecosystem: gradle
4+
cooldown:
5+
default-days: 7
6+
exclude:
7+
- org.pkl-lang:*
8+
directory: /
9+
schedule:
10+
interval: weekly
311
- package-ecosystem: github-actions
12+
cooldown:
13+
default-days: 7
414
directory: /
515
ignore:
616
- dependency-name: '*'

‎.github/index.pkl‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,3 +119,21 @@ local publishJob: Workflow.Job = new {
119119
}
120120
}
121121
}
122+
123+
dependabot {
124+
updates {
125+
new {
126+
`package-ecosystem` = "gradle"
127+
directory = "/"
128+
cooldown {
129+
`default-days` = 7
130+
exclude {
131+
"org.pkl-lang:*"
132+
}
133+
}
134+
schedule {
135+
interval = "weekly"
136+
}
137+
}
138+
}
139+
}

‎.github/workflows/__lockfile__.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,7 @@ jobs:
2424
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
2525
- name: actions/upload-artifact@v5
2626
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
27+
- name: github/codeql-action/analyze@v4
28+
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
29+
- name: github/codeql-action/init@v4
30+
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4

‎.github/workflows/codeql.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Generated from Workflow.pkl. DO NOT EDIT.
2+
'on':
3+
pull_request:
4+
branches:
5+
- main
6+
push:
7+
branches:
8+
- main
9+
schedule:
10+
- cron: 29 17 * * 4
11+
jobs:
12+
analyze-actions:
13+
name: Analyze (actions)
14+
permissions:
15+
security-events: write
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
19+
with:
20+
persist-credentials: false
21+
- uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
22+
with:
23+
languages: actions
24+
build-mode: none
25+
- name: Perform CodeQL Analysis
26+
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
27+
with:
28+
category: /language:actions

‎build.gradle.kts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ plugins {
88
group = "org.pkl-lang"
99
version = "1.0-SNAPSHOT"
1010

11+
configurations {
12+
all {
13+
resolutionStrategy {
14+
failOnDynamicVersions()
15+
}
16+
}
17+
}
18+
1119
repositories {
1220
mavenCentral()
1321
}
@@ -36,7 +44,7 @@ val repos = arrayOf(
3644
"apple/pkl-swift"
3745
)
3846

39-
tasks.create<JavaExec>("generateAndPublishDocs") {
47+
val generateAndPublishDocs by tasks.registering(JavaExec::class) {
4048
group = "publish"
4149
configureBuild(doPublish = true)
4250
}
@@ -64,9 +72,10 @@ val originalRemoteName = System.getenv("PKL_ORIGINAL_REMOTE_NAME") ?: "origin"
6472
spotless {
6573
ratchetFrom = "$originalRemoteName/main"
6674
kotlin {
67-
licenseHeader("""
75+
licenseHeader(
76+
$$"""
6877
/**
69-
* Copyright © ${'$'}YEAR Apple Inc. and the Pkl project authors. All rights reserved.
78+
* Copyright © $YEAR Apple Inc. and the Pkl project authors. All rights reserved.
7079
*
7180
* Licensed under the Apache License, Version 2.0 (the "License");
7281
* you may not use this file except in compliance with the License.
@@ -83,9 +92,10 @@ spotless {
8392
""".trimIndent())
8493
}
8594
format("pkl") {
86-
licenseHeader("""
95+
licenseHeader(
96+
$$"""
8797
//===----------------------------------------------------------------------===//
88-
// Copyright © ${'$'}YEAR Apple Inc. and the Pkl project authors. All rights reserved.
98+
// Copyright © $YEAR Apple Inc. and the Pkl project authors. All rights reserved.
8999
//
90100
// Licensed under the Apache License, Version 2.0 (the "License");
91101
// you may not use this file except in compliance with the License.

‎gradle/libs.versions.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[versions]
2-
pkl = "0.+"
3-
ktor = "2.+"
2+
pkl = "0.31.1"
3+
ktor = "3.4.3"
44
spotless = "6.25.0"
5-
kotlinxSerialization = "1.6.+"
6-
kotlin = "2.+"
5+
kotlinxSerialization = "1.11.0"
6+
kotlin = "2.3.20"
77

88
[libraries]
99
pklDoc = { group = "org.pkl-lang", name = "pkl-doc", version.ref = "pkl" }

0 commit comments

Comments
 (0)