diff --git a/Package/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Package/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata rename to .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata diff --git a/Package/.swiftpm/xcode/xcshareddata/xcschemes/Wand-CoreMotion.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/Wand_CoreMotion.xcscheme similarity index 89% rename from Package/.swiftpm/xcode/xcshareddata/xcschemes/Wand-CoreMotion.xcscheme rename to .swiftpm/xcode/xcshareddata/xcschemes/Wand_CoreMotion.xcscheme index 5d46d974..d537bc13 100644 --- a/Package/.swiftpm/xcode/xcshareddata/xcschemes/Wand-CoreMotion.xcscheme +++ b/.swiftpm/xcode/xcshareddata/xcschemes/Wand_CoreMotion.xcscheme @@ -15,9 +15,9 @@ buildForAnalyzing = "YES"> @@ -62,9 +62,9 @@ diff --git a/Wand-CoreMotion.xcodeproj/Info.plist b/App.xcodeproj/Info.plist similarity index 100% rename from Wand-CoreMotion.xcodeproj/Info.plist rename to App.xcodeproj/Info.plist diff --git a/Wand-CoreMotion.xcodeproj/Tests_Info.plist b/App.xcodeproj/Tests_Info.plist similarity index 100% rename from Wand-CoreMotion.xcodeproj/Tests_Info.plist rename to App.xcodeproj/Tests_Info.plist diff --git a/Wand-CoreMotion.xcodeproj/project.pbxproj b/App.xcodeproj/project.pbxproj similarity index 94% rename from Wand-CoreMotion.xcodeproj/project.pbxproj rename to App.xcodeproj/project.pbxproj index 8ca9d473..34eb5734 100644 --- a/Wand-CoreMotion.xcodeproj/project.pbxproj +++ b/App.xcodeproj/project.pbxproj @@ -9,9 +9,7 @@ /* Begin PBXBuildFile section */ 613966272BE0F532004C18A3 /* Play.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6162624528BC8E2A00D63EA5 /* Play.swift */; }; 613966662BE0FB0D004C18A3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6162624728BC8E2B00D63EA5 /* Assets.xcassets */; }; - 613966672BE0FB14004C18A3 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6162624628BC8E2A00D63EA5 /* ContentView.swift */; }; 6162625428BC8E2B00D63EA5 /* Play.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6162624528BC8E2A00D63EA5 /* Play.swift */; }; - 6162625628BC8E2B00D63EA5 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6162624628BC8E2A00D63EA5 /* ContentView.swift */; }; 6162625828BC8E2B00D63EA5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6162624728BC8E2B00D63EA5 /* Assets.xcassets */; }; 618F8EFD2BE9FF7B00618E7C /* Range_any.swift in Sources */ = {isa = PBXBuildFile; fileRef = 618F8EAB2BE9FDCE00618E7C /* Range_any.swift */; }; 618F8F002BE9FF7B00618E7C /* any.swift in Sources */ = {isa = PBXBuildFile; fileRef = 618F8EA92BE9FDCE00618E7C /* any.swift */; }; @@ -27,8 +25,8 @@ 618F8F2D2BEA04FA00618E7C /* String_any.swift in Sources */ = {isa = PBXBuildFile; fileRef = 618F8EAC2BE9FDCE00618E7C /* String_any.swift */; }; 618F8F2E2BEA04FD00618E7C /* Point.swift in Sources */ = {isa = PBXBuildFile; fileRef = 618F8EAE2BE9FDCE00618E7C /* Point.swift */; }; 618F8F2F2BEA04FD00618E7C /* TestTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = 618F8EAF2BE9FDCE00618E7C /* TestTools.swift */; }; - 61F648C52BEA122300C2625C /* Wand-CoreMotion in Frameworks */ = {isa = PBXBuildFile; productRef = 61F648C42BEA122300C2625C /* Wand-CoreMotion */; }; - 61F648C72BEA122900C2625C /* Wand-CoreMotion in Frameworks */ = {isa = PBXBuildFile; productRef = 61F648C62BEA122900C2625C /* Wand-CoreMotion */; }; + 61F648C52BEA122300C2625C /* Wand_CoreMotion in Frameworks */ = {isa = PBXBuildFile; productRef = 61F648C42BEA122300C2625C /* Wand_CoreMotion */; }; + 61F648C72BEA122900C2625C /* Wand_CoreMotion in Frameworks */ = {isa = PBXBuildFile; productRef = 61F648C62BEA122900C2625C /* Wand_CoreMotion */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -52,7 +50,6 @@ 613966152BE0F4EF004C18A3 /* WatchPlay.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WatchPlay.app; sourceTree = BUILT_PRODUCTS_DIR; }; 613966482BE0F87A004C18A3 /* WatchPlayTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WatchPlayTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 6162624528BC8E2A00D63EA5 /* Play.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Play.swift; sourceTree = ""; }; - 6162624628BC8E2A00D63EA5 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 6162624728BC8E2B00D63EA5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 6162624C28BC8E2B00D63EA5 /* Play.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Play.app; sourceTree = BUILT_PRODUCTS_DIR; }; 618D53D12BE3C5120098DB6F /* WandTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WandTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -67,6 +64,7 @@ 618F8F272BEA04BF00618E7C /* WatchTestPlan.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = WatchTestPlan.xctestplan; sourceTree = ""; }; 61A37BB42BE24A5F007B7FEE /* PlayTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PlayTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 61B1B41C2BC9696200BD1F36 /* Entitlements.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Entitlements.entitlements; sourceTree = ""; }; + 61B464E72BEB76B70064B4C1 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = ""; }; OBJ_141 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; OBJ_142 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; /* End PBXFileReference section */ @@ -76,7 +74,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 61F648C72BEA122900C2625C /* Wand-CoreMotion in Frameworks */, + 61F648C72BEA122900C2625C /* Wand_CoreMotion in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -91,7 +89,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 61F648C52BEA122300C2625C /* Wand-CoreMotion in Frameworks */, + 61F648C52BEA122300C2625C /* Wand_CoreMotion in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -116,9 +114,10 @@ isa = PBXGroup; children = ( 6162624728BC8E2B00D63EA5 /* Assets.xcassets */, - 6162624628BC8E2A00D63EA5 /* ContentView.swift */, 61B1B41C2BC9696200BD1F36 /* Entitlements.entitlements */, 6162624528BC8E2A00D63EA5 /* Play.swift */, + 618F8F182BEA00D400618E7C /* TestPlan.xctestplan */, + 618F8F272BEA04BF00618E7C /* WatchTestPlan.xctestplan */, ); path = App; sourceTree = ""; @@ -161,23 +160,6 @@ path = Tests; sourceTree = ""; }; - 618F8ED42BE9FDCE00618E7C /* Package */ = { - isa = PBXGroup; - children = ( - 618F8ED22BE9FDCE00618E7C /* Tests */, - ); - path = Package; - sourceTree = ""; - }; - 618F8EF92BE9FE3C00618E7C /* Tests */ = { - isa = PBXGroup; - children = ( - 618F8F182BEA00D400618E7C /* TestPlan.xctestplan */, - 618F8F272BEA04BF00618E7C /* WatchTestPlan.xctestplan */, - ); - path = Tests; - sourceTree = ""; - }; OBJ_138 /* Products */ = { isa = PBXGroup; children = ( @@ -194,10 +176,10 @@ isa = PBXGroup; children = ( 6162624428BC8E2A00D63EA5 /* App */, - 618F8EF92BE9FE3C00618E7C /* Tests */, - 618F8ED42BE9FDCE00618E7C /* Package */, + 618F8ED22BE9FDCE00618E7C /* Tests */, OBJ_138 /* Products */, OBJ_141 /* LICENSE */, + 61B464E72BEB76B70064B4C1 /* Package.swift */, OBJ_142 /* README.md */, 613966682BE0FB2E004C18A3 /* Frameworks */, ); @@ -220,7 +202,7 @@ ); name = WatchPlay; packageProductDependencies = ( - 61F648C62BEA122900C2625C /* Wand-CoreMotion */, + 61F648C62BEA122900C2625C /* Wand_CoreMotion */, ); productName = "WatchPlay Watch App"; productReference = 613966152BE0F4EF004C18A3 /* WatchPlay.app */; @@ -258,7 +240,7 @@ ); name = Play; packageProductDependencies = ( - 61F648C42BEA122300C2625C /* Wand-CoreMotion */, + 61F648C42BEA122300C2625C /* Wand_CoreMotion */, ); productName = "Sandbox (iOS)"; productReference = 6162624C28BC8E2B00D63EA5 /* Play.app */; @@ -311,7 +293,7 @@ }; }; }; - buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "Wand-CoreMotion" */; + buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "App" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = en; hasScannedForEncodings = 0; @@ -321,7 +303,7 @@ ); mainGroup = OBJ_5; packageReferences = ( - 61A37BC52BE24B97007B7FEE /* XCLocalSwiftPackageReference "Package" */, + 61A37BC52BE24B97007B7FEE /* XCLocalSwiftPackageReference "." */, ); productRefGroup = OBJ_138 /* Products */; projectDirPath = ""; @@ -374,7 +356,6 @@ buildActionMask = 2147483647; files = ( 613966272BE0F532004C18A3 /* Play.swift in Sources */, - 613966672BE0FB14004C18A3 /* ContentView.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -396,7 +377,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 6162625628BC8E2B00D63EA5 /* ContentView.swift in Sources */, 6162625428BC8E2B00D63EA5 /* Play.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -449,7 +429,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = LZSP4Z4B6A; ENABLE_PREVIEWS = YES; @@ -508,7 +488,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = LZSP4Z4B6A; ENABLE_NS_ASSERTIONS = NO; @@ -560,7 +540,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = LZSP4Z4B6A; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; @@ -583,8 +563,8 @@ SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WatchPlay.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/WatchPlay"; - WATCHOS_DEPLOYMENT_TARGET = 10.4; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WatchPlay.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)WatchPlay"; + WATCHOS_DEPLOYMENT_TARGET = 7.0; }; name = Debug; }; @@ -605,7 +585,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = LZSP4Z4B6A; ENABLE_NS_ASSERTIONS = NO; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -623,9 +603,9 @@ SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WatchPlay.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/WatchPlay"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WatchPlay.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)WatchPlay"; VALIDATE_PRODUCT = YES; - WATCHOS_DEPLOYMENT_TARGET = 10.4; + WATCHOS_DEPLOYMENT_TARGET = 7.0; }; name = Release; }; @@ -664,7 +644,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_ENTITLEMENTS = App/Entitlements.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = LZSP4Z4B6A; ENABLE_HARDENED_RUNTIME = NO; ENABLE_PREVIEWS = YES; @@ -708,7 +688,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 12.0; MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -762,7 +742,7 @@ CODE_SIGN_ENTITLEMENTS = App/Entitlements.entitlements; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = LZSP4Z4B6A; ENABLE_HARDENED_RUNTIME = NO; ENABLE_NS_ASSERTIONS = NO; @@ -801,7 +781,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 12.0; MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -835,7 +815,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = LZSP4Z4B6A; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; @@ -847,9 +827,9 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.4; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 14.4; + MACOSX_DEPLOYMENT_TARGET = 12.0; MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -882,7 +862,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = LZSP4Z4B6A; ENABLE_NS_ASSERTIONS = NO; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -890,9 +870,9 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.4; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 14.4; + MACOSX_DEPLOYMENT_TARGET = 12.0; MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -953,7 +933,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_KEY_CFBundleDisplayName = Wand; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.0; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -DXcode"; @@ -965,7 +945,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TVOS_DEPLOYMENT_TARGET = 12.0; USE_HEADERMAP = NO; - WATCHOS_DEPLOYMENT_TARGET = 4.0; + WATCHOS_DEPLOYMENT_TARGET = 7.0; XROS_DEPLOYMENT_TARGET = 1.0; }; name = Debug; @@ -1013,7 +993,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_KEY_CFBundleDisplayName = Wand; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.0; OTHER_SWIFT_FLAGS = "$(inherited) -DXcode"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1025,7 +1005,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-O"; TVOS_DEPLOYMENT_TARGET = 12.0; USE_HEADERMAP = NO; - WATCHOS_DEPLOYMENT_TARGET = 4.0; + WATCHOS_DEPLOYMENT_TARGET = 7.0; XROS_DEPLOYMENT_TARGET = 1.0; }; name = Release; @@ -1069,7 +1049,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - OBJ_2 /* Build configuration list for PBXProject "Wand-CoreMotion" */ = { + OBJ_2 /* Build configuration list for PBXProject "App" */ = { isa = XCConfigurationList; buildConfigurations = ( OBJ_3 /* Debug */, @@ -1081,21 +1061,21 @@ /* End XCConfigurationList section */ /* Begin XCLocalSwiftPackageReference section */ - 61A37BC52BE24B97007B7FEE /* XCLocalSwiftPackageReference "Package" */ = { + 61A37BC52BE24B97007B7FEE /* XCLocalSwiftPackageReference "." */ = { isa = XCLocalSwiftPackageReference; - relativePath = Package; + relativePath = .; }; /* End XCLocalSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 61F648C42BEA122300C2625C /* Wand-CoreMotion */ = { + 61F648C42BEA122300C2625C /* Wand_CoreMotion */ = { isa = XCSwiftPackageProductDependency; - productName = "Wand-CoreMotion"; + productName = Wand_CoreMotion; }; - 61F648C62BEA122900C2625C /* Wand-CoreMotion */ = { + 61F648C62BEA122900C2625C /* Wand_CoreMotion */ = { isa = XCSwiftPackageProductDependency; - package = 61A37BC52BE24B97007B7FEE /* XCLocalSwiftPackageReference "Package" */; - productName = "Wand-CoreMotion"; + package = 61A37BC52BE24B97007B7FEE /* XCLocalSwiftPackageReference "." */; + productName = Wand_CoreMotion; }; /* End XCSwiftPackageProductDependency section */ }; diff --git a/Wand-CoreMotion.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/App.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Wand-CoreMotion.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to App.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Wand-CoreMotion.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/App.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Wand-CoreMotion.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to App.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Wand-CoreMotion.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/App.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from Wand-CoreMotion.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to App.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 00000000..c1df1a67 --- /dev/null +++ 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/Wand-CoreMotion.xcodeproj/xcshareddata/swiftpm/Package.resolved b/App.xcodeproj/xcshareddata/swiftpm/Package.resolved similarity index 100% rename from Wand-CoreMotion.xcodeproj/xcshareddata/swiftpm/Package.resolved rename to App.xcodeproj/xcshareddata/swiftpm/Package.resolved diff --git a/Wand-CoreMotion.xcodeproj/xcshareddata/xcschemes/Play.xcscheme b/App.xcodeproj/xcshareddata/xcschemes/Play.xcscheme similarity index 90% rename from Wand-CoreMotion.xcodeproj/xcshareddata/xcschemes/Play.xcscheme rename to App.xcodeproj/xcshareddata/xcschemes/Play.xcscheme index a1316aa2..74312918 100644 --- a/Wand-CoreMotion.xcodeproj/xcshareddata/xcschemes/Play.xcscheme +++ b/App.xcodeproj/xcshareddata/xcschemes/Play.xcscheme @@ -17,7 +17,7 @@ BlueprintIdentifier = "6162624B28BC8E2B00D63EA5" BuildableName = "Play.app" BlueprintName = "Play" - ReferencedContainer = "container:Wand-CoreMotion.xcodeproj"> + ReferencedContainer = "container:App.xcodeproj"> @@ -35,7 +35,7 @@ BlueprintIdentifier = "6162624B28BC8E2B00D63EA5" BuildableName = "Play.app" BlueprintName = "Play" - ReferencedContainer = "container:Wand-CoreMotion.xcodeproj"> + ReferencedContainer = "container:App.xcodeproj"> @@ -47,7 +47,7 @@ shouldUseLaunchSchemeArgsEnv = "YES"> @@ -59,7 +59,7 @@ BlueprintIdentifier = "618D53D02BE3C5120098DB6F" BuildableName = "WandTests.xctest" BlueprintName = "WandTests" - ReferencedContainer = "container:Wand-CoreMotion.xcodeproj"> + ReferencedContainer = "container:App.xcodeproj"> @@ -81,7 +81,7 @@ BlueprintIdentifier = "6162624B28BC8E2B00D63EA5" BuildableName = "Play.app" BlueprintName = "Play" - ReferencedContainer = "container:Wand-CoreMotion.xcodeproj"> + ReferencedContainer = "container:App.xcodeproj"> + ReferencedContainer = "container:App.xcodeproj"> diff --git a/Wand-CoreMotion.xcodeproj/xcshareddata/xcschemes/watchPlay.xcscheme b/App.xcodeproj/xcshareddata/xcschemes/watchPlay.xcscheme similarity index 90% rename from Wand-CoreMotion.xcodeproj/xcshareddata/xcschemes/watchPlay.xcscheme rename to App.xcodeproj/xcshareddata/xcschemes/watchPlay.xcscheme index f79846c3..16823dcc 100644 --- a/Wand-CoreMotion.xcodeproj/xcshareddata/xcschemes/watchPlay.xcscheme +++ b/App.xcodeproj/xcshareddata/xcschemes/watchPlay.xcscheme @@ -18,7 +18,7 @@ BlueprintIdentifier = "613966142BE0F4EF004C18A3" BuildableName = "WatchPlay.app" BlueprintName = "WatchPlay" - ReferencedContainer = "container:Wand-CoreMotion.xcodeproj"> + ReferencedContainer = "container:App.xcodeproj"> @@ -30,7 +30,7 @@ shouldUseLaunchSchemeArgsEnv = "YES"> @@ -52,7 +52,7 @@ BlueprintIdentifier = "613966142BE0F4EF004C18A3" BuildableName = "WatchPlay.app" BlueprintName = "WatchPlay" - ReferencedContainer = "container:Wand-CoreMotion.xcodeproj"> + ReferencedContainer = "container:App.xcodeproj"> + ReferencedContainer = "container:App.xcodeproj"> diff --git a/App/ContentView.swift b/App/ContentView.swift deleted file mode 100644 index fbfb734f..00000000 --- a/App/ContentView.swift +++ /dev/null @@ -1,35 +0,0 @@ -/// -/// Copyright © 2020-2024 El Machine 🤖 -/// https://el-machine.com/ -/// -/// Licensed under the Apache License, Version 2.0 (the "License"); -/// you may not use this file except in compliance with the License. -/// You may obtain a copy of the License at -/// -/// 1) LICENSE file -/// 2) https://apache.org/licenses/LICENSE-2.0 -/// -/// Unless required by applicable law or agreed to in writing, software -/// distributed under the License is distributed on an "AS IS" BASIS, -/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -/// See the License for the specific language governing permissions and -/// limitations under the License. -/// - -import SwiftUI - -@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/App/Entitlements.entitlements b/App/Entitlements.entitlements index a711ca37..0c67376e 100644 --- a/App/Entitlements.entitlements +++ b/App/Entitlements.entitlements @@ -1,12 +1,5 @@ - - com.apple.developer.nfc.readersession.formats - - TAG - - com.apple.security.personal-information.addressbook - - + diff --git a/App/Play.swift b/App/Play.swift index e1e0b8b3..cc93a041 100644 --- 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 b/App/TestPlan.xctestplan similarity index 86% rename from Tests/TestPlan.xctestplan rename to App/TestPlan.xctestplan index 70c5d1c5..219df7af 100644 --- a/Tests/TestPlan.xctestplan +++ b/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 b/App/WatchTestPlan.xctestplan similarity index 87% rename from Tests/WatchTestPlan.xctestplan rename to App/WatchTestPlan.xctestplan index 8ffd9321..8819498d 100644 --- a/Tests/WatchTestPlan.xctestplan +++ b/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 b/Package.resolved similarity index 100% rename from Package/Package.resolved rename to Package.resolved diff --git a/Package/Package.swift b/Package.swift similarity index 86% rename from Package/Package.swift rename to Package.swift index ec3172dc..71373fc7 100644 --- a/Package/Package.swift +++ b/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/Package/Sources/Wand-CoreMotion/Wanded/CoreMotion/CMPedometerData_Ask.swift b/Sources/Wand_CoreMotion/Wanded/CoreMotion/CMPedometerData_Ask.swift similarity index 100% rename from Package/Sources/Wand-CoreMotion/Wanded/CoreMotion/CMPedometerData_Ask.swift rename to Sources/Wand_CoreMotion/Wanded/CoreMotion/CMPedometerData_Ask.swift diff --git a/Package/Sources/Wand-CoreMotion/Wanded/CoreMotion/CMPedometerEvent_Ask.swift b/Sources/Wand_CoreMotion/Wanded/CoreMotion/CMPedometerEvent_Ask.swift similarity index 100% rename from Package/Sources/Wand-CoreMotion/Wanded/CoreMotion/CMPedometerEvent_Ask.swift rename to Sources/Wand_CoreMotion/Wanded/CoreMotion/CMPedometerEvent_Ask.swift diff --git a/Package/Sources/Wand-CoreMotion/Wanded/CoreMotion/CMPedometer_Obtain.swift b/Sources/Wand_CoreMotion/Wanded/CoreMotion/CMPedometer_Obtain.swift similarity index 100% rename from Package/Sources/Wand-CoreMotion/Wanded/CoreMotion/CMPedometer_Obtain.swift rename to Sources/Wand_CoreMotion/Wanded/CoreMotion/CMPedometer_Obtain.swift diff --git a/Package/Tests/WandTests/CoreMotion_Tests.swift b/Tests/WandTests/CoreMotion_Tests.swift similarity index 100% rename from Package/Tests/WandTests/CoreMotion_Tests.swift rename to Tests/WandTests/CoreMotion_Tests.swift diff --git a/Package/Tests/WandTests/_Tools/Point.swift b/Tests/WandTests/_Tools/Point.swift similarity index 97% rename from Package/Tests/WandTests/_Tools/Point.swift rename to Tests/WandTests/_Tools/Point.swift index cd06a49b..0f243dee 100644 --- a/Package/Tests/WandTests/_Tools/Point.swift +++ b/Tests/WandTests/_Tools/Point.swift @@ -20,7 +20,6 @@ import Foundation -import Wand_CoreMotion import Wand internal diff --git a/Package/Tests/WandTests/_Tools/TestTools.swift b/Tests/WandTests/_Tools/TestTools.swift similarity index 100% rename from Package/Tests/WandTests/_Tools/TestTools.swift rename to Tests/WandTests/_Tools/TestTools.swift diff --git a/Package/Tests/WandTests/_Tools/any/CoreLocation_any.swift b/Tests/WandTests/_Tools/any/CoreLocation_any.swift similarity index 100% rename from Package/Tests/WandTests/_Tools/any/CoreLocation_any.swift rename to Tests/WandTests/_Tools/any/CoreLocation_any.swift diff --git a/Package/Tests/WandTests/_Tools/any/Range_any.swift b/Tests/WandTests/_Tools/any/Range_any.swift similarity index 100% rename from Package/Tests/WandTests/_Tools/any/Range_any.swift rename to Tests/WandTests/_Tools/any/Range_any.swift diff --git a/Package/Tests/WandTests/_Tools/any/String_any.swift b/Tests/WandTests/_Tools/any/String_any.swift similarity index 100% rename from Package/Tests/WandTests/_Tools/any/String_any.swift rename to Tests/WandTests/_Tools/any/String_any.swift diff --git a/Package/Tests/WandTests/_Tools/any/any.swift b/Tests/WandTests/_Tools/any/any.swift similarity index 100% rename from Package/Tests/WandTests/_Tools/any/any.swift rename to Tests/WandTests/_Tools/any/any.swift