Skip to content

Commit 277eb63

Browse files
nicklockwoodnicklockwood
committed
Update for 1.6.10 release
1 parent 36d12ee commit 277eb63

8 files changed

Lines changed: 114 additions & 11 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
macos:
12-
- 10.15
13-
- 12
12+
- 11
13+
- 13
1414
xcode:
1515
- latest-stable
1616
runs-on: macos-${{ matrix.macos }}

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Change Log
22

3+
## [1.6.10](https://github.com/nicklockwood/ShapeScript/releases/tag/1.6.10) (2023-06-12)
4+
5+
- Removed Reddit community links
6+
- Fixed precedence issue with `point`/`curve` commands (introduced in 1.6.9)
7+
- Fixed broken importing of external model file formats (introduced in 1.6.8)
8+
- Block options can now be set conditionally within `if` blocks
9+
- Overrides to global constants and functions are now usable inside block invocations
10+
- Fixed bug where local defines in a block invocation were mistaken for options
11+
- The `point.color` member now returns an empty tuple instead of an error if unset
12+
- Fixed occasional blank screen glitch when first opening a file
13+
- Fixed iOS camera menu not updating after camera is moved
14+
- Bumped Euclid to version 0.6.14
15+
316
## [1.6.9](https://github.com/nicklockwood/ShapeScript/releases/tag/1.6.9) (2023-04-21)
417

518
- Fixed confusing function / operator precedence

‎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.6.9",
3+
"version": "1.6.10",
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.6.9"
13+
"tag": "1.6.10"
1414
},
1515
"source_files": ["ShapeScript", "LRUCache/Sources", "SVGPath/Sources"],
1616
"requires_arc": true,

‎ShapeScript.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,7 @@
762762
buildPhases = (
763763
01BFB39121425C8500E47A7C /* Headers */,
764764
01BFB39221425C8500E47A7C /* Sources */,
765+
01DCB7032A38CDB700E72075 /* Lint Code */,
765766
01BFB39321425C8500E47A7C /* Frameworks */,
766767
01BFB39421425C8500E47A7C /* Resources */,
767768
);
@@ -1023,6 +1024,25 @@
10231024
shellPath = /bin/sh;
10241025
shellScript = "chflags -R nouchg \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Contents/Resources/Examples/\"\nexit 0\n";
10251026
};
1027+
01DCB7032A38CDB700E72075 /* Lint Code */ = {
1028+
isa = PBXShellScriptBuildPhase;
1029+
alwaysOutOfDate = 1;
1030+
buildActionMask = 2147483647;
1031+
files = (
1032+
);
1033+
inputFileListPaths = (
1034+
);
1035+
inputPaths = (
1036+
);
1037+
name = "Lint Code";
1038+
outputFileListPaths = (
1039+
);
1040+
outputPaths = (
1041+
);
1042+
runOnlyForDeploymentPostprocessing = 0;
1043+
shellPath = /bin/sh;
1044+
shellScript = "if which swiftformat >/dev/null; then\n swiftformat . --lint --lenient\nelse\n echo \"warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\nfi\n";
1045+
};
10261046
01F2A9EB25017D3D0081CDF5 /* Format Code */ = {
10271047
isa = PBXShellScriptBuildPhase;
10281048
alwaysOutOfDate = 1;
@@ -1291,7 +1311,7 @@
12911311
"$(inherited)",
12921312
"@executable_path/../Frameworks",
12931313
);
1294-
MARKETING_VERSION = 1.6.9;
1314+
MARKETING_VERSION = 1.6.10;
12951315
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
12961316
PRODUCT_MODULE_NAME = Viewer;
12971317
PRODUCT_NAME = "ShapeScript Viewer";
@@ -1319,7 +1339,7 @@
13191339
"$(inherited)",
13201340
"@executable_path/../Frameworks",
13211341
);
1322-
MARKETING_VERSION = 1.6.9;
1342+
MARKETING_VERSION = 1.6.10;
13231343
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
13241344
PRODUCT_MODULE_NAME = Viewer;
13251345
PRODUCT_NAME = "ShapeScript Viewer";
@@ -1349,7 +1369,7 @@
13491369
"$(inherited)",
13501370
"@executable_path/Frameworks",
13511371
);
1352-
MARKETING_VERSION = 1.6.9;
1372+
MARKETING_VERSION = 1.6.10;
13531373
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
13541374
PRODUCT_MODULE_NAME = Viewer;
13551375
PRODUCT_NAME = ShapeScript;
@@ -1381,7 +1401,7 @@
13811401
"$(inherited)",
13821402
"@executable_path/Frameworks",
13831403
);
1384-
MARKETING_VERSION = 1.6.9;
1404+
MARKETING_VERSION = 1.6.10;
13851405
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
13861406
PRODUCT_MODULE_NAME = Viewer;
13871407
PRODUCT_NAME = ShapeScript;
@@ -1544,7 +1564,7 @@
15441564
"@executable_path/../Frameworks",
15451565
"@loader_path/Frameworks",
15461566
);
1547-
MARKETING_VERSION = 1.6.9;
1567+
MARKETING_VERSION = 1.6.10;
15481568
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
15491569
PRODUCT_NAME = ShapeScript;
15501570
SKIP_INSTALL = YES;
@@ -1575,7 +1595,7 @@
15751595
"@executable_path/../Frameworks",
15761596
"@loader_path/Frameworks",
15771597
);
1578-
MARKETING_VERSION = 1.6.9;
1598+
MARKETING_VERSION = 1.6.10;
15791599
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
15801600
PRODUCT_NAME = ShapeScript;
15811601
SKIP_INSTALL = 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.6.9"
14+
public let version = "1.6.10"
1515

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

‎Viewer/Mac/WhatsNew.rtf‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,40 @@ What's New in ShapeScript?\
1111
\
1212
\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0
1313

14+
\f1\b\fs28 \cf2 ShapeScript 1.6.10 \'97 2023-06-12\
15+
\
16+
\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0
17+
\cf2 \kerning1\expnd0\expndtw0 \'95
18+
\f0\b0 \expnd0\expndtw0\kerning0
19+
Removed Reddit community links.\
20+
\ \'95
21+
\f0\b0 \expnd0\expndtw0\kerning0
22+
Fixed precedence issue with `point`/`curve` commands (introduced in 1.6.9).\
23+
\ \'95
24+
\f0\b0 \expnd0\expndtw0\kerning0
25+
Fixed broken importing of external model file formats (introduced in 1.6.8).\
26+
\ \'95
27+
\f0\b0 \expnd0\expndtw0\kerning0
28+
Block options can now be set conditionally within `if` blocks.\
29+
\ \'95
30+
\f0\b0 \expnd0\expndtw0\kerning0
31+
Overrides to global constants and functions are now usable inside block invocations.\
32+
\ \'95
33+
\f0\b0 \expnd0\expndtw0\kerning0
34+
Fixed bug where local defines in a block invocation were mistaken for options.\
35+
\ \'95
36+
\f0\b0 \expnd0\expndtw0\kerning0
37+
The `point.color` member now returns an empty tuple instead of an error if unset.\
38+
\ \'95
39+
\f0\b0 \expnd0\expndtw0\kerning0
40+
Fixed occasional blank screen glitch when first opening a file.\
41+
\ \'95
42+
\f0\b0 \expnd0\expndtw0\kerning0
43+
Fixed iOS camera menu not updating after camera is moved.\
44+
\ \'95
45+
\f0\b0 \expnd0\expndtw0\kerning0
46+
Bumped Euclid to version 0.6.14.\
47+
\
1448
\f1\b\fs28 \cf2 ShapeScript 1.6.9 \'97 2023-04-21\
1549
\
1650
\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0

‎Viewer/iOS/WhatsNew.rtf‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,41 @@
55
\paperw11900\paperh16840\margl1440\margr1440\vieww24140\viewh18420\viewkind0
66
\deftab720
77

8+
\f0\b \cf2 ShapeScript 1.6.10 \'97 2023-06-12\
9+
\
10+
\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0
11+
\cf2 \kerning1\expnd0\expndtw0
12+
\f1\b0 \expnd0\expndtw0\kerning0 \'95
13+
\f1\b0 \expnd0\expndtw0\kerning0
14+
Removed Reddit community links.\
15+
\ \'95
16+
\f1\b0 \expnd0\expndtw0\kerning0
17+
Fixed precedence issue with `point`/`curve` commands (introduced in 1.6.9).\
18+
\ \'95
19+
\f1\b0 \expnd0\expndtw0\kerning0
20+
Fixed broken importing of external model file formats (introduced in 1.6.8).\
21+
\ \'95
22+
\f1\b0 \expnd0\expndtw0\kerning0
23+
Block options can now be set conditionally within `if` blocks.\
24+
\ \'95
25+
\f1\b0 \expnd0\expndtw0\kerning0
26+
Overrides to global constants and functions are now usable inside block invocations.\
27+
\ \'95
28+
\f1\b0 \expnd0\expndtw0\kerning0
29+
Fixed bug where local defines in a block invocation were mistaken for options.\
30+
\ \'95
31+
\f1\b0 \expnd0\expndtw0\kerning0
32+
The `point.color` member now returns an empty tuple instead of an error if unset.\
33+
\ \'95
34+
\f1\b0 \expnd0\expndtw0\kerning0
35+
Fixed occasional blank screen glitch when first opening a file.\
36+
\ \'95
37+
\f1\b0 \expnd0\expndtw0\kerning0
38+
Fixed iOS camera menu not updating after camera is moved.\
39+
\ \'95
40+
\f1\b0 \expnd0\expndtw0\kerning0
41+
Bumped Euclid to version 0.6.14.\
42+
\
843
\f0\b \cf2 ShapeScript 1.6.9 \'97 2023-04-21\
944
\
1045
\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0

‎docs/1.6.10‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.6.7

0 commit comments

Comments
 (0)