Skip to content

Commit 3869eec

Browse files
latenitefilmslatenitefilms
committed
Merge remote-tracking branch 'upstream/master'
2 parents abda638 + 37057a0 commit 3869eec

File tree

740 files changed

+20971
-12596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

740 files changed

+20971
-12596
lines changed

‎.github/workflows/stale.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: 'Close stale Issues/PRs'
2+
on:
3+
schedule:
4+
- cron: '30 1 * * *'
5+
workflow_dispatch:
6+
7+
jobs:
8+
stale:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/stale@v9
12+
with:
13+
stale-issue-message: 'This issue needs more information. Please see our request above.'
14+
close-issue-message: 'No information was received, closing this Issue for now.'
15+
stale-issue-label: 'stale'
16+
days-before-issue-stale: 30
17+
days-before-issue-close: 30
18+
only-labels: 'needs-response'
19+
days-before-pr-stale: -1
20+
days-before-pr-close: -1

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,5 @@ xcuserdata/
4444
*.xcscmblueprint
4545

4646
.vscode
47+
48+
Brewfile.lock.json

‎Brewfile‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
tap "a7ex/homebrew-formulae"
2+
3+
brew "coreutils"
4+
brew "jq"
5+
brew "xcbeautify"
6+
brew "gawk"
7+
brew "cocoapods"
8+
brew "gh"
9+
brew "gpg"
10+
brew "a7ex/homebrew-formulae/xcresultparser"

‎Hammerspoon.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,17 @@
7676
2290EB2128011DF100CEA572 /* HSRazerOrbweaverDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 2290EB1F28011DF100CEA572 /* HSRazerOrbweaverDevice.h */; };
7777
22A6626025FC080200AA329E /* test_serial.lua in Resources */ = {isa = PBXBuildFile; fileRef = 22A6625F25FC07F700AA329E /* test_serial.lua */; };
7878
22A6626225FC087000AA329E /* HSserial.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6626125FC087000AA329E /* HSserial.m */; };
79+
22C9153327A108F000E650A2 /* LuaSkin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FB852342735B02400462DD0 /* LuaSkin.framework */; };
80+
22C9154427A1091B00E650A2 /* HSRazerDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 2213843127A105DD0085CA24 /* HSRazerDevice.m */; };
81+
22C9154527A1091B00E650A2 /* HSRazerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2213842D27A105DD0085CA24 /* HSRazerManager.m */; };
82+
22C9154627A1091B00E650A2 /* HSRazerTartarusV2Device.m in Sources */ = {isa = PBXBuildFile; fileRef = 2213842C27A105DD0085CA24 /* HSRazerTartarusV2Device.m */; };
83+
22C9154727A1091B00E650A2 /* librazer.m in Sources */ = {isa = PBXBuildFile; fileRef = 2213842B27A105DD0085CA24 /* librazer.m */; };
84+
22C9154827A1092A00E650A2 /* HSRazerDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 2213843027A105DD0085CA24 /* HSRazerDevice.h */; };
85+
22C9154927A1092A00E650A2 /* HSRazerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2213843227A105DD0085CA24 /* HSRazerManager.h */; };
86+
22C9154A27A1092A00E650A2 /* HSRazerTartarusV2Device.h in Headers */ = {isa = PBXBuildFile; fileRef = 2213842E27A105DD0085CA24 /* HSRazerTartarusV2Device.h */; };
87+
22C9154B27A1092A00E650A2 /* razer.h in Headers */ = {isa = PBXBuildFile; fileRef = 2213842F27A105DD0085CA24 /* razer.h */; };
88+
22C9154E27A1095200E650A2 /* librazer.dylib in Copy Extension Dylibs */ = {isa = PBXBuildFile; fileRef = 22C9154327A108F000E650A2 /* librazer.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
89+
22C9155027A1099700E650A2 /* razer.lua in Copy Extension Lua files */ = {isa = PBXBuildFile; fileRef = 2213842A27A105DD0085CA24 /* razer.lua */; };
7990
22DC4FA8299E140100065BE1 /* HSStreamDeckDevicePlus.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DC4FA6299E140100065BE1 /* HSStreamDeckDevicePlus.m */; };
8091
22DC4FA9299E140100065BE1 /* HSStreamDeckDevicePlus.h in Headers */ = {isa = PBXBuildFile; fileRef = 22DC4FA7299E140100065BE1 /* HSStreamDeckDevicePlus.h */; };
8192
22DF5D2823B9A9EA00C41AE6 /* libpasteboard_watcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DF5D1A23B99C4D00C41AE6 /* libpasteboard_watcher.m */; };
@@ -7547,9 +7558,14 @@
75477558
files = (
75487559
);
75497560
inputPaths = (
7561+
"${PODS_ROOT}/Target Support Files/Pods-Hammerspoon/Pods-Hammerspoon-resources.sh",
7562+
"${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack/CocoaLumberjackPrivacy.bundle",
7563+
"${PODS_CONFIGURATION_BUILD_DIR}/Sentry/Sentry.bundle",
75507564
);
75517565
name = "Copy CommandPost Files";
75527566
outputPaths = (
7567+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CocoaLumberjackPrivacy.bundle",
7568+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Sentry.bundle",
75537569
);
75547570
runOnlyForDeploymentPostprocessing = 0;
75557571
shellPath = /bin/sh;

‎Hammerspoon.xcworkspace/xcshareddata/xcschemes/Release.xcscheme‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
shouldUseLaunchSchemeArgsEnv = "YES"
4444
enableAddressSanitizer = "YES"
4545
enableASanStackUseAfterReturn = "YES"
46-
enableUBSanitizer = "YES">
46+
enableUBSanitizer = "YES"
47+
codeCoverageEnabled = "YES">
4748
<MacroExpansion>
4849
<BuildableReference
4950
BuildableIdentifier = "primary"

‎Hammerspoon/Build Configs/Project-Base.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Base SDK
1313
SDKROOT = macosx
1414
// macOS Deployment Target
15-
MACOSX_DEPLOYMENT_TARGET = 12.0
15+
MACOSX_DEPLOYMENT_TARGET = 13.0
1616
// Build Active Architecture Only
1717
ONLY_ACTIVE_ARCH = YES
1818

‎Hammerspoon/ConsoleWindow.xib‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22690"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<objects>
@@ -15,48 +15,47 @@
1515
</customObject>
1616
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
1717
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
18-
<window title="Debug Console" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="console" animationBehavior="default" id="P23-aL-ez6">
18+
<window title="Debug Console" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="console" animationBehavior="default" id="P23-aL-ez6">
1919
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
2020
<windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
2121
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
2222
<rect key="contentRect" x="916" y="704" width="510" height="389"/>
23-
<rect key="screenRect" x="0.0" y="0.0" width="3200" height="1778"/>
23+
<rect key="screenRect" x="0.0" y="0.0" width="1710" height="1068"/>
2424
<value key="minSize" type="size" width="340" height="200"/>
2525
<view key="contentView" id="2jF-WS-ElT">
2626
<rect key="frame" x="0.0" y="0.0" width="510" height="389"/>
2727
<autoresizingMask key="autoresizingMask"/>
2828
<subviews>
29-
<scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gls-wS-aCi">
30-
<rect key="frame" x="20" y="51" width="470" height="318"/>
31-
<clipView key="contentView" id="vxQ-4d-mld">
32-
<rect key="frame" x="1" y="1" width="453" height="316"/>
29+
<scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="gls-wS-aCi">
30+
<rect key="frame" x="20" y="47" width="470" height="322"/>
31+
<clipView key="contentView" drawsBackground="NO" id="vxQ-4d-mld">
32+
<rect key="frame" x="1" y="1" width="468" height="320"/>
3333
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
3434
<subviews>
35-
<textView importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="Jlb-eC-MmZ">
36-
<rect key="frame" x="0.0" y="0.0" width="468" height="316"/>
35+
<textView editable="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" findStyle="bar" allowsCharacterPickerTouchBarItem="NO" textCompletion="NO" id="Jlb-eC-MmZ">
36+
<rect key="frame" x="0.0" y="0.0" width="468" height="320"/>
3737
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
38-
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
39-
<size key="minSize" width="453" height="316"/>
38+
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
39+
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
40+
<size key="minSize" width="468" height="320"/>
4041
<size key="maxSize" width="612" height="10000000"/>
41-
<color key="insertionPointColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
4242
</textView>
4343
</subviews>
44-
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
4544
</clipView>
46-
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="bBB-1O-Jf0">
45+
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="bBB-1O-Jf0">
4746
<rect key="frame" x="-100" y="-100" width="87" height="18"/>
4847
<autoresizingMask key="autoresizingMask"/>
4948
</scroller>
50-
<scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="Kjj-rY-Bja">
51-
<rect key="frame" x="454" y="1" width="15" height="316"/>
49+
<scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="Kjj-rY-Bja">
50+
<rect key="frame" x="453" y="1" width="16" height="320"/>
5251
<autoresizingMask key="autoresizingMask"/>
5352
</scroller>
5453
</scrollView>
55-
<textField horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="vJ5-eP-Q1d" customClass="HSGrowingTextField">
56-
<rect key="frame" x="20" y="20" width="470" height="23"/>
54+
<textField focusRingType="none" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="vJ5-eP-Q1d" customClass="HSGrowingTextField">
55+
<rect key="frame" x="20" y="20" width="470" height="19"/>
5756
<textFieldCell key="cell" selectable="YES" editable="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="CiF-1K-0Ju">
5857
<font key="font" size="12" name="Menlo-Regular"/>
59-
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
58+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
6059
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
6160
</textFieldCell>
6261
<connections>

‎Hammerspoon/HSLogger.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#pragma clang diagnostic push
1212
#pragma clang diagnostic ignored "-Wvariadic-macros"
13-
#import "Sentry.h"
13+
#import "Sentry/Sentry.h"
1414
#pragma clang diagnostic pop
1515

1616
#import "secrets.h"

‎Hammerspoon/HSLogger.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ - (void)logKnownBug:(NSString *)format, ... {
9494
NSString *message = [[NSString alloc] initWithFormat:format arguments:args];
9595
NSLog(@"KNOWN BUG: %@", message);
9696

97-
SentryEvent *event = [[SentryEvent alloc] initWithLevel:kSentryLevelError];
97+
// FIXME: no idea why we can't use SentryLevel for this, but 4 currently means error. It may break at any future release of Sentry.
98+
SentryEvent *event = [[SentryEvent alloc] initWithLevel:4];
9899
event.message = [[SentryMessage alloc] initWithFormatted:message];
99100

100101
[SentrySDK captureEvent:event];

‎Hammerspoon/MJAppDelegate.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88
#pragma clang diagnostic push
99
#pragma clang diagnostic ignored "-Wvariadic-macros"
10+
#define SENTRY_NO_UIKIT 1
1011
#import "Sentry.h"
1112
#pragma clang diagnostic pop
1213

0 commit comments

Comments
 (0)