Merge pull request #2362 from KaitoMuraoka/fix/document-tutorial

Tutorial updated to support Xcode15

Author: ahoppen

Sources/SwiftSyntax/Documentation.docc/Resources/Package.step1.swift

@@ -1,27 +1,22 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
   name: "importformatter",
   products: [
-    // Products define the executables and libraries a package produces, and make them visible to other packages.
+    // Products define the executables and libraries a package produces, making them visible to other packages.
     .library(
       name: "importformatter",
       targets: ["importformatter"]
     )
   ],
-  dependencies: [
-    // Dependencies declare other packages that this package depends on.
-    // .package(url: /* package url */, from: "1.0.0"),
-  ],
   targets: [
-    // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-    // Targets can depend on other targets in this package, and on products in packages this package depends on.
+    // Targets are the basic building blocks of a package, defining a module or a test suite.
+    // Targets can depend on other targets in this package and products from dependencies.
     .target(
-      name: "importformatter",
-      dependencies: []
+      name: "importformatter"
     ),
     .testTarget(
       name: "importformatterTests",

Sources/SwiftSyntax/Documentation.docc/Resources/Package.step2.swift

@@ -1,27 +1,22 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
   name: "importformatter",
   products: [
-    // Products define the executables and libraries a package produces, and make them visible to other packages.
+    // Products define the executables and libraries a package produces, making them visible to other packages.
     .executable(
       name: "importformatter",
       targets: ["importformatter"]
     )
   ],
-  dependencies: [
-    // Dependencies declare other packages that this package depends on.
-    // .package(url: /* package url */, from: "1.0.0"),
-  ],
   targets: [
-    // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-    // Targets can depend on other targets in this package, and on products in packages this package depends on.
+    // Targets are the basic building blocks of a package, defining a module or a test suite.
+    // Targets can depend on other targets in this package and products from dependencies.
     .executableTarget(
-      name: "importformatter",
-      dependencies: []
+      name: "importformatter"
     ),
     .testTarget(
       name: "importformatterTests",

Sources/SwiftSyntax/Documentation.docc/Resources/Package.step3.swift

@@ -1,12 +1,12 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
   name: "importformatter",
   products: [
-    // Products define the executables and libraries a package produces, and make them visible to other packages.
+    // Products define the executables and libraries a package produces, making them visible to other packages.
     .executable(
       name: "importformatter",
       targets: ["importformatter"]
@@ -17,11 +17,10 @@ let package = Package(
     .package(url: "https://github.com/apple/swift-syntax.git", branch: "main")
   ],
   targets: [
-    // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-    // Targets can depend on other targets in this package, and on products in packages this package depends on.
+    // Targets are the basic building blocks of a package, defining a module or a test suite.
+    // Targets can depend on other targets in this package and products from dependencies.
     .executableTarget(
-      name: "importformatter",
-      dependencies: []
+      name: "importformatter"
     ),
     .testTarget(
       name: "importformatterTests",

Sources/SwiftSyntax/Documentation.docc/Resources/Package.step4.swift

@@ -1,12 +1,12 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
   name: "importformatter",
   products: [
-    // Products define the executables and libraries a package produces, and make them visible to other packages.
+    // Products define the executables and libraries a package produces, making them visible to other packages.
     .executable(
       name: "importformatter",
       targets: ["importformatter"]
@@ -17,8 +17,8 @@ let package = Package(
     .package(url: "https://github.com/apple/swift-syntax.git", branch: "main")
   ],
   targets: [
-    // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-    // Targets can depend on other targets in this package, and on products in packages this package depends on.
+    // Targets are the basic building blocks of a package, defining a module or a test suite.
+    // Targets can depend on other targets in this package and products from dependencies.
     .executableTarget(
       name: "importformatter",
       dependencies: [

Sources/SwiftSyntax/Documentation.docc/Resources/Package.step5.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -9,7 +9,7 @@ let package = Package(
     .macOS(.v10_15)
   ],
   products: [
-    // Products define the executables and libraries a package produces, and make them visible to other packages.
+    // Products define the executables and libraries a package produces, making them visible to other packages.
     .executable(
       name: "importformatter",
       targets: ["importformatter"]
@@ -20,8 +20,8 @@ let package = Package(
     .package(url: "https://github.com/apple/swift-syntax.git", branch: "main")
   ],
   targets: [
-    // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-    // Targets can depend on other targets in this package, and on products in packages this package depends on.
+    // Targets are the basic building blocks of a package, defining a module or a test suite.
+    // Targets can depend on other targets in this package and products from dependencies.
     .executableTarget(
       name: "importformatter",
       dependencies: [

Sources/SwiftSyntax/Documentation.docc/Tutorials/SwiftSyntax By Example.tutorial

@@ -51,6 +51,12 @@
     }
 
     @Steps {
+       @Step {
+        Open the `Package.swift` file created in the previous section.
+            
+        @Code(name: "Package.swift", file: Package.step2.swift)
+      }
+        
       @Step {
         Add the `swift-syntax` package to the dependencies section of your 
         `Package.swift` file.