1.0 RC

El-Machine · May 8, 2024 · a602a61 · a602a61
1 parent f5ed2a6
commit a602a61
Show file tree

Hide file tree

Showing 29 changed files with 101 additions and 132 deletions.
diff --git a/...kage.xcworkspace/contents.xcworkspacedata → ...kage.xcworkspace/contents.xcworkspacedata b/...kage.xcworkspace/contents.xcworkspacedata → ...kage.xcworkspace/contents.xcworkspacedata
diff --git a/...eddata/xcschemes/Wand-CoreMotion.xcscheme → ...eddata/xcschemes/Wand_CoreMotion.xcscheme b/...eddata/xcschemes/Wand-CoreMotion.xcscheme → ...eddata/xcschemes/Wand_CoreMotion.xcscheme
@@ -15,9 +15,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Wand-CoreMotion"
-               BuildableName = "Wand-CoreMotion"
-               BlueprintName = "Wand-CoreMotion"
+               BlueprintIdentifier = "Wand_CoreMotion"
+               BuildableName = "Wand_CoreMotion"
+               BlueprintName = "Wand_CoreMotion"
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
@@ -62,9 +62,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "Wand-CoreMotion"
-            BuildableName = "Wand-CoreMotion"
-            BlueprintName = "Wand-CoreMotion"
+            BlueprintIdentifier = "Wand_CoreMotion"
+            BuildableName = "Wand_CoreMotion"
+            BlueprintName = "Wand_CoreMotion"
             ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>

diff --git a/Wand-CoreMotion.xcodeproj/Info.plist → App.xcodeproj/Info.plist b/Wand-CoreMotion.xcodeproj/Info.plist → App.xcodeproj/Info.plist
diff --git a/Wand-CoreMotion.xcodeproj/Tests_Info.plist → App.xcodeproj/Tests_Info.plist b/Wand-CoreMotion.xcodeproj/Tests_Info.plist → App.xcodeproj/Tests_Info.plist
diff --git a/Wand-CoreMotion.xcodeproj/project.pbxproj → App.xcodeproj/project.pbxproj b/Wand-CoreMotion.xcodeproj/project.pbxproj → App.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...xcshareddata/WorkspaceSettings.xcsettings → ...xcshareddata/WorkspaceSettings.xcsettings b/...xcshareddata/WorkspaceSettings.xcsettings → ...xcshareddata/WorkspaceSettings.xcsettings
diff --git a/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,15 @@
+{
+  "originHash" : "fd61d4ccdd746ec868212d45186b68aa7fa26c58fc6ce6af0b3230278e699ccf",
+  "pins" : [
+    {
+      "identity" : "wand",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/El-Machine/Wand.git",
+      "state" : {
+        "revision" : "4c63748fc58997fa83463216b1aea466c05f0ff9",
+        "version" : "0.1.9"
+      }
+    }
+  ],
+  "version" : 3
+}
diff --git a/...roj/xcshareddata/swiftpm/Package.resolved → ...roj/xcshareddata/swiftpm/Package.resolved b/...roj/xcshareddata/swiftpm/Package.resolved → ...roj/xcshareddata/swiftpm/Package.resolved
diff --git a/...proj/xcshareddata/xcschemes/Play.xcscheme → ...proj/xcshareddata/xcschemes/Play.xcscheme b/...proj/xcshareddata/xcschemes/Play.xcscheme → ...proj/xcshareddata/xcschemes/Play.xcscheme
@@ -17,7 +17,7 @@
                      BlueprintIdentifier = "6162624B28BC8E2B00D63EA5"
                      BuildableName = "Play.app"
                      BlueprintName = "Play"
-                     ReferencedContainer = "container:Wand-CoreMotion.xcodeproj">
+                     ReferencedContainer = "container:App.xcodeproj">
                   </BuildableReference>
                </EnvironmentBuildable>
             </ActionContent>
@@ -35,7 +35,7 @@
                BlueprintIdentifier = "6162624B28BC8E2B00D63EA5"
                BuildableName = "Play.app"
                BlueprintName = "Play"
-               ReferencedContainer = "container:Wand-CoreMotion.xcodeproj">
+               ReferencedContainer = "container:App.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -47,7 +47,7 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <TestPlans>
          <TestPlanReference
-            reference = "container:Tests/TestPlan.xctestplan"
+            reference = "container:App/TestPlan.xctestplan"
             default = "YES">
          </TestPlanReference>
       </TestPlans>
@@ -59,7 +59,7 @@
                BlueprintIdentifier = "618D53D02BE3C5120098DB6F"
                BuildableName = "WandTests.xctest"
                BlueprintName = "WandTests"
-               ReferencedContainer = "container:Wand-CoreMotion.xcodeproj">
+               ReferencedContainer = "container:App.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -81,7 +81,7 @@
             BlueprintIdentifier = "6162624B28BC8E2B00D63EA5"
             BuildableName = "Play.app"
             BlueprintName = "Play"
-            ReferencedContainer = "container:Wand-CoreMotion.xcodeproj">
+            ReferencedContainer = "container:App.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <LocationScenarioReference
@@ -102,7 +102,7 @@
             BlueprintIdentifier = "6162624B28BC8E2B00D63EA5"
             BuildableName = "Play.app"
             BlueprintName = "Play"
-            ReferencedContainer = "container:Wand-CoreMotion.xcodeproj">
+            ReferencedContainer = "container:App.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

diff --git a/...xcshareddata/xcschemes/watchPlay.xcscheme → ...xcshareddata/xcschemes/watchPlay.xcscheme b/...xcshareddata/xcschemes/watchPlay.xcscheme → ...xcshareddata/xcschemes/watchPlay.xcscheme
@@ -18,7 +18,7 @@
                BlueprintIdentifier = "613966142BE0F4EF004C18A3"
                BuildableName = "WatchPlay.app"
                BlueprintName = "WatchPlay"
-               ReferencedContainer = "container:Wand-CoreMotion.xcodeproj">
+               ReferencedContainer = "container:App.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -30,7 +30,7 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <TestPlans>
          <TestPlanReference
-            reference = "container:Tests/WatchTestPlan.xctestplan"
+            reference = "container:App/WatchTestPlan.xctestplan"
             default = "YES">
          </TestPlanReference>
       </TestPlans>
@@ -52,7 +52,7 @@
             BlueprintIdentifier = "613966142BE0F4EF004C18A3"
             BuildableName = "WatchPlay.app"
             BlueprintName = "WatchPlay"
-            ReferencedContainer = "container:Wand-CoreMotion.xcodeproj">
+            ReferencedContainer = "container:App.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <LocationScenarioReference
@@ -73,7 +73,7 @@
             BlueprintIdentifier = "613966142BE0F4EF004C18A3"
             BuildableName = "WatchPlay.app"
             BlueprintName = "WatchPlay"
-            ReferencedContainer = "container:Wand-CoreMotion.xcodeproj">
+            ReferencedContainer = "container:App.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

diff --git a/App/ContentView.swift b/App/ContentView.swift
diff --git a/App/Entitlements.entitlements b/App/Entitlements.entitlements
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>com.apple.developer.nfc.readersession.formats</key>
-	<array>
-		<string>TAG</string>
-	</array>
-	<key>com.apple.security.personal-information.addressbook</key>
-	<true/>
-</dict>
+<dict/>
 </plist>
diff --git a/App/Play.swift b/App/Play.swift
@@ -24,8 +24,26 @@ struct PlayApp: App {
 
     var body: some Scene {
         WindowGroup {
+
             ContentView()
+
         }
     }
 
 }
+
+@available(tvOS 13, watchOS 6, *)
+struct ContentView: View {
+
+    var body: some View {
+
+        Text("Hello, Wand |")
+
+    }
+
+}
+
+@available(tvOS 13, watchOS 6, *)
+#Preview {
+    ContentView()
+}
diff --git a/Tests/TestPlan.xctestplan → App/TestPlan.xctestplan b/Tests/TestPlan.xctestplan → App/TestPlan.xctestplan
@@ -22,9 +22,9 @@
   "testTargets" : [
     {
       "target" : {
-        "containerPath" : "container:Wand-CoreMotion.xcodeproj",
+        "containerPath" : "container:App.xcodeproj",
         "identifier" : "618D53D02BE3C5120098DB6F",
-        "name" : "Tests"
+        "name" : "WandTests"
       }
     }
   ],

diff --git a/Tests/WatchTestPlan.xctestplan → App/WatchTestPlan.xctestplan b/Tests/WatchTestPlan.xctestplan → App/WatchTestPlan.xctestplan
@@ -22,9 +22,8 @@
   },
   "testTargets" : [
     {
-      "parallelizable" : true,
       "target" : {
-        "containerPath" : "container:Wand-Tools.xcodeproj",
+        "containerPath" : "container:App.xcodeproj",
         "identifier" : "613966472BE0F87A004C18A3",
         "name" : "WatchPlayTests"
       }

diff --git a/Package/Package.resolved → Package.resolved b/Package/Package.resolved → Package.resolved
diff --git a/Package/Package.swift → Package.swift b/Package/Package.swift → Package.swift
@@ -23,27 +23,27 @@
 import PackageDescription
 
 let package = Package(
-    name: "Wand-CoreMotion",
+    name: "Wand_CoreMotion",
     defaultLocalization: "ru",
     platforms: [
         .iOS(.v14), .macOS(.v11), .watchOS(.v4), .tvOS(.v12)
     ],
     products: [
         .library(
-            name: "Wand-CoreMotion",
-            targets: ["Wand-CoreMotion"]),
+            name: "Wand_CoreMotion",
+            targets: ["Wand_CoreMotion"]),
     ],
     dependencies: [
         .package(url: "https://github.com/El-Machine/Wand.git", from: "0.1.9")
     ],
     targets: [
         .target(
-            name: "Wand-CoreMotion",
+            name: "Wand_CoreMotion",
             dependencies: [
                 .product(name: "Wand", package: "Wand")
             ]),
         .testTarget(
             name: "WandTests",
-            dependencies: ["Wand-CoreMotion"]),
+            dependencies: ["Wand_CoreMotion"]),
     ]
 )
diff --git a/...nded/CoreMotion/CMPedometerData_Ask.swift → ...nded/CoreMotion/CMPedometerData_Ask.swift b/...nded/CoreMotion/CMPedometerData_Ask.swift → ...nded/CoreMotion/CMPedometerData_Ask.swift
diff --git a/...ded/CoreMotion/CMPedometerEvent_Ask.swift → ...ded/CoreMotion/CMPedometerEvent_Ask.swift b/...ded/CoreMotion/CMPedometerEvent_Ask.swift → ...ded/CoreMotion/CMPedometerEvent_Ask.swift
diff --git a/...anded/CoreMotion/CMPedometer_Obtain.swift → ...anded/CoreMotion/CMPedometer_Obtain.swift b/...anded/CoreMotion/CMPedometer_Obtain.swift → ...anded/CoreMotion/CMPedometer_Obtain.swift
diff --git a/...ge/Tests/WandTests/CoreMotion_Tests.swift → Tests/WandTests/CoreMotion_Tests.swift b/...ge/Tests/WandTests/CoreMotion_Tests.swift → Tests/WandTests/CoreMotion_Tests.swift
diff --git a/Package/Tests/WandTests/_Tools/Point.swift → Tests/WandTests/_Tools/Point.swift b/Package/Tests/WandTests/_Tools/Point.swift → Tests/WandTests/_Tools/Point.swift
@@ -20,7 +20,6 @@
 
 import Foundation
 
-import Wand_CoreMotion
 import Wand
 
 internal

diff --git a/...ge/Tests/WandTests/_Tools/TestTools.swift → Tests/WandTests/_Tools/TestTools.swift b/...ge/Tests/WandTests/_Tools/TestTools.swift → Tests/WandTests/_Tools/TestTools.swift
diff --git a/...ndTests/_Tools/any/CoreLocation_any.swift → ...ndTests/_Tools/any/CoreLocation_any.swift b/...ndTests/_Tools/any/CoreLocation_any.swift → ...ndTests/_Tools/any/CoreLocation_any.swift
diff --git a/...ests/WandTests/_Tools/any/Range_any.swift → Tests/WandTests/_Tools/any/Range_any.swift b/...ests/WandTests/_Tools/any/Range_any.swift → Tests/WandTests/_Tools/any/Range_any.swift
diff --git a/...sts/WandTests/_Tools/any/String_any.swift → Tests/WandTests/_Tools/any/String_any.swift b/...sts/WandTests/_Tools/any/String_any.swift → Tests/WandTests/_Tools/any/String_any.swift
diff --git a/Package/Tests/WandTests/_Tools/any/any.swift → Tests/WandTests/_Tools/any/any.swift b/Package/Tests/WandTests/_Tools/any/any.swift → Tests/WandTests/_Tools/any/any.swift