Incorporate feedback

Author: grynspan

Documentation/Proposals/NNNN-json-abi.md

@@ -204,6 +204,11 @@ Package Manager:
 | `--event-stream-output` | File system path | Specifies a path to a file, named pipe, etc. to which output should be written. |
 | `--event-stream-version` | Integer | Specifies the version of the stable JSON schema to use for output. |
 
+The process for adding arguments to Swift Package Manager is separate from the
+process for Swift Testing API changes, so the names of these arguments are
+speculative and are subject to change as part of the Swift Package Manager
+review process.
+
 If `--configuration-path` is specified, Swift Testing will open it for reading
 and attempt to decode its contents as JSON. If `--event-stream-output` is
 specified, Swift Testing will open it for writing and will write a sequence of

Sources/Testing/CMakeLists.txt

@@ -7,17 +7,17 @@
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 add_library(Testing
-  EntryPoints/ABIEntryPoint.swift
-  EntryPoints/ABIv0/ABIv0.Record.swift
-  EntryPoints/ABIv0/ABIv0.Record+Streaming.swift
-  EntryPoints/ABIv0/ABIv0.swift
-  EntryPoints/ABIv0/Encoded/ABIv0.EncodedEvent.swift
-  EntryPoints/ABIv0/Encoded/ABIv0.EncodedInstant.swift
-  EntryPoints/ABIv0/Encoded/ABIv0.EncodedIssue.swift
-  EntryPoints/ABIv0/Encoded/ABIv0.EncodedMessage.swift
-  EntryPoints/ABIv0/Encoded/ABIv0.EncodedTest.swift
-  EntryPoints/EntryPoint.swift
-  EntryPoints/SwiftPMEntryPoint.swift
+  ABI/EntryPoints/ABIEntryPoint.swift
+  ABI/EntryPoints/EntryPoint.swift
+  ABI/EntryPoints/SwiftPMEntryPoint.swift
+  ABI/v0/ABIv0.Record.swift
+  ABI/v0/ABIv0.Record+Streaming.swift
+  ABI/v0/ABIv0.swift
+  ABI/v0/Encoded/ABIv0.EncodedEvent.swift
+  ABI/v0/Encoded/ABIv0.EncodedInstant.swift
+  ABI/v0/Encoded/ABIv0.EncodedIssue.swift
+  ABI/v0/Encoded/ABIv0.EncodedMessage.swift
+  ABI/v0/Encoded/ABIv0.EncodedTest.swift
   Events/Clock.swift
   Events/Event.swift
   Events/Recorder/Event.ConsoleOutputRecorder.swift