Skip to content

Commit be7fce5

Browse files
authored
Merge pull request #76 from microsoft/dilan/2.18.1-upgrade-2
2.18.1 Upgrade
2 parents 7bc16a3 + 73ee8ef commit be7fce5

File tree

685 files changed

+23186
-27582
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

685 files changed

+23186
-27582
lines changed

.github/workflows/compile-queries.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ jobs:
2929
key: all-queries
3030
- name: check formatting
3131
run: find shared */ql -type f \( -name "*.qll" -o -name "*.ql" \) -print0 | xargs -0 -n 3000 -P 10 codeql query format -q --check-only
32-
- name: Omit DatabaseQualityDiagnostics.ql from compile checking # Remove me once CodeQL 2.18.0 is released!
33-
run: mv java/ql/src/Telemetry/DatabaseQualityDiagnostics.ql{,.hidden}
3432
- name: compile queries - check-only
3533
# run with --check-only if running in a PR (github.sha != main)
3634
if : ${{ github.event_name == 'pull_request' }}
@@ -41,6 +39,3 @@ jobs:
4139
if : ${{ github.event_name != 'pull_request' }}
4240
shell: bash
4341
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500
44-
- name: Restore DatabaseQualityDiagnostics.ql after compile checking # Remove me once CodeQL 2.18.0 is released
45-
run: mv java/ql/src/Telemetry/DatabaseQualityDiagnostics.ql{.hidden,}
46-

MODULE.bazel

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ use_repo(
112112
"kotlin-compiler-1.9.0-Beta",
113113
"kotlin-compiler-1.9.20-Beta",
114114
"kotlin-compiler-2.0.0-RC1",
115+
"kotlin-compiler-2.0.20-Beta2",
115116
"kotlin-compiler-embeddable-1.5.0",
116117
"kotlin-compiler-embeddable-1.5.10",
117118
"kotlin-compiler-embeddable-1.5.20",
@@ -124,6 +125,7 @@ use_repo(
124125
"kotlin-compiler-embeddable-1.9.0-Beta",
125126
"kotlin-compiler-embeddable-1.9.20-Beta",
126127
"kotlin-compiler-embeddable-2.0.0-RC1",
128+
"kotlin-compiler-embeddable-2.0.20-Beta2",
127129
"kotlin-stdlib-1.5.0",
128130
"kotlin-stdlib-1.5.10",
129131
"kotlin-stdlib-1.5.20",
@@ -136,11 +138,16 @@ use_repo(
136138
"kotlin-stdlib-1.9.0-Beta",
137139
"kotlin-stdlib-1.9.20-Beta",
138140
"kotlin-stdlib-2.0.0-RC1",
141+
"kotlin-stdlib-2.0.20-Beta2",
139142
)
140143

141144
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
142145
go_sdk.download(version = "1.22.2")
143146

147+
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
148+
go_deps.from_file(go_mod = "//go/extractor:go.mod")
149+
use_repo(go_deps, "org_golang_x_mod", "org_golang_x_tools")
150+
144151
lfs_files = use_repo_rule("//misc/bazel:lfs.bzl", "lfs_files")
145152

146153
lfs_files(
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
class Expr extends @expr {
2+
string toString() { none() }
3+
}
4+
5+
class Location extends @location_expr {
6+
string toString() { none() }
7+
}
8+
9+
predicate isExprWithNewBuiltin(Expr expr) {
10+
exists(int kind | exprs(expr, kind, _) | 364 <= kind and kind <= 384)
11+
}
12+
13+
from Expr expr, int kind, int kind_new, Location location
14+
where
15+
exprs(expr, kind, location) and
16+
if isExprWithNewBuiltin(expr) then kind_new = 1 else kind_new = kind
17+
select expr, kind_new, location

0 commit comments

Comments
 (0)