Skip to content

Commit b8c54bd

Browse files
keefokeefo
authored
v1.6.3, v1.6.4 (#76)
* add plugin * test * v1.6.3 * fix error * fix build issue * add CI step * update steps * run test in CI * test * add test * update ignore * test * fix test * update read me * update readme * update package * update * add codeql yml * remove codeql * remove package * update ignore * test * add workspace * test * update * update * test
1 parent d3b7138 commit b8c54bd

File tree

93 files changed

+5742
-173
lines changed

Some content is hidden

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

93 files changed

+5742
-173
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,50 @@ name: CI
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [main]
66
pull_request:
7-
branches: [ main ]
7+
branches: [main]
88

99
jobs:
1010
build:
11-
1211
runs-on: macos-latest
1312

1413
steps:
15-
- uses: actions/checkout@v2
16-
- name: Build
17-
run: pushd NeewerLite; xcodebuild -scheme NeewerLite build -configuration Debug clean; popd;
18-
# - name: Run tests
19-
# run: pushd NeewerLite; xcodebuild test -scheme NeewerLite; popd;
14+
- uses: actions/checkout@v2
15+
- name: Setup Node.js
16+
uses: actions/setup-node@v3
17+
with:
18+
node-version: "20"
19+
20+
- name: Install Elgato CLI globally
21+
run: npm install -g @elgato/cli
22+
23+
- name: Install Stream Deck plugin deps
24+
working-directory: NeewerLiteStreamDeck/neewerlite
25+
run: npm ci
26+
27+
- name: Build Stream Deck plugin
28+
working-directory: NeewerLiteStreamDeck/neewerlite
29+
run: npm run build
30+
31+
- name: Balidate Stream Deck plugin
32+
working-directory: NeewerLiteStreamDeck/neewerlite
33+
run: streamdeck validate com.beyondcow.neewerlite.sdPlugin
34+
35+
- name: List available schemes
36+
working-directory: NeewerLite
37+
run: xcodebuild -project NeewerLite.xcodeproj -list;
38+
39+
- name: Build App
40+
working-directory: NeewerLite
41+
run: xcodebuild -scheme NeewerLite build -configuration Debug clean;
42+
43+
- name: Run unit tests
44+
working-directory: NeewerLite
45+
run: |
46+
xcodebuild \
47+
-project NeewerLite.xcodeproj \
48+
-scheme NeewerLiteTests \
49+
-configuration Debug \
50+
test
51+

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
Tools/*.dmg
21
.DS_Store
2+
Tools/*.dmg
33
Tools/build
4+
.build

‎Database/light_images/cb60b.png‎

61.8 KB
Loading

‎Database/lights.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@
311311
},
312312
{
313313
"type": 31,
314-
"image": "",
315-
"link": "",
314+
"image": "https://github.com/keefo/NeewerLite/blob/main/Database/light_images/cb60b.png?raw=true",
315+
"link": "https://neewer.com/products/neewer-cb60b-bi-color-70w-led-video-light-66602613",
316316
"supportRGB": false,
317317
"supportCCTGM": false,
318318
"supportMusic": true,

‎Docs/StreamDeck_dial.jpg‎

179 KB
Loading

‎Docs/StreamDeck_dial_ui.png‎

264 KB
Loading

‎NeewerLite/.gitignore‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎NeewerLite/NeewerLite.xcodeproj/project.pbxproj‎

Lines changed: 62 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
A753109D2AFC996F009F533C /* StorageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A753109C2AFC996F009F533C /* StorageManager.swift */; };
3333
A753109F2AFCAA25009F533C /* NeewerLightSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = A753109E2AFCAA25009F533C /* NeewerLightSource.swift */; };
3434
A75310A12AFF2A19009F533C /* ContentManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A75310A02AFF2A19009F533C /* ContentManager.swift */; };
35+
A76C38632DFD4B64006B7C38 /* Swifter in Frameworks */ = {isa = PBXBuildFile; productRef = A76C38622DFD4B64006B7C38 /* Swifter */; };
36+
A76C38692DFFFCFA006B7C38 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76C38682DFFFCFA006B7C38 /* Utils.swift */; };
37+
A76C386F2E002B95006B7C38 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = A76C386E2E002B95006B7C38 /* Sparkle */; };
38+
A76C38712E002B98006B7C38 /* Atomics in Frameworks */ = {isa = PBXBuildFile; productRef = A76C38702E002B98006B7C38 /* Atomics */; };
39+
A76C38732E002B9A006B7C38 /* Swifter in Frameworks */ = {isa = PBXBuildFile; productRef = A76C38722E002B9A006B7C38 /* Swifter */; };
3540
A76C4B6D275474FA00D2F145 /* AudioSpectrogram.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76C4B6C275474FA00D2F145 /* AudioSpectrogram.swift */; };
3641
A76E1F21266496FC00E5788B /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = A76E1F20266496FC00E5788B /* Sparkle */; };
3742
A76E1F2326649F2A00E5788B /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = A76E1F2226649F2A00E5788B /* Credits.rtf */; };
@@ -41,6 +46,7 @@
4146
A77414F82AF0E7890085F149 /* FXView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A77414F72AF0E7890085F149 /* FXView.swift */; };
4247
A7770BF22AF6EEB30046E571 /* RenameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7770BF12AF6EEB30046E571 /* RenameViewController.swift */; };
4348
A7770BF42AF6F7190046E571 /* RoundedScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7770BF32AF6F7190046E571 /* RoundedScrollView.swift */; };
49+
A7B482292DFD3D6100EB4450 /* Server.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7B482282DFD3D5400EB4450 /* Server.swift */; };
4450
A7EE61BD2B03680B00E85502 /* MySplitViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7EE61BC2B03680B00E85502 /* MySplitViewDelegate.swift */; };
4551
A7FF36712AF84A690068022C /* CodableValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF36702AF84A690068022C /* CodableValue.swift */; };
4652
/* End PBXBuildFile section */
@@ -86,6 +92,7 @@
8692
A753109C2AFC996F009F533C /* StorageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageManager.swift; sourceTree = "<group>"; };
8793
A753109E2AFCAA25009F533C /* NeewerLightSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NeewerLightSource.swift; sourceTree = "<group>"; };
8894
A75310A02AFF2A19009F533C /* ContentManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentManager.swift; sourceTree = "<group>"; };
95+
A76C38682DFFFCFA006B7C38 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
8996
A76C4B6C275474FA00D2F145 /* AudioSpectrogram.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioSpectrogram.swift; sourceTree = "<group>"; };
9097
A76E1F2226649F2A00E5788B /* Credits.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; };
9198
A77414D12AEA2C8D0085F149 /* BlockingOverlayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlockingOverlayView.swift; sourceTree = "<group>"; };
@@ -95,6 +102,7 @@
95102
A77414F72AF0E7890085F149 /* FXView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FXView.swift; sourceTree = "<group>"; };
96103
A7770BF12AF6EEB30046E571 /* RenameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RenameViewController.swift; sourceTree = "<group>"; };
97104
A7770BF32AF6F7190046E571 /* RoundedScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundedScrollView.swift; sourceTree = "<group>"; };
105+
A7B482282DFD3D5400EB4450 /* Server.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Server.swift; sourceTree = "<group>"; };
98106
A7EE61BC2B03680B00E85502 /* MySplitViewDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MySplitViewDelegate.swift; sourceTree = "<group>"; };
99107
A7FF36702AF84A690068022C /* CodableValue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableValue.swift; sourceTree = "<group>"; };
100108
/* End PBXFileReference section */
@@ -104,6 +112,7 @@
104112
isa = PBXFrameworksBuildPhase;
105113
buildActionMask = 2147483647;
106114
files = (
115+
A76C38632DFD4B64006B7C38 /* Swifter in Frameworks */,
107116
A76E1F21266496FC00E5788B /* Sparkle in Frameworks */,
108117
A71B39BA275726800005E271 /* Atomics in Frameworks */,
109118
);
@@ -113,6 +122,9 @@
113122
isa = PBXFrameworksBuildPhase;
114123
buildActionMask = 2147483647;
115124
files = (
125+
A76C38732E002B9A006B7C38 /* Swifter in Frameworks */,
126+
A76C386F2E002B95006B7C38 /* Sparkle in Frameworks */,
127+
A76C38712E002B98006B7C38 /* Atomics in Frameworks */,
116128
);
117129
runOnlyForDeploymentPostprocessing = 0;
118130
};
@@ -124,6 +136,7 @@
124136
children = (
125137
A731DD3225A57D0B00302E25 /* NeewerLite */,
126138
A731DD4325A57D0B00302E25 /* NeewerLiteTests */,
139+
A76C38612DFD4B64006B7C38 /* Frameworks */,
127140
A731DD3125A57D0B00302E25 /* Products */,
128141
);
129142
sourceTree = "<group>";
@@ -149,6 +162,7 @@
149162
A731DDA525A5A04000302E25 /* ViewModels */,
150163
A731DDAC25A5A13000302E25 /* Resources */,
151164
A733AEC12933185900F37DDD /* AppDelegate.swift */,
165+
A7B482282DFD3D5400EB4450 /* Server.swift */,
152166
A75310A02AFF2A19009F533C /* ContentManager.swift */,
153167
);
154168
path = NeewerLite;
@@ -194,6 +208,7 @@
194208
A731DDA125A5A02F00302E25 /* Common */ = {
195209
isa = PBXGroup;
196210
children = (
211+
A76C38682DFFFCFA006B7C38 /* Utils.swift */,
197212
A749F6F925B3AE7E0066EB06 /* DataExtensions.swift */,
198213
A749F70125B3AE9A0066EB06 /* Observable.swift */,
199214
A749F70625B3AEB60066EB06 /* CBCharacteristicExtensions.swift */,
@@ -230,6 +245,13 @@
230245
path = Resources;
231246
sourceTree = "<group>";
232247
};
248+
A76C38612DFD4B64006B7C38 /* Frameworks */ = {
249+
isa = PBXGroup;
250+
children = (
251+
);
252+
name = Frameworks;
253+
sourceTree = "<group>";
254+
};
233255
A76C4B5D275448E200D2F145 /* Spectrogram */ = {
234256
isa = PBXGroup;
235257
children = (
@@ -258,6 +280,7 @@
258280
packageProductDependencies = (
259281
A76E1F20266496FC00E5788B /* Sparkle */,
260282
A71B39B9275726800005E271 /* Atomics */,
283+
A76C38622DFD4B64006B7C38 /* Swifter */,
261284
);
262285
productName = NeewerLite;
263286
productReference = A731DD3025A57D0B00302E25 /* NeewerLite.app */;
@@ -311,6 +334,7 @@
311334
packageReferences = (
312335
A76E1F1F266496FC00E5788B /* XCRemoteSwiftPackageReference "Sparkle" */,
313336
A71B39B8275726800005E271 /* XCRemoteSwiftPackageReference "swift-atomics" */,
337+
A7B4822A2DFD49C200EB4450 /* XCRemoteSwiftPackageReference "swifter" */,
314338
);
315339
productRefGroup = A731DD3125A57D0B00302E25 /* Products */;
316340
projectDirPath = "";
@@ -374,12 +398,14 @@
374398
A731DD9D25A5A01300302E25 /* DeviceViewObject.swift in Sources */,
375399
A749F72225B3DFB30066EB06 /* ColorUtils.swift in Sources */,
376400
A749F70725B3AEB60066EB06 /* CBCharacteristicExtensions.swift in Sources */,
401+
A76C38692DFFFCFA006B7C38 /* Utils.swift in Sources */,
377402
A731DD6C25A5891E00302E25 /* Logger.swift in Sources */,
378403
A7770BF42AF6F7190046E571 /* RoundedScrollView.swift in Sources */,
379404
A733AEC22933185900F37DDD /* AppDelegate.swift in Sources */,
380405
A749F6FA25B3AE7E0066EB06 /* DataExtensions.swift in Sources */,
381406
A77414D22AEA2C8D0085F149 /* BlockingOverlayView.swift in Sources */,
382407
A7FF36712AF84A690068022C /* CodableValue.swift in Sources */,
408+
A7B482292DFD3D6100EB4450 /* Server.swift in Sources */,
383409
A749F71A25B3DF4F0066EB06 /* NSBezierPathExtensions.swift in Sources */,
384410
A7770BF22AF6EEB30046E571 /* RenameViewController.swift in Sources */,
385411
A7311C4629A0BD5E009C03D8 /* Command.swift in Sources */,
@@ -603,9 +629,10 @@
603629
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
604630
BUNDLE_LOADER = "$(TEST_HOST)";
605631
CODE_SIGN_IDENTITY = "Apple Development";
606-
CODE_SIGN_STYLE = Automatic;
632+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
633+
CODE_SIGN_STYLE = Manual;
607634
COMBINE_HIDPI_IMAGES = YES;
608-
DEVELOPMENT_TEAM = MJA89JYF67;
635+
DEVELOPMENT_TEAM = "";
609636
INFOPLIST_FILE = NeewerLiteTests/Info.plist;
610637
LD_RUNPATH_SEARCH_PATHS = (
611638
"$(inherited)",
@@ -614,6 +641,7 @@
614641
);
615642
PRODUCT_BUNDLE_IDENTIFIER = com.beyondcow.neewerlite.NeewerLiteTests;
616643
PRODUCT_NAME = "$(TARGET_NAME)";
644+
PROVISIONING_PROFILE_SPECIFIER = "";
617645
SWIFT_VERSION = 5.0;
618646
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NeewerLite.app/Contents/MacOS/NeewerLite";
619647
};
@@ -625,9 +653,10 @@
625653
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
626654
BUNDLE_LOADER = "$(TEST_HOST)";
627655
CODE_SIGN_IDENTITY = "Apple Development";
628-
CODE_SIGN_STYLE = Automatic;
656+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
657+
CODE_SIGN_STYLE = Manual;
629658
COMBINE_HIDPI_IMAGES = YES;
630-
DEVELOPMENT_TEAM = MJA89JYF67;
659+
DEVELOPMENT_TEAM = "";
631660
INFOPLIST_FILE = NeewerLiteTests/Info.plist;
632661
LD_RUNPATH_SEARCH_PATHS = (
633662
"$(inherited)",
@@ -636,6 +665,7 @@
636665
);
637666
PRODUCT_BUNDLE_IDENTIFIER = com.beyondcow.neewerlite.NeewerLiteTests;
638667
PRODUCT_NAME = "$(TARGET_NAME)";
668+
PROVISIONING_PROFILE_SPECIFIER = "";
639669
SWIFT_VERSION = 5.0;
640670
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NeewerLite.app/Contents/MacOS/NeewerLite";
641671
};
@@ -690,6 +720,14 @@
690720
minimumVersion = 1.26.0;
691721
};
692722
};
723+
A7B4822A2DFD49C200EB4450 /* XCRemoteSwiftPackageReference "swifter" */ = {
724+
isa = XCRemoteSwiftPackageReference;
725+
repositoryURL = "https://github.com/httpswift/swifter";
726+
requirement = {
727+
kind = upToNextMajorVersion;
728+
minimumVersion = 1.5.0;
729+
};
730+
};
693731
/* End XCRemoteSwiftPackageReference section */
694732

695733
/* Begin XCSwiftPackageProductDependency section */
@@ -698,6 +736,26 @@
698736
package = A71B39B8275726800005E271 /* XCRemoteSwiftPackageReference "swift-atomics" */;
699737
productName = Atomics;
700738
};
739+
A76C38622DFD4B64006B7C38 /* Swifter */ = {
740+
isa = XCSwiftPackageProductDependency;
741+
package = A7B4822A2DFD49C200EB4450 /* XCRemoteSwiftPackageReference "swifter" */;
742+
productName = Swifter;
743+
};
744+
A76C386E2E002B95006B7C38 /* Sparkle */ = {
745+
isa = XCSwiftPackageProductDependency;
746+
package = A76E1F1F266496FC00E5788B /* XCRemoteSwiftPackageReference "Sparkle" */;
747+
productName = Sparkle;
748+
};
749+
A76C38702E002B98006B7C38 /* Atomics */ = {
750+
isa = XCSwiftPackageProductDependency;
751+
package = A71B39B8275726800005E271 /* XCRemoteSwiftPackageReference "swift-atomics" */;
752+
productName = Atomics;
753+
};
754+
A76C38722E002B9A006B7C38 /* Swifter */ = {
755+
isa = XCSwiftPackageProductDependency;
756+
package = A7B4822A2DFD49C200EB4450 /* XCRemoteSwiftPackageReference "swifter" */;
757+
productName = Swifter;
758+
};
701759
A76E1F20266496FC00E5788B /* Sparkle */ = {
702760
isa = XCSwiftPackageProductDependency;
703761
package = A76E1F1F266496FC00E5788B /* XCRemoteSwiftPackageReference "Sparkle" */;

‎NeewerLite/NeewerLite.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎NeewerLite/NeewerLite.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>PreviewsEnabled</key>
6+
<false/>
7+
</dict>
8+
</plist>

0 commit comments

Comments
 (0)