Merge pull request #37 from chenhaiteng/develop

To solve package cannot be resolved in Xcode 13 and Playground 4 for iPad
chenhaiteng · Jan 1, 2022 · 3728195 · 3728195
2 parents b477f64 + 99105d4
commit 3728195
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 27 deletions.
diff --git a/Sources/Common/PropertyWrapper/Clamping.md → Markdown/Common/PropertyWrapper/Clamping.md b/Sources/Common/PropertyWrapper/Clamping.md → Markdown/Common/PropertyWrapper/Clamping.md
diff --git a/Sources/Rings/ArchimedeanSpiralText.md → Markdown/Rings/ArchimedeanSpiralText.md b/Sources/Rings/ArchimedeanSpiralText.md → Markdown/Rings/ArchimedeanSpiralText.md
diff --git a/Sources/Rings/ClockIndex.md → Markdown/Rings/ClockIndex.md b/Sources/Rings/ClockIndex.md → Markdown/Rings/ClockIndex.md
diff --git a/Sources/Rings/HandAiguille.md → Markdown/Rings/HandAiguille.md b/Sources/Rings/HandAiguille.md → Markdown/Rings/HandAiguille.md
diff --git a/Sources/Rings/Knob.md → Markdown/Rings/Knob.md b/Sources/Rings/Knob.md → Markdown/Rings/Knob.md
diff --git a/...ngs/KnobComponents/Layers/ArcKnobDemo.gif → ...ngs/KnobComponents/Layers/ArcKnobDemo.gif b/...ngs/KnobComponents/Layers/ArcKnobDemo.gif → ...ngs/KnobComponents/Layers/ArcKnobDemo.gif
diff --git a/...ngs/KnobComponents/Layers/ArcKnobLayer.md → ...ngs/KnobComponents/Layers/ArcKnobLayer.md b/...ngs/KnobComponents/Layers/ArcKnobLayer.md → ...ngs/KnobComponents/Layers/ArcKnobLayer.md
diff --git a/Sources/Rings/KnobDemo1.gif → Markdown/Rings/KnobDemo1.gif b/Sources/Rings/KnobDemo1.gif → Markdown/Rings/KnobDemo1.gif
diff --git a/Sources/Rings/KnobDemo2.gif → Markdown/Rings/KnobDemo2.gif b/Sources/Rings/KnobDemo2.gif → Markdown/Rings/KnobDemo2.gif
diff --git a/Sources/Rings/RingText.md → Markdown/Rings/RingText.md b/Sources/Rings/RingText.md → Markdown/Rings/RingText.md
diff --git a/Sources/Rings/RingTextDemo.gif → Markdown/Rings/RingTextDemo.gif b/Sources/Rings/RingTextDemo.gif → Markdown/Rings/RingTextDemo.gif
diff --git a/Sources/Rings/SphericText.md → Markdown/Rings/SphericText.md b/Sources/Rings/SphericText.md → Markdown/Rings/SphericText.md
diff --git a/Package.swift b/Package.swift
@@ -27,30 +27,13 @@ let package = Package(
         // 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.
         .target(name: "Common",
-                dependencies: [],
-                exclude: ["PropertyWrapper/Clamping.md"]),
+                dependencies: []),
         .target(
             name: "Rings",
-            dependencies: ["CoreGraphicsExtension", "Common", "ArchimedeanSpiral", "GradientBuilder", "SequenceBuilder"],
-            exclude: ["RingText.md",
-                      "ClockIndex.md",
-                      "ArchimedeanSpiralText.md",
-                      "HandAiguille.md",
-                      "SphericText.md",
-                      "Knob.md",
-                      "KnobComponents/Layers/ArcKnobLayer.md",
-                      "KnobComponents/Layers/ArcKnobDemo.gif"]),
+            dependencies: ["CoreGraphicsExtension", "Common", "ArchimedeanSpiral", "GradientBuilder", "SequenceBuilder"]),
         .testTarget(
             name: "RingsTests",
             dependencies: ["Rings",
-                           "CoreGraphicsExtension", "Common"],
-            exclude: ["RingText.md",
-                      "ClockIndex.md",
-                      "ArchimedeanSpiralText.md",
-                      "HandAiguille.md",
-                      "SphericText.md",
-                      "Knob.md",
-                      "KnobComponents/Layers/ArcKnobLayer.md",
-                      "KnobComponents/Layers/ArcKnobDemo.gif"]),
+                           "CoreGraphicsExtension", "Common"]),
     ]
 )
diff --git a/README.md b/README.md
@@ -55,9 +55,9 @@ targets: [
 ## RingText
 
 ### What it looks like
-![RingDemo](Sources/Rings/RingTextDemo.gif)
+![RingDemo](Markdown/Rings/RingTextDemo.gif)
 
-### ![How to use it](Sources/Rings/RingText.md)
+### ![How to use it](Markdown/Rings/RingText.md)
 
 ## ClockIndex
 
@@ -66,36 +66,36 @@ targets: [
 
 <img width="598" alt="earchly_clock_demo" src="https://user-images.githubusercontent.com/1284944/116664737-73baa880-a9cb-11eb-97e1-afcb49dfcfcd.png">
 
-### ![How to use it](Sources/Rings/ClockIndex.md)
+### ![How to use it](Markdown/Rings/ClockIndex.md)
 
 ## HandAiguille
 
 ### What it looks like:
 ![HandAguille](https://user-images.githubusercontent.com/1284944/118101511-47128200-b40a-11eb-870f-90ac2f2a302a.gif)
 
-### ![How to use it](Sources/Rings/HandAiguille.md)
+### ![How to use it](Markdown/Rings/HandAiguille.md)
 
 ## ArchimedeanSpiralText
 
 ### What it looks like:
 ![ArchimedeanSpiralTextDemo](https://user-images.githubusercontent.com/1284944/117950922-3ef10e80-b346-11eb-9da1-50b0f87990a2.gif)
 
-### ![How to use it](Sources/Rings/ArchimedeanSpiralText.md)
+### ![How to use it](Markdown/Rings/ArchimedeanSpiralText.md)
 
 ## SphericText
 
 ### What it looks like:
 ![Spheric Text Demo](https://user-images.githubusercontent.com/1284944/118671827-60f8fe00-b82a-11eb-9f0f-821841867cba.gif)
 
-### ![How to use it](Sources/Rings/SphericText.md)
+### ![How to use it](Markdown/Rings/SphericText.md)
 
 ## Knob
 
 ### What it looks like:
 ![Knob Demo](https://user-images.githubusercontent.com/1284944/120065810-e2138900-c0a5-11eb-8324-2fe340bb578f.gif)
 
 
-### ![How to use it](Sources/Rings/Knob.md)
+### ![How to use it](Markdown/Rings/Knob.md)
 
 ---
 # License