Skip to content

Commit 2bcb443

Browse files
nicklockwoodnicklockwood
committed
Update for 1.5.4 release
1 parent 48d01f7 commit 2bcb443

File tree

11 files changed

+57
-18
lines changed

11 files changed

+57
-18
lines changed

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## [1.5.4](https://github.com/nicklockwood/ShapeScript/releases/tag/1.5.4) (2022-07-25)
2+
3+
- Fixed setting font inside a `text` command
4+
- Improved error messages for missing block arguments
5+
- Multiple arguments passed to `text` command are now treated as single coalesced string
6+
- Extruding along a path now more reliably produces watertight output
7+
- Fixed parsing of tuple statements starting with constant
8+
- Fixed parsing of a prefix minus immediately followed by decimal point
9+
- Increased detail multiplier for `svgpath` command to match path
10+
- Fixed `svgpath` crash when missing `M` command after `Z`
11+
- Fixed camera clipping issue when resizing objects
12+
- Bumped Euclid to version 0.5.26
13+
114
## [1.5.3](https://github.com/nicklockwood/ShapeScript/releases/tag/1.5.3) (2022-07-03)
215

316
- The `loft` command now supports joining shapes with unequal numbers of sides or points

‎LRUCache/LRUCache.xcodeproj/project.pbxproj

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -157,7 +157,7 @@
157157
isa = PBXProject;
158158
attributes = {
159159
LastSwiftUpdateCheck = 1010;
160-
LastUpgradeCheck = 1340;
160+
LastUpgradeCheck = 1400;
161161
ORGANIZATIONNAME = "Nick Lockwood";
162162
TargetAttributes = {
163163
016FAB2821BFE78100AF60DC = {
@@ -209,6 +209,7 @@
209209
/* Begin PBXShellScriptBuildPhase section */
210210
01F2A9E9250177730081CDF5 /* Format Code */ = {
211211
isa = PBXShellScriptBuildPhase;
212+
alwaysOutOfDate = 1;
212213
buildActionMask = 2147483647;
213214
files = (
214215
);
@@ -227,6 +228,7 @@
227228
};
228229
0A24014C256AA09600C1535C /* Format Code */ = {
229230
isa = PBXShellScriptBuildPhase;
231+
alwaysOutOfDate = 1;
230232
buildActionMask = 2147483647;
231233
files = (
232234
);
@@ -310,6 +312,7 @@
310312
CODE_SIGN_IDENTITY = "Mac Developer";
311313
COPY_PHASE_STRIP = NO;
312314
CURRENT_PROJECT_VERSION = 1;
315+
DEAD_CODE_STRIPPING = YES;
313316
DEBUG_INFORMATION_FORMAT = dwarf;
314317
ENABLE_STRICT_OBJC_MSGSEND = YES;
315318
ENABLE_TESTABILITY = YES;
@@ -377,6 +380,7 @@
377380
CODE_SIGN_IDENTITY = "Mac Developer";
378381
COPY_PHASE_STRIP = NO;
379382
CURRENT_PROJECT_VERSION = 1;
383+
DEAD_CODE_STRIPPING = YES;
380384
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
381385
ENABLE_NS_ASSERTIONS = NO;
382386
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -408,6 +412,7 @@
408412
CODE_SIGN_IDENTITY = "";
409413
CODE_SIGN_STYLE = Automatic;
410414
COMBINE_HIDPI_IMAGES = YES;
415+
DEAD_CODE_STRIPPING = YES;
411416
DEFINES_MODULE = YES;
412417
DEVELOPMENT_TEAM = "";
413418
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -441,6 +446,7 @@
441446
CODE_SIGN_IDENTITY = "";
442447
CODE_SIGN_STYLE = Automatic;
443448
COMBINE_HIDPI_IMAGES = YES;
449+
DEAD_CODE_STRIPPING = YES;
444450
DEFINES_MODULE = YES;
445451
DEVELOPMENT_TEAM = "";
446452
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -473,6 +479,7 @@
473479
CODE_SIGN_IDENTITY = "-";
474480
CODE_SIGN_STYLE = Automatic;
475481
COMBINE_HIDPI_IMAGES = YES;
482+
DEAD_CODE_STRIPPING = YES;
476483
DEVELOPMENT_TEAM = "";
477484
INFOPLIST_FILE = Tests/Info.plist;
478485
LD_RUNPATH_SEARCH_PATHS = (
@@ -495,6 +502,7 @@
495502
CODE_SIGN_IDENTITY = "-";
496503
CODE_SIGN_STYLE = Automatic;
497504
COMBINE_HIDPI_IMAGES = YES;
505+
DEAD_CODE_STRIPPING = YES;
498506
DEVELOPMENT_TEAM = "";
499507
INFOPLIST_FILE = Tests/Info.plist;
500508
LD_RUNPATH_SEARCH_PATHS = (

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LRUCache/LRUCache.xcodeproj/xcshareddata/xcschemes/LRUCache.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1340"
3+
LastUpgradeVersion = "1400"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎SVGPath/SVGPath.xcodeproj/project.pbxproj

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -160,7 +160,7 @@
160160
isa = PBXProject;
161161
attributes = {
162162
LastSwiftUpdateCheck = 1010;
163-
LastUpgradeCheck = 1340;
163+
LastUpgradeCheck = 1400;
164164
ORGANIZATIONNAME = "Nick Lockwood";
165165
TargetAttributes = {
166166
016FAB2821BFE78100AF60DC = {
@@ -230,6 +230,7 @@
230230
};
231231
0A24014C256AA09600C1535C /* Format Code */ = {
232232
isa = PBXShellScriptBuildPhase;
233+
alwaysOutOfDate = 1;
233234
buildActionMask = 2147483647;
234235
files = (
235236
);
@@ -314,6 +315,7 @@
314315
CODE_SIGN_IDENTITY = "Mac Developer";
315316
COPY_PHASE_STRIP = NO;
316317
CURRENT_PROJECT_VERSION = 1;
318+
DEAD_CODE_STRIPPING = YES;
317319
DEBUG_INFORMATION_FORMAT = dwarf;
318320
ENABLE_STRICT_OBJC_MSGSEND = YES;
319321
ENABLE_TESTABILITY = YES;
@@ -381,6 +383,7 @@
381383
CODE_SIGN_IDENTITY = "Mac Developer";
382384
COPY_PHASE_STRIP = NO;
383385
CURRENT_PROJECT_VERSION = 1;
386+
DEAD_CODE_STRIPPING = YES;
384387
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
385388
ENABLE_NS_ASSERTIONS = NO;
386389
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -412,6 +415,7 @@
412415
CODE_SIGN_IDENTITY = "";
413416
CODE_SIGN_STYLE = Automatic;
414417
COMBINE_HIDPI_IMAGES = YES;
418+
DEAD_CODE_STRIPPING = YES;
415419
DEFINES_MODULE = YES;
416420
DEVELOPMENT_TEAM = "";
417421
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -445,6 +449,7 @@
445449
CODE_SIGN_IDENTITY = "";
446450
CODE_SIGN_STYLE = Automatic;
447451
COMBINE_HIDPI_IMAGES = YES;
452+
DEAD_CODE_STRIPPING = YES;
448453
DEFINES_MODULE = YES;
449454
DEVELOPMENT_TEAM = "";
450455
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -477,6 +482,7 @@
477482
CODE_SIGN_IDENTITY = "-";
478483
CODE_SIGN_STYLE = Automatic;
479484
COMBINE_HIDPI_IMAGES = YES;
485+
DEAD_CODE_STRIPPING = YES;
480486
DEVELOPMENT_TEAM = "";
481487
INFOPLIST_FILE = Tests/Info.plist;
482488
LD_RUNPATH_SEARCH_PATHS = (
@@ -499,6 +505,7 @@
499505
CODE_SIGN_IDENTITY = "-";
500506
CODE_SIGN_STYLE = Automatic;
501507
COMBINE_HIDPI_IMAGES = YES;
508+
DEAD_CODE_STRIPPING = YES;
502509
DEVELOPMENT_TEAM = "";
503510
INFOPLIST_FILE = Tests/Info.plist;
504511
LD_RUNPATH_SEARCH_PATHS = (

‎SVGPath/SVGPath.xcodeproj/xcshareddata/xcschemes/SVGPath.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1340"
3+
LastUpgradeVersion = "1400"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎ShapeScript.podspec.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ShapeScript",
3-
"version": "1.5.3",
3+
"version": "1.5.4",
44
"license": {
55
"type": "MIT",
66
"file": "LICENSE.md"
@@ -10,7 +10,7 @@
1010
"authors": "Nick Lockwood",
1111
"source": {
1212
"git": "https://github.com/nicklockwood/ShapeScript.git",
13-
"tag": "1.5.3"
13+
"tag": "1.5.4"
1414
},
1515
"source_files": ["ShapeScript", "LRUCache/Sources", "SVGPath/Sources"],
1616
"requires_arc": true,

‎ShapeScript.xcodeproj/project.pbxproj

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -521,7 +521,7 @@
521521
isa = PBXProject;
522522
attributes = {
523523
LastSwiftUpdateCheck = 1010;
524-
LastUpgradeCheck = 1340;
524+
LastUpgradeCheck = 1400;
525525
ORGANIZATIONNAME = "Nick Lockwood";
526526
TargetAttributes = {
527527
0152E5C4214500990082A5A3 = {
@@ -661,6 +661,7 @@
661661
/* Begin PBXShellScriptBuildPhase section */
662662
019551AE21B57CA400292771 /* Lock Examples */ = {
663663
isa = PBXShellScriptBuildPhase;
664+
alwaysOutOfDate = 1;
664665
buildActionMask = 2147483647;
665666
files = (
666667
);
@@ -679,6 +680,7 @@
679680
};
680681
019551B721B6BBD500292771 /* Unlock Examples */ = {
681682
isa = PBXShellScriptBuildPhase;
683+
alwaysOutOfDate = 1;
682684
buildActionMask = 2147483647;
683685
files = (
684686
);
@@ -697,6 +699,7 @@
697699
};
698700
01F2A9EB25017D3D0081CDF5 /* Format Code */ = {
699701
isa = PBXShellScriptBuildPhase;
702+
alwaysOutOfDate = 1;
700703
buildActionMask = 2147483647;
701704
files = (
702705
);
@@ -847,14 +850,15 @@
847850
CODE_SIGN_STYLE = Automatic;
848851
COMBINE_HIDPI_IMAGES = YES;
849852
CURRENT_PROJECT_VERSION = 1;
853+
DEAD_CODE_STRIPPING = YES;
850854
DEVELOPMENT_TEAM = 8VQKF583ED;
851855
ENABLE_HARDENED_RUNTIME = YES;
852856
INFOPLIST_FILE = Viewer/Info.plist;
853857
LD_RUNPATH_SEARCH_PATHS = (
854858
"$(inherited)",
855859
"@executable_path/../Frameworks",
856860
);
857-
MARKETING_VERSION = 1.5.3;
861+
MARKETING_VERSION = 1.5.4;
858862
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
859863
PRODUCT_MODULE_NAME = Viewer;
860864
PRODUCT_NAME = "ShapeScript Viewer";
@@ -874,14 +878,15 @@
874878
CODE_SIGN_STYLE = Automatic;
875879
COMBINE_HIDPI_IMAGES = YES;
876880
CURRENT_PROJECT_VERSION = 1;
881+
DEAD_CODE_STRIPPING = YES;
877882
DEVELOPMENT_TEAM = 8VQKF583ED;
878883
ENABLE_HARDENED_RUNTIME = YES;
879884
INFOPLIST_FILE = Viewer/Info.plist;
880885
LD_RUNPATH_SEARCH_PATHS = (
881886
"$(inherited)",
882887
"@executable_path/../Frameworks",
883888
);
884-
MARKETING_VERSION = 1.5.3;
889+
MARKETING_VERSION = 1.5.4;
885890
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
886891
PRODUCT_MODULE_NAME = Viewer;
887892
PRODUCT_NAME = "ShapeScript Viewer";
@@ -927,6 +932,7 @@
927932
CODE_SIGN_IDENTITY = "Mac Developer";
928933
COPY_PHASE_STRIP = NO;
929934
CURRENT_PROJECT_VERSION = 1;
935+
DEAD_CODE_STRIPPING = YES;
930936
DEBUG_INFORMATION_FORMAT = dwarf;
931937
ENABLE_STRICT_OBJC_MSGSEND = YES;
932938
ENABLE_TESTABILITY = YES;
@@ -995,6 +1001,7 @@
9951001
CODE_SIGN_IDENTITY = "Mac Developer";
9961002
COPY_PHASE_STRIP = NO;
9971003
CURRENT_PROJECT_VERSION = 1;
1004+
DEAD_CODE_STRIPPING = YES;
9981005
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
9991006
ENABLE_NS_ASSERTIONS = NO;
10001007
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1025,6 +1032,7 @@
10251032
CODE_SIGN_IDENTITY = "-";
10261033
CODE_SIGN_STYLE = Automatic;
10271034
COMBINE_HIDPI_IMAGES = YES;
1035+
DEAD_CODE_STRIPPING = YES;
10281036
DEFINES_MODULE = YES;
10291037
DEVELOPMENT_TEAM = "";
10301038
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1038,7 +1046,7 @@
10381046
"@executable_path/../Frameworks",
10391047
"@loader_path/Frameworks",
10401048
);
1041-
MARKETING_VERSION = 1.5.3;
1049+
MARKETING_VERSION = 1.5.4;
10421050
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
10431051
PRODUCT_NAME = ShapeScript;
10441052
SKIP_INSTALL = YES;
@@ -1055,6 +1063,7 @@
10551063
CODE_SIGN_IDENTITY = "-";
10561064
CODE_SIGN_STYLE = Automatic;
10571065
COMBINE_HIDPI_IMAGES = YES;
1066+
DEAD_CODE_STRIPPING = YES;
10581067
DEFINES_MODULE = YES;
10591068
DEVELOPMENT_TEAM = "";
10601069
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1068,7 +1077,7 @@
10681077
"@executable_path/../Frameworks",
10691078
"@loader_path/Frameworks",
10701079
);
1071-
MARKETING_VERSION = 1.5.3;
1080+
MARKETING_VERSION = 1.5.4;
10721081
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
10731082
PRODUCT_NAME = ShapeScript;
10741083
SKIP_INSTALL = YES;
@@ -1084,6 +1093,7 @@
10841093
CODE_SIGN_IDENTITY = "-";
10851094
CODE_SIGN_STYLE = Automatic;
10861095
COMBINE_HIDPI_IMAGES = YES;
1096+
DEAD_CODE_STRIPPING = YES;
10871097
DEVELOPMENT_TEAM = "";
10881098
INFOPLIST_FILE = ShapeScriptTests/Info.plist;
10891099
LD_RUNPATH_SEARCH_PATHS = (
@@ -1105,6 +1115,7 @@
11051115
CODE_SIGN_IDENTITY = "-";
11061116
CODE_SIGN_STYLE = Automatic;
11071117
COMBINE_HIDPI_IMAGES = YES;
1118+
DEAD_CODE_STRIPPING = YES;
11081119
DEVELOPMENT_TEAM = "";
11091120
INFOPLIST_FILE = ShapeScriptTests/Info.plist;
11101121
LD_RUNPATH_SEARCH_PATHS = (

‎ShapeScript.xcodeproj/xcshareddata/xcschemes/ShapeScript Lib.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1340"
3+
LastUpgradeVersion = "1400"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎ShapeScript.xcodeproj/xcshareddata/xcschemes/ShapeScript Viewer.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1340"
3+
LastUpgradeVersion = "1400"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎ShapeScript/Interpreter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Foundation
1111

1212
// MARK: Public interface
1313

14-
public let version = "1.5.3"
14+
public let version = "1.5.4"
1515

1616
public protocol EvaluationDelegate: AnyObject {
1717
func resolveURL(for path: String) -> URL

0 commit comments

Comments
 (0)