Skip to content

Commit ead4e81

Browse files
sveinbjorntsveinbjornt
authored
Merge pull request #287 from sveinbjornt/5.5-release
5.5 release
2 parents 0891fbd + a1cafe0 commit ead4e81

223 files changed

Lines changed: 2046 additions & 3688 deletions

File tree

Some content is hidden

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

‎.github/workflows/macos.yml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# GitHub Actions CI build
2+
13
name: build
24

35
on:
@@ -12,13 +14,18 @@ jobs:
1214
build:
1315
name: Build on macOS
1416
runs-on: macos-latest
15-
1617
steps:
1718
- name: Checkout
1819
uses: actions/checkout@v4
1920
- run: gem install xcpretty
2021
- name: Build app
21-
run: make build_unsigned | xcpretty -c && exit ${PIPESTATUS[0]}
22-
# Tests require GUI environment, disabled in CI
23-
#- name: Run tests
24-
# run: make clt_tests
22+
run: |
23+
make build_unsigned | xcpretty -c && exit ${PIPESTATUS[0]}
24+
- name: Install Python
25+
uses: actions/setup-python@v5
26+
with:
27+
python-version: "3.9"
28+
- name: Run tests
29+
run: |
30+
pip3 install pytest
31+
make clt_tests

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,6 @@ dsa_priv.pem
2929
Tests/platypus
3030
Tests/*.app
3131
Tests/args.txt
32+
Platypus-*
33+
.claude
34+
Tests/__pycache__/

‎Application/ArgsController.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
2+
Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without modification,
@@ -28,7 +28,8 @@
2828
POSSIBILITY OF SUCH DAMAGE.
2929
*/
3030

31-
#import <Cocoa/Cocoa.h>
31+
@import Cocoa;
32+
3233
#import "NSResponderNotifyingTableView.h"
3334

3435
@interface ArgsController : NSWindowController <NSTableViewDataSource, NSTableViewDelegate, NSTableViewFirstResponderDelegate, NSMenuItemValidation>

‎Application/ArgsController.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
2+
Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without modification,
@@ -141,7 +141,7 @@ - (void)constructCommandString {
141141
NSMutableAttributedString *cmdString = [[NSMutableAttributedString alloc] initWithString:[interpreterTextField stringValue] attributes:defaultAttrs];
142142

143143
// Interpreter args
144-
for (int i = 0; i < [interpreterArgs count]; i++)
144+
for (NSInteger i = 0; i < [interpreterArgs count]; i++)
145145
{
146146
NSString *a = [NSString stringWithFormat:@" %@", interpreterArgs[i]];
147147
NSMutableDictionary *attrs = [defaultAttrs mutableCopy];
@@ -175,7 +175,7 @@ - (void)constructCommandString {
175175
[cmdString appendAttributedString:scriptString];
176176

177177
// Script args
178-
for (int i = 0; i < [scriptArgs count]; i++)
178+
for (NSInteger i = 0; i < [scriptArgs count]; i++)
179179
{
180180
NSString *a = [NSString stringWithFormat:@"%@ ", scriptArgs[i]];
181181
NSMutableDictionary *attrs = [defaultAttrs mutableCopy];
@@ -196,7 +196,7 @@ - (void)constructCommandString {
196196
}
197197

198198
// File args
199-
if ([isDroppableCheckbox state] == NSOnState) {
199+
if ([isDroppableCheckbox state] == NSControlStateValueOn) {
200200
NSAttributedString *attrStr = [[NSAttributedString alloc] initWithString:@" [files ...]" attributes:defaultAttrs];
201201
[cmdString appendAttributedString:attrStr];
202202
}

‎Application/BundledFilesController.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
2+
Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without modification,
@@ -31,7 +31,7 @@
3131
// This is a controller class around the Bundled Files list in the Platypus
3232
// window. It is the data source and delegate of the tableview with the files.
3333

34-
#import <Cocoa/Cocoa.h>
34+
@import Cocoa;
3535

3636
@interface BundledFilesController : NSObject <NSTableViewDataSource, NSTableViewDelegate, NSMenuDelegate, NSMenuItemValidation>
3737

‎Application/BundledFilesController.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
2+
Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without modification,
@@ -133,15 +133,15 @@ - (void)updateButtonStatus {
133133
}
134134

135135
- (void)updateFileSizeField {
136-
//if there are no items
136+
// If there are no items
137137
if ([files count] == 0) {
138138
_totalSizeOfFiles = 0;
139139
[bundleSizeTextField setStringValue:@""];
140140
[[NSNotificationCenter defaultCenter] postNotificationName:PLATYPUS_APP_SIZE_CHANGED_NOTIFICATION object:nil];
141141
return;
142142
}
143143

144-
//otherwise, loop through all files, calculate size in a separate queue
144+
// Otherwise, loop through all files, calculate size in a separate queue
145145
[bundleSizeTextField setStringValue:@"Calculating size..."];
146146

147147
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^(void){
@@ -300,8 +300,8 @@ - (void)copyFilenamesToPasteboard:(BOOL)basenameOnly {
300300
}
301301
}
302302

303-
[[NSPasteboard generalPasteboard] declareTypes:@[NSStringPboardType] owner:self];
304-
[[NSPasteboard generalPasteboard] setString:copyStr forType:NSStringPboardType];
303+
[[NSPasteboard generalPasteboard] declareTypes:@[NSPasteboardTypeString] owner:self];
304+
[[NSPasteboard generalPasteboard] setString:copyStr forType:NSPasteboardTypeString];
305305
}
306306

307307
- (IBAction)addFilesToList:(id)sender {
@@ -373,7 +373,7 @@ - (IBAction)removeSelectedFiles:(id)sender {
373373
}
374374
}
375375
if ([tableView numberOfRows]) {
376-
NSUInteger rowToSelect = [selectedItems firstIndex] - 1;
376+
NSInteger rowToSelect = [selectedItems firstIndex] - 1;
377377
[tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:rowToSelect] byExtendingSelection:NO];
378378
}
379379

‎Application/DropSettingsController.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
2+
Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without modification,
@@ -28,7 +28,8 @@
2828
POSSIBILITY OF SUCH DAMAGE.
2929
*/
3030

31-
#import <Cocoa/Cocoa.h>
31+
@import Cocoa;
32+
3233
#import "NSResponderNotifyingTableView.h"
3334

3435
@class SuffixTypeListController, UniformTypeListController;

‎Application/DropSettingsController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
2+
Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without modification,

‎Application/EditorController.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
2+
Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without modification,
@@ -28,7 +28,7 @@
2828
POSSIBILITY OF SUCH DAMAGE.
2929
*/
3030

31-
#import <Cocoa/Cocoa.h>
31+
@import Cocoa;
3232

3333
@interface EditorController : NSWindowController
3434

‎Application/EditorController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003-2024, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
2+
Copyright (c) 2003-2025, Sveinbjorn Thordarson <sveinbjorn@sveinbjorn.org>
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without modification,

0 commit comments

Comments
 (0)