Skip to content

Commit

Permalink
chore: update with latest code
Browse files Browse the repository at this point in the history
  • Loading branch information
@x86y
x86y committed Oct 16, 2023
1 parent 4be1d07 commit e1052fa
Show file tree
Hide file tree
Showing 18 changed files with 242 additions and 69 deletions.
64 changes: 38 additions & 26 deletions Beacon.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
F32D9E9029966FCD007BC97C /* Keyboard.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = F3B198F1299518E900FE664F /* Keyboard.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
F32D9E9629967067007BC97C /* libcbqn.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F3B198E02995184400FE664F /* libcbqn.a */; };
F32D9E972996710A007BC97C /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3877C8B29952A5400E2FCB5 /* ContentView.swift */; };
F361BF092AD2A74C00200F72 /* curl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3AC4D252A4F6C3000B4FECD /* curl.xcframework */; };
F361BF0C2AD2A76700200F72 /* DashboardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3DF82892A4EF33A00F6CD19 /* DashboardView.swift */; };
F3877C8E29952A6600E2FCB5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F3877C8D29952A6600E2FCB5 /* Assets.xcassets */; };
F38F03A92A323F8500F66354 /* libksim.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F38F03A82A323F8500F66354 /* libksim.a */; };
F3AC4D262A4F6C3100B4FECD /* curl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3AC4D252A4F6C3000B4FECD /* curl.xcframework */; };
Expand All @@ -38,30 +40,24 @@
F3B198F4299518E900FE664F /* KeyboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B198F3299518E900FE664F /* KeyboardViewController.swift */; };
F3B19907299518F900FE664F /* BQNInputSetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B198FE299518F800FE664F /* BQNInputSetProvider.swift */; };
F3B19909299518F900FE664F /* KeyboardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B19900299518F800FE664F /* KeyboardView.swift */; };
F3B1990A299518F900FE664F /* DemoKeyboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B19901299518F800FE664F /* DemoKeyboardViewController.swift */; };
F3B1990A299518F900FE664F /* KbViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B19901299518F800FE664F /* KbViewController.swift */; };
F3B1990B299518F900FE664F /* KeyboardAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B19902299518F800FE664F /* KeyboardAppearance.swift */; };
F3B1990C299518F900FE664F /* KeyboardActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B19903299518F900FE664F /* KeyboardActionHandler.swift */; };
F3B1990D299518F900FE664F /* KeyboardLayoutProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B19904299518F900FE664F /* KeyboardLayoutProvider.swift */; };
F3B1990E299518F900FE664F /* AutocompleteProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B19905299518F900FE664F /* AutocompleteProvider.swift */; };
F3B199142995195C00FE664F /* KeyboardKit in Frameworks */ = {isa = PBXBuildFile; productRef = F3B199132995195C00FE664F /* KeyboardKit */; };
F3B199152995199000FE664F /* stdlib in Resources */ = {isa = PBXBuildFile; fileRef = F3B198DB2995181700FE664F /* stdlib */; };
F3CEF79D2A94D3E000DC8858 /* KeyboardKit in Frameworks */ = {isa = PBXBuildFile; productRef = F3CEF79C2A94D3E000DC8858 /* KeyboardKit */; };
F3CEF79E2A94D85500DC8858 /* Keyboard.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = F3B198F1299518E900FE664F /* Keyboard.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
F3D296822A404A3E00AD21A2 /* History.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3D296812A404A3E00AD21A2 /* History.swift */; };
F3D296832A404A3E00AD21A2 /* History.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3D296812A404A3E00AD21A2 /* History.swift */; };
F3DF828A2A4EF33A00F6CD19 /* DashboardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3DF82892A4EF33A00F6CD19 /* DashboardView.swift */; };
F3DF828B2A4F22FF00F6CD19 /* libk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F3512E082A4CE18D00658F24 /* libk.a */; };
F3E1DFEF2A31F56800B4A553 /* Keyboard.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = F3B198F1299518E900FE664F /* Keyboard.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
F3E1DFF42A31F9D800B4A553 /* ConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3E1DFF32A31F9D800B4A553 /* ConfigView.swift */; };
F3E1DFF52A31F9D800B4A553 /* ConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3E1DFF32A31F9D800B4A553 /* ConfigView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
F32D9E8029966FCD007BC97C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = F3B198C2299517DA00FE664F /* Project object */;
proxyType = 1;
remoteGlobalIDString = F3B198F0299518E900FE664F;
remoteInfo = Keyboard;
};
F3E1DFF02A31F56800B4A553 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = F3B198C2299517DA00FE664F /* Project object */;
Expand All @@ -85,14 +81,14 @@
};
F3E1DFF22A31F56800B4A553 /* Embed Foundation Extensions */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 8;
dstPath = I;
buildActionMask = 12;
dstPath = "";
dstSubfolderSpec = 13;
files = (
F3E1DFEF2A31F56800B4A553 /* Keyboard.appex in Embed Foundation Extensions */,
F3CEF79E2A94D85500DC8858 /* Keyboard.appex in Embed Foundation Extensions */,
);
name = "Embed Foundation Extensions";
runOnlyForDeploymentPostprocessing = 1;
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

Expand Down Expand Up @@ -127,7 +123,7 @@
F3B198F3299518E900FE664F /* KeyboardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardViewController.swift; sourceTree = "<group>"; };
F3B198FE299518F800FE664F /* BQNInputSetProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BQNInputSetProvider.swift; sourceTree = "<group>"; };
F3B19900299518F800FE664F /* KeyboardView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardView.swift; sourceTree = "<group>"; };
F3B19901299518F800FE664F /* DemoKeyboardViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoKeyboardViewController.swift; sourceTree = "<group>"; };
F3B19901299518F800FE664F /* KbViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KbViewController.swift; sourceTree = "<group>"; };
F3B19902299518F800FE664F /* KeyboardAppearance.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardAppearance.swift; sourceTree = "<group>"; };
F3B19903299518F900FE664F /* KeyboardActionHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardActionHandler.swift; sourceTree = "<group>"; };
F3B19904299518F900FE664F /* KeyboardLayoutProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardLayoutProvider.swift; sourceTree = "<group>"; };
Expand All @@ -144,6 +140,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F361BF092AD2A74C00200F72 /* curl.xcframework in Frameworks */,
F38F03A92A323F8500F66354 /* libksim.a in Frameworks */,
F32D9E8829966FCD007BC97C /* simbqn.a in Frameworks */,
F32D9E8929966FCD007BC97C /* Introspect in Frameworks */,
Expand All @@ -154,6 +151,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F3CEF79D2A94D3E000DC8858 /* KeyboardKit in Frameworks */,
F3DF828B2A4F22FF00F6CD19 /* libk.a in Frameworks */,
F3AC4D262A4F6C3100B4FECD /* curl.xcframework in Frameworks */,
F32D9E9629967067007BC97C /* libcbqn.a in Frameworks */,
Expand Down Expand Up @@ -270,7 +268,7 @@
F3B19903299518F900FE664F /* KeyboardActionHandler.swift */,
F3B19902299518F800FE664F /* KeyboardAppearance.swift */,
F3B19904299518F900FE664F /* KeyboardLayoutProvider.swift */,
F3B19901299518F800FE664F /* DemoKeyboardViewController.swift */,
F3B19901299518F800FE664F /* KbViewController.swift */,
F3B19905299518F900FE664F /* AutocompleteProvider.swift */,
F3B19900299518F800FE664F /* KeyboardView.swift */,
F3B198F3299518E900FE664F /* KeyboardViewController.swift */,
Expand Down Expand Up @@ -312,7 +310,6 @@
buildRules = (
);
dependencies = (
F32D9E7F29966FCD007BC97C /* PBXTargetDependency */,
);
name = BeaconSim;
packageProductDependencies = (
Expand All @@ -338,6 +335,7 @@
);
name = Beacon;
packageProductDependencies = (
F3CEF79C2A94D3E000DC8858 /* KeyboardKit */,
);
productName = Beacon;
productReference = F3B198CA299517DA00FE664F /* Beacon.app */;
Expand Down Expand Up @@ -393,6 +391,7 @@
packageReferences = (
F3B1990F2995193C00FE664F /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */,
F3B199122995195C00FE664F /* XCRemoteSwiftPackageReference "KeyboardKit" */,
F3CEF79B2A94D3E000DC8858 /* XCRemoteSwiftPackageReference "KeyboardKit" */,
);
productRefGroup = F3B198CB299517DA00FE664F /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -443,6 +442,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F361BF0C2AD2A76700200F72 /* DashboardView.swift in Sources */,
F3D296832A404A3E00AD21A2 /* History.swift in Sources */,
F31BCE792A33B33E00A6116D /* Utils.swift in Sources */,
F3E1DFF52A31F9D800B4A553 /* ConfigView.swift in Sources */,
Expand Down Expand Up @@ -481,7 +481,7 @@
F3B19909299518F900FE664F /* KeyboardView.swift in Sources */,
F3B1990D299518F900FE664F /* KeyboardLayoutProvider.swift in Sources */,
F3B1990E299518F900FE664F /* AutocompleteProvider.swift in Sources */,
F3B1990A299518F900FE664F /* DemoKeyboardViewController.swift in Sources */,
F3B1990A299518F900FE664F /* KbViewController.swift in Sources */,
F3B1990C299518F900FE664F /* KeyboardActionHandler.swift in Sources */,
F3B19907299518F900FE664F /* BQNInputSetProvider.swift in Sources */,
);
Expand All @@ -490,11 +490,6 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
F32D9E7F29966FCD007BC97C /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = F3B198F0299518E900FE664F /* Keyboard */;
targetProxy = F32D9E8029966FCD007BC97C /* PBXContainerItemProxy */;
};
F3E1DFF12A31F56800B4A553 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = F3B198F0299518E900FE664F /* Keyboard */;
Expand All @@ -516,6 +511,7 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Beacon copy-Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = Arrayground;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand All @@ -531,7 +527,7 @@
"$(PROJECT_DIR)/Beacon/libs",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = arrscience.Beacon;
PRODUCT_BUNDLE_IDENTIFIER = arrscience.Beacons;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "Beacon/Utilities/Beacon-Bridging-Header.h";
Expand All @@ -553,6 +549,7 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Beacon copy-Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = Arrayground;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand All @@ -568,7 +565,7 @@
"$(PROJECT_DIR)/Beacon/libs",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = arrscience.Beacon;
PRODUCT_BUNDLE_IDENTIFIER = arrscience.Beacons;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "Beacon/Utilities/Beacon-Bridging-Header.h";
Expand Down Expand Up @@ -713,7 +710,7 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Beacon/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Beacon;
INFOPLIST_KEY_CFBundleDisplayName = Arrayground;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
Expand Down Expand Up @@ -760,7 +757,7 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Beacon/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Beacon;
INFOPLIST_KEY_CFBundleDisplayName = Arrayground;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
Expand Down Expand Up @@ -803,6 +800,7 @@
INFOPLIST_FILE = Keyboard/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Keyboard;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -828,6 +826,7 @@
INFOPLIST_FILE = Keyboard/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Keyboard;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -909,6 +908,14 @@
minimumVersion = 7.0.0;
};
};
F3CEF79B2A94D3E000DC8858 /* XCRemoteSwiftPackageReference "KeyboardKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/KeyboardKit/KeyboardKit";
requirement = {
kind = exactVersion;
version = 7.9.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand All @@ -922,6 +929,11 @@
package = F3B199122995195C00FE664F /* XCRemoteSwiftPackageReference "KeyboardKit" */;
productName = KeyboardKit;
};
F3CEF79C2A94D3E000DC8858 /* KeyboardKit */ = {
isa = XCSwiftPackageProductDependency;
package = F3CEF79B2A94D3E000DC8858 /* XCRemoteSwiftPackageReference "KeyboardKit" */;
productName = KeyboardKit;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = F3B198C2299517DA00FE664F /* Project object */;
Expand Down
4 changes: 2 additions & 2 deletions Beacon.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/KeyboardKit/KeyboardKit",
"state" : {
"revision" : "f37349496bf1569e4f28ed13c3f0d698dafa09aa",
"version" : "7.7.0"
"revision" : "f6bd1def639641b2cff9ca4cddbb4615aa717e5c",
"version" : "7.9.0"
}
},
{
Expand Down
77 changes: 77 additions & 0 deletions Beacon.xcodeproj/xcshareddata/xcschemes/BeaconSim 1.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1500"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F32D9E7E29966FCD007BC97C"
BuildableName = "BeaconSim.app"
BlueprintName = "BeaconSim"
ReferencedContainer = "container:Beacon.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F32D9E7E29966FCD007BC97C"
BuildableName = "BeaconSim.app"
BlueprintName = "BeaconSim"
ReferencedContainer = "container:Beacon.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F32D9E7E29966FCD007BC97C"
BuildableName = "BeaconSim.app"
BlueprintName = "BeaconSim"
ReferencedContainer = "container:Beacon.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading

0 comments on commit e1052fa

Please sign in to comment.