Commit d1c99be
authored
feat(manifest): --facts mode emits Socket facts JSON for Gradle projects (REA-442) (#1318)
* feat(manifest): add --facts mode to socket manifest gradle (REA-442)
Generates a per-(sub)project .socket.facts.json describing the resolved
compile/runtime dependency graph, matching the canonical SocketFacts
schema consumed by depscan's SBOM_Resolve pipeline.
The new init script (socket-facts.init.gradle) registers a socketFacts
task on every project, walks resolvable compile/runtime classpaths via
LenientConfiguration so unresolved deps degrade gracefully instead of
failing the build, dedupes Gradle's variant artifacts
(java-classes-directory vs jar) into one component per logical Maven
coordinate, and classifies prod/dev correctly (prod-seen-anywhere wins;
production deps are no longer flagged dev just because test classpaths
inherit them). Output filename matches Coana's .socket.facts.json so the
depscan **/*.socket.facts.json glob picks both pre- and
post-reachability versions out of a scan tarball.
The TS wrapper (convert-gradle-to-facts.mts) routes --facts through the
project's ./gradlew by default; the init script is bundled into dist/
alongside the existing pom-generating init.gradle.
Verified end-to-end across JDK 8/Gradle 5.6.4, JDK 11/Gradle 6.9.4,
JDK 17/Gradle 7.6.4, JDK 21/Gradle 8.10.2, JDK 21/Gradle 9.2.1 —
outputs byte-identical after JSON normalization across the matrix on
the test fixtures.
Test fixtures cover single-module Java, multi-module with project deps,
and an unresolvable-dep scenario. The integration test
(socket-facts-init-gradle.e2e.test.mts) is e2e-only and auto-skips
when no gradle binary is on PATH; CI doesn't yet install JDK/Gradle.
Open follow-ups (tracked in REA-442):
- AGP-aware variant config discovery and an Android fixture
- Kotlin Multiplatform fixture to exercise kotlin.targets.compilations
- Mirror --facts onto cmd-manifest-kotlin and the auto-detect path
- Promote the sdkman matrix sweep to a CI job
* test(manifest): drop gradle facts integration suite, match existing surface tests
The previous commit added an e2e test that runs the socket-facts init
script against real Gradle fixtures. That's broader coverage than the
sibling `socket manifest gradle` / `kotlin` / `auto` commands currently
have in CI — those are tested only via `--help` snapshot and a
`--dry-run` short-circuit, and never actually invoke gradle. Bring the
new `--facts` mode in line: keep the help-text snapshot (already
covers the new flag) and add a `--facts --dry-run` case that mirrors
the existing dry-run test pattern.
Removes the e2e test and the gradle-facts fixtures; drops the matching
.gitignore entries that no longer have anywhere to apply.
The matrix sweep and integration coverage stay as an open follow-up in
REA-442 — to be picked up alongside `setup-java`/`setup-gradle` in CI
if/when we want any of the gradle commands actually exercised end-to-end.
* fix(manifest): don't emit the scan-target project as a facts component
The socketFacts init script was adding the project being scanned as a
component in its own .socket.facts.json. With no parent edges this
shows up downstream as `orphaned component not reachable from any
direct dependency`. The project is the SBOM target, not one of its own
dependencies — drop the root node entirely and let `directIds` carry
the first-level edges. afterEvaluate is no longer needed since project
coordinates were only used to populate that root entry.
* feat(manifest): mirror --facts onto kotlin and auto-detect paths
cmd-manifest-kotlin.mts: add the --facts flag (also overridable via
defaults.manifest.gradle.facts in socket.json) and route through
convertGradleToFacts when set. Test pair (--help snapshot + --facts
--dry-run) mirrors what we did for cmd-manifest-gradle.
generate_auto_manifest.mts: when defaults.manifest.gradle.facts is
true, the auto-detect path now generates Socket facts instead of pom
files, matching what the explicit subcommands do.
Brings the new mode to feature parity with the existing pom path,
which is exposed through gradle, kotlin and auto.
* feat(manifest): surface --facts in socket manifest setup wizard
`socket manifest setup` now asks whether gradle should emit Socket
facts instead of pom.xml files, writing the answer to
defaults.manifest.gradle.facts in socket.json. The prompt sits next to
the existing --verbose toggle and follows the same yes/no/leave-default
ternary shape.
* test(manifest): restore gradle facts integration test, install JDK+Gradle in e2e CI
Brings back the e2e test and gradle-facts fixtures we dropped earlier
in this branch and wires `setup-java@v4` + `gradle/actions/setup-gradle@v4`
into .github/workflows/e2e-tests.yml so the test actually exercises the
init script on every PR (it was previously auto-skipping for lack of a
gradle binary).
Fixtures keep the guava 31.1-jre / slf4j 1.7.36 pins so resolution
stays clean across Gradle 5.6.4 through 9.2.1 in the local sdkman
matrix. The e2e CI uses Gradle 9.2.1 / JDK 21 as a single baseline;
wider Gradle version coverage in CI is still tracked as a follow-up.
Also restores the .gitignore entries for the .gradle/, build/,
.socket.facts.json, and pom.xml outputs that integration runs produce.
* feat(manifest): cover Android Gradle Plugin variants in --facts
Adds an android-library fixture (AGP 8.7.3, compileSdk 34) and the
minimum machinery the init script needs to scrape AGP-flavored
classpaths without blowing up.
Two changes to socket-facts.init.gradle:
- Skip configurations matching *AndroidTest* (instrumented tests).
Their resolution needs device-vs-host target attributes the init
script doesn't set, and they fail before producing useful data.
- Wrap per-configuration resolution in try/catch. AGP unit-test
classpaths (releaseUnitTestCompileClasspath etc.) pull in the
project's own debugApiElements, which exposes multiple variants
(android-classes-jar, r-class-jar, android-lint, ...); without
consumer-side build-type attributes we hit "variant ambiguity"
errors. We log "[socket-facts] skipping <cfg>: ..." and continue
so other classpaths still produce output. Production (release +
debug compile/runtime) variants resolve fine.
The e2e test skips the Android case when neither ANDROID_HOME nor
ANDROID_SDK_ROOT is set — same auto-skip posture as the rest of the
gradle suite. Asserts that androidx.annotation:annotation is captured
as a direct dep, confirming AGP variant configs are being walked.
Still pending: principled discovery via androidComponents.onVariants
(AGP 7+) or android.libraryVariants — current name-pattern matching
catches Android variant configs by suffix and gets the job done, but
isn't AGP-aware in the strict sense.
* test(manifest): add Kotlin Multiplatform fixture for --facts
A minimal KMP project (jvm + js targets) exercises per-target compile
and runtime classpaths (jvmMainCompileClasspath, jsTestRuntimeClasspath,
...) that aren't surfaced through Java's SourceSetContainer. Our
name-pattern selection picks them up by suffix.
The fixture pulls kotlinx-serialization-core (commonMain) so it shows
up in both jvm and js target variants of the artifact, and slf4j-api
(jvmMain-only) to confirm target-specific classpaths flow through. The
test asserts both deps are present in the resulting components array.
* feat(manifest): emit `tooling` flag on facts components
Widens what `socket manifest gradle --facts` emits: instead of
whitelisting only `*CompileClasspath` / `*RuntimeClasspath`
configurations and silently dropping the rest, we now walk every
resolvable configuration and tag each artifact with two independent
boolean flags:
- `dev: true` ← artifact only ever appeared in test-named configs
- `tooling: true` ← artifact only ever appeared outside compile/runtime
classpaths (annotation processors, linters,
code-gen plugins, gradle plugin internals)
"Only ever" means the inverse semantic: if a dep also appears in a
non-test classpath, `dev` is cleared; if it also appears in a
compile/runtime classpath, `tooling` is cleared. So a dep that shows
up as both an `api` and an `annotationProcessor` ends up flagged as
neither dev nor tooling — the production usage wins.
Motivation: downstream reachability scanners (depscan) want to
suppress reachability analysis for tooling artifacts, while still
including them in the SBOM for non-reachability alerts (malware,
license, supply chain). This was previously impossible because the
script dropped tooling deps entirely.
Schema: relies on a new `tooling: z.boolean().optional()` on
SF_ArtifactSchema in depscan, separate work. The cli side emits the
field regardless; older consumers that ignore it stay unaffected.
Fixture/test: single-module-java now declares
`annotationProcessor 'org.projectlombok:lombok:1.18.30'`, exercising
the tooling path. A new test case asserts lombok is emitted with
tooling=true while guava (api) and junit (testImplementation) are
not.
Effect on existing fixtures:
- single-module-java: 11 components total (10 non-tooling + lombok)
- kotlin-multiplatform: 29 components (11 non-tooling + 18 Kotlin
compiler plugin classpath deps as tooling)
- android-library: 83 components (5 non-tooling, 78 AGP internals
as tooling) — previously these AGP internals were dropped
- multi-module-java, unresolved-deps: unchanged shape
* fix(manifest): make --verbose actually stream gradle output live
Today both the pom path and the facts path print
"(It will show no output, you can use --verbose to see its output)"
but --verbose only dumped a captured stdout dump *after* gradle
finished. For large multi-project builds (elasticsearch-scale), that
means the user stared at a spinner for many minutes with no signal
that anything was happening.
When --verbose is set, spawn gradle with `stdio: 'inherit'` so the
build's stdout/stderr stream live to the user's terminal. The spinner
is skipped (would conflict with inherited tty output) and the post-run
"Reported exports:" / "POM file copied to:" summary is skipped too —
those lines were already visible inline during the streamed run.
Non-verbose runs are unchanged: spinner + captured stdout + summary.
Also corrects the misleading "(It will show no output, you can use
--verbose to see its output)" message to "(No live output. Pass
--verbose to stream gradle output instead.)".
* perf(manifest): stop downloading artifact files in facts init script
`dep.moduleArtifacts` access combined with `.file.isDirectory()`
filtering was forcing Gradle to *download* every resolved artifact
file. On large multi-project builds (e.g. elasticsearch) this pulled
hundreds of MB of distribution archives — .deb / .tar.gz / .zip
packaging outputs that some configurations expose as dependencies of
the build target itself, not as library deps. User observed:
`> :qa:packaging:socketFacts > elasticsearch-7.17.22-amd64.deb >
88.3 MiB/310.4 MiB downloaded` mid-task.
Fix: read `artifact.type` / `artifact.extension` / `artifact.classifier`
from already-fetched POM/GMM metadata. Never touch `artifact.file` —
that's what triggers the actual file download. Replace the
`!file.isDirectory()` filter (which forced fetch) with a name-based
filter (`INTERNAL_ARTIFACT_TYPES`: java-classes-directory,
java-resources-directory, android-classes-directory,
android-resources-directory) that drops Gradle-internal variants we
don't want to surface as `qualifiers.ext`.
Verified locally:
- commons-io:commons-io:2.15.1 resolves cleanly under cleared cache,
emits qualifiers.ext='jar', no jar in
~/.gradle/caches/modules-2/files-2.1/commons-io after the run
- 11/11 e2e fixture tests still green, qualifiers preserved across
single-module / multi-module / Android / KMP fixtures
* feat(manifest): emit single facts file per build, drop intra-project deps
Previously each subproject's `socketFacts` task emitted its own
`.socket.facts.json`, and intra-project deps (`project(':lib')`)
flowed into every consuming subproject's file with no signal that
they're project-local. Downstream consumers (coana `mvn dependency:get`)
would then try to resolve them against Maven Central and fail because
those coordinates don't publish to a repository.
Restructured to mirror the pattern at
program-analysis/plugins/coana-gradle-script/coana-workspaces.init.gradle:
- shared accumulators (`nodes`, `directIds`, `reportedUnresolved`,
`projectKeys`) live on `gradle.ext.socketFactsState` as
synchronized collections, so --parallel-enabled builds don't race
- per-subproject `socketFactsCollect` tasks resolve that
subproject's configurations and contribute to the shared state
- a root `socketFacts` task depends on every collector (via
`gradle.projectsEvaluated`) and serializes the aggregated graph
to a single `.socket.facts.json` at the build root
Intra-project deps are dropped at visit time: when a ResolvedDependency
matches a known project's `group:name`, we return an empty
producedIds set, don't emit a node, and don't recurse. The externals
those project deps expose are picked up via the intra-project's own
collector instead (Gradle's classpath inheritance gives the consumer
subproject those externals directly, and the producer subproject's
collector emits them with `direct: true` from its own classpath
position).
Verified across the fixture matrix:
- single-module-java: unchanged shape (no intra-project deps)
- multi-module-java: emits ONE file at build root, no
`com.example.socket:lib` or `com.example.socket:app` entries,
guava (lib api) + slf4j (app impl) both present
- unresolved-deps, kotlin-multiplatform, android-library: unchanged
Side benefits: no more empty `.socket.facts.json` files on aggregator
subprojects, and the unresolved-dep warning dedupes across the build.
* fix(ci): correct gradle/actions v4 commit SHA pin
Zizmor's `impostor-commit` audit failed because the SHA I used
(0b6dd653...) was the v4 *tag object* SHA, not the commit it
dereferences to. gradle/actions uses nested annotated tags — v4
points to another tag (48b5f213...) which points to commit
ed408507eac0... That last hop is what should be pinned.
setup-java@v4 was already correct (resolves directly to a commit).
* fix(scan): stop stripping .socket.facts.json from --reach upload; clean up after success
Two paired changes so the new `socket manifest gradle --facts` producer
flow works end-to-end with `socket scan create . --reach`:
perform-reachability-analysis.mts: previously stripped any
`.socket.facts.json` from the manifest upload to compute-artifacts.
That filter was added when the only source of such a file in the scan
dir was a leftover post-reachability output from coana. With the new
producer flow that file is *legitimate input* to compute-artifacts,
so the strip would have made the backend return 0 artifacts and coana
would have nothing to analyze. Removed.
handle-create-new-scan.mts: on a successful scan, unlink the
`.socket.facts.json` coana wrote at the path we instructed it to write
to (`reachResult.data.reachabilityReport`). Failed scans leave the
file in place for debugging. We only delete the path we explicitly
control — producer-written `.socket.facts.json` is user-owned input
and not touched here, though in the --reach path coana has already
overwritten that file with its enriched output so it ends up being
the same file path that gets removed anyway.
Verified end-to-end against the single-module-java fixture using
`socket manifest setup` (writing `defaults.manifest.gradle.facts:
true` to socket.json) and `socket scan create . --reach
--auto-manifest`: each run regenerates the facts file via the gradle
generator, uploads to compute-artifacts, coana enriches, scan
succeeds, and the file is cleaned up — making the command safely
repeatable.
Behavior note for users: because coana writes to `.socket.facts.json`
and we delete that file after a successful scan, any standalone
producer output also at that path gets removed. Users running
`socket manifest gradle --facts` followed by `socket scan create .
--reach` will need to re-run the producer before each subsequent
scan, OR (recommended) drive the producer via `--auto-manifest`
which regenerates on every run.
* chore(gitignore): scope gradle-facts ignores to a nested .gitignore
Move the gradle-facts-related transient patterns from the root
.gitignore into a nested .gitignore at
test/fixtures/commands/manifest/gradle-facts/. Patterns become
unanchored (`.gradle/`, `build/`, `.socket.facts.json`) and tighten
to the three things `socket manifest gradle --facts` runs actually
produce — the previously listed `pom.xml` and `local.properties`
patterns weren't generated by the --facts flow and have been dropped.
Keeps the root .gitignore tidy and makes the transience signal
visible to anyone working in the fixtures directory.
* review(#1318): address PR feedback (findings 1, 2, 3, 4, 6, 8)
Finding 1 — Kotlin Multiplatform fixture: bump
`org.jetbrains.kotlin.multiplatform` from 1.9.25 (officially supports
Gradle 6.8.3-8.6) to 2.1.0 (supports Gradle 9.x). CI installs Gradle
9.2.1 so the old plugin version would fail. Smoke-tested locally.
Finding 2 — `handle-create-new-scan.mts`: rename
`filterToCdxSpdxAndFactsFiles` → `filterToCdxSpdxOnly`. The
"AndFactsFiles" branch in the function was dead at the only call site
because the caller had already stripped `.socket.facts.json` from the
input. Dropped the basename check from the function body; semantics
unchanged.
Finding 3 — Aggregator's `node.children` read now happens under
`synchronized(nodes)` to mirror the writers in each
`socketFactsCollect` doLast. Task dependencies via
`aggregator.dependsOn(collector)` already establish a happens-before
edge, but explicit synchronization makes the contract local and
removes any implicit reliance on Gradle's task-graph memory
visibility semantics. The aggregator snapshots into plain List/Map
values first, then builds the JSON outside the critical section.
Finding 4 — `convert-gradle-to-facts.mts`: replace
`output.stdout.replace(regex, callback)`-for-side-effects pattern
with `Array.from(stdout.matchAll(regex), m => m[1])`. Reads more
directly.
Finding 6 — Cross-reference comments at both
`ext.SOCKET_FACTS_FILENAME` (Groovy) and `DOT_SOCKET_DOT_FACTS_JSON`
(TS) noting that the two values are intentionally duplicated (Groovy
can't import a TS constant) and must be kept in sync.
Finding 8 — When the Gradle script's `components.isEmpty()` branch
fires (no resolvable dependencies in the build), the TS wrapper no
longer prints a bare "Reported exports:" header followed by nothing.
It now suppresses the header when `matchAll` returns zero exports,
and surfaces the `[socket-facts] no resolvable dependencies` skip
message from Gradle stdout if present so the user understands why
the file wasn't written.
Not changed (replies posted separately):
- Finding 5: `.toLowerCase()` IS load-bearing on case-insensitive
filesystems (macOS HFS+, Windows). The constant is lowercase; the
input might not be. Keeping the normalization.
- Finding 7: function ordering left to match the existing
`convert_gradle_to_maven.mts` pattern — consistency with precedent
wins over the literal CLAUDE.md rule here.
* release: v1.1.98
- Bump Coana CLI to 15.3.8 (package.json + pnpm-lock.yaml).
- CHANGELOG entry for the new `socket manifest gradle --facts` /
`socket manifest kotlin --facts` mode shipping alongside the
previously-unreleased Bazel work, plus the Coana bump.
- Drop now-redundant `.toLowerCase()` from the .socket.facts.json
basename check in handle-create-new-scan.mts (per PR review
Finding 5 — we control every producer of this filename).
* ci: probe — comment out gradle/actions/setup-gradle to isolate startup_failure
* ci: probe 2 — also remove setup-java to verify nothing in my changes is the cause
* ci: revert e2e-tests.yml + drop gradle integration suite
actions/setup-java@v4 isn't on the repo's GitHub Actions allowlist
(confirmed by isolating it via probe — workflow_dispatch and
pull_request both failed with startup_failure at 0s while it was
included; removing it made the workflow start). The PR can't ship
with the e2e workflow file failing to start.
Reverting .github/workflows/e2e-tests.yml to match v1.x exactly,
and deleting src/commands/manifest/socket-facts-init-gradle.e2e.test.mts
rather than leaving it in place auto-skipping (which would look like
real test coverage that's actually silent).
Test fixtures under test/fixtures/commands/manifest/gradle-facts/
remain — they're still useful for manual local `gradle --init-script
... socketFacts` runs while iterating on the script.
Follow-up: wire JDK + Gradle into the e2e job (either by getting
actions/setup-java added to the org allowlist, or inline-installing
both via curl + SHA verify per the existing pnpm/sfw-free pattern)
and restore the e2e suite.1 parent ac00b7c commit d1c99be
32 files changed
Lines changed: 930 additions & 72 deletions
File tree
- .config
- src
- commands
- manifest
- scan
- utils
- test/fixtures/commands/manifest/gradle-facts
- android-library
- kotlin-multiplatform
- multi-module-java
- app
- lib
- single-module-java
- unresolved-deps
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
82 | 91 | | |
83 | 92 | | |
84 | 93 | | |
| |||
458 | 467 | | |
459 | 468 | | |
460 | 469 | | |
| 470 | + | |
461 | 471 | | |
462 | 472 | | |
463 | 473 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | | - | |
10 | 8 | | |
11 | 9 | | |
12 | 10 | | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
13 | 19 | | |
14 | 20 | | |
15 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| |||
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
31 | 37 | | |
32 | 38 | | |
33 | 39 | | |
| |||
110 | 116 | | |
111 | 117 | | |
112 | 118 | | |
113 | | - | |
| 119 | + | |
114 | 120 | | |
115 | 121 | | |
116 | 122 | | |
| |||
140 | 146 | | |
141 | 147 | | |
142 | 148 | | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
143 | 157 | | |
144 | 158 | | |
145 | 159 | | |
| |||
175 | 189 | | |
176 | 190 | | |
177 | 191 | | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
178 | 207 | | |
179 | 208 | | |
180 | 209 | | |
181 | | - | |
182 | | - | |
183 | | - | |
184 | | - | |
| 210 | + | |
185 | 211 | | |
186 | 212 | | |
187 | 213 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
85 | 86 | | |
86 | 87 | | |
87 | 88 | | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
88 | 107 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| |||
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
36 | 42 | | |
37 | 43 | | |
38 | 44 | | |
| |||
115 | 121 | | |
116 | 122 | | |
117 | 123 | | |
118 | | - | |
| 124 | + | |
119 | 125 | | |
120 | 126 | | |
121 | 127 | | |
| |||
145 | 151 | | |
146 | 152 | | |
147 | 153 | | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
148 | 162 | | |
149 | 163 | | |
150 | 164 | | |
| |||
180 | 194 | | |
181 | 195 | | |
182 | 196 | | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
183 | 212 | | |
184 | 213 | | |
185 | 214 | | |
186 | | - | |
187 | | - | |
188 | | - | |
189 | | - | |
| 215 | + | |
190 | 216 | | |
191 | 217 | | |
192 | 218 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
85 | 86 | | |
86 | 87 | | |
87 | 88 | | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
88 | 107 | | |
0 commit comments