Skip to content

Commit c453e22

Browse files
nicklockwoodnicklockwood
committed
Update for 1.7.0 release
1 parent 06935c8 commit c453e22

File tree

7 files changed

+58
-17
lines changed

7 files changed

+58
-17
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
## [1.7.0](https://github.com/nicklockwood/ShapeScript/releases/tag/1.7.0) (2023-10-14)
4+
5+
- Fixed ambiguity when calling functions with parenthesized arguments
6+
- Added error message when using more than 8 lights in a scene
7+
- Bumped Euclid to version 0.7.1
8+
39
## [1.6.14](https://github.com/nicklockwood/ShapeScript/releases/tag/1.6.14) (2023-09-23)
410

511
- Bumped Euclid to version 0.6.18 (fixes crash when building with Xcode 15)
@@ -10,7 +16,7 @@
1016
- Added error hint for misspelled else keyword
1117
- Added Value.errorDescription for clearer error messages
1218
- Fixed out of bounds crash in iOS source editor
13-
- Fixed some typesystem edge cases for optionals, unions and lists
19+
- Fixed some type-system edge cases for optionals, unions and lists
1420
- Added checked angular types to help prevent mixed angle errors
1521
- Added regression tests for example shape files
1622
- Bumped Euclid to version 0.6.15

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

‎ShapeScript.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -827,8 +827,9 @@
827827
01BFB38D21425C8500E47A7C /* Project object */ = {
828828
isa = PBXProject;
829829
attributes = {
830+
BuildIndependentTargetsInParallel = YES;
830831
LastSwiftUpdateCheck = 1430;
831-
LastUpgradeCheck = 1420;
832+
LastUpgradeCheck = 1500;
832833
ORGANIZATIONNAME = "Nick Lockwood";
833834
TargetAttributes = {
834835
0152E5C4214500990082A5A3 = {
@@ -1315,7 +1316,7 @@
13151316
"$(inherited)",
13161317
"@executable_path/../Frameworks",
13171318
);
1318-
MARKETING_VERSION = 1.6.14;
1319+
MARKETING_VERSION = 1.7.0;
13191320
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
13201321
PRODUCT_MODULE_NAME = Viewer;
13211322
PRODUCT_NAME = "ShapeScript Viewer";
@@ -1343,7 +1344,7 @@
13431344
"$(inherited)",
13441345
"@executable_path/../Frameworks",
13451346
);
1346-
MARKETING_VERSION = 1.6.14;
1347+
MARKETING_VERSION = 1.7.0;
13471348
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
13481349
PRODUCT_MODULE_NAME = Viewer;
13491350
PRODUCT_NAME = "ShapeScript Viewer";
@@ -1373,7 +1374,7 @@
13731374
"$(inherited)",
13741375
"@executable_path/Frameworks",
13751376
);
1376-
MARKETING_VERSION = 1.6.14;
1377+
MARKETING_VERSION = 1.7.0;
13771378
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
13781379
PRODUCT_MODULE_NAME = Viewer;
13791380
PRODUCT_NAME = ShapeScript;
@@ -1405,7 +1406,7 @@
14051406
"$(inherited)",
14061407
"@executable_path/Frameworks",
14071408
);
1408-
MARKETING_VERSION = 1.6.14;
1409+
MARKETING_VERSION = 1.7.0;
14091410
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
14101411
PRODUCT_MODULE_NAME = Viewer;
14111412
PRODUCT_NAME = ShapeScript;
@@ -1473,7 +1474,7 @@
14731474
GCC_WARN_UNUSED_FUNCTION = YES;
14741475
GCC_WARN_UNUSED_VARIABLE = YES;
14751476
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1476-
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
1477+
MACOSX_DEPLOYMENT_TARGET = 10.14;
14771478
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
14781479
MTL_FAST_MATH = YES;
14791480
ONLY_ACTIVE_ARCH = YES;
@@ -1536,7 +1537,7 @@
15361537
GCC_WARN_UNUSED_FUNCTION = YES;
15371538
GCC_WARN_UNUSED_VARIABLE = YES;
15381539
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1539-
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
1540+
MACOSX_DEPLOYMENT_TARGET = 10.14;
15401541
MTL_ENABLE_DEBUG_INFO = NO;
15411542
MTL_FAST_MATH = YES;
15421543
SDKROOT = macosx;
@@ -1560,6 +1561,7 @@
15601561
DYLIB_COMPATIBILITY_VERSION = 1;
15611562
DYLIB_CURRENT_VERSION = 1;
15621563
DYLIB_INSTALL_NAME_BASE = "@rpath";
1564+
ENABLE_MODULE_VERIFIER = YES;
15631565
FRAMEWORK_VERSION = A;
15641566
INFOPLIST_FILE = ShapeScript/Info.plist;
15651567
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1568,7 +1570,9 @@
15681570
"@executable_path/../Frameworks",
15691571
"@loader_path/Frameworks",
15701572
);
1571-
MARKETING_VERSION = 1.6.14;
1573+
MARKETING_VERSION = 1.7.0;
1574+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1575+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
15721576
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
15731577
PRODUCT_NAME = ShapeScript;
15741578
SKIP_INSTALL = YES;
@@ -1594,6 +1598,7 @@
15941598
DYLIB_COMPATIBILITY_VERSION = 1;
15951599
DYLIB_CURRENT_VERSION = 1;
15961600
DYLIB_INSTALL_NAME_BASE = "@rpath";
1601+
ENABLE_MODULE_VERIFIER = YES;
15971602
FRAMEWORK_VERSION = A;
15981603
INFOPLIST_FILE = ShapeScript/Info.plist;
15991604
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1602,7 +1607,9 @@
16021607
"@executable_path/../Frameworks",
16031608
"@loader_path/Frameworks",
16041609
);
1605-
MARKETING_VERSION = 1.6.14;
1610+
MARKETING_VERSION = 1.7.0;
1611+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1612+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
16061613
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
16071614
PRODUCT_NAME = ShapeScript;
16081615
SKIP_INSTALL = YES;
@@ -1629,6 +1636,7 @@
16291636
"@executable_path/../Frameworks",
16301637
"@loader_path/../Frameworks",
16311638
);
1639+
MACOSX_DEPLOYMENT_TARGET = 10.15;
16321640
PRODUCT_BUNDLE_IDENTIFIER = com.GeometryScriptTests;
16331641
PRODUCT_NAME = "$(TARGET_NAME)";
16341642
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
@@ -1651,6 +1659,7 @@
16511659
"@executable_path/../Frameworks",
16521660
"@loader_path/../Frameworks",
16531661
);
1662+
MACOSX_DEPLOYMENT_TARGET = 10.15;
16541663
PRODUCT_BUNDLE_IDENTIFIER = com.GeometryScriptTests;
16551664
PRODUCT_NAME = "$(TARGET_NAME)";
16561665
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
@@ -1666,7 +1675,6 @@
16661675
DEVELOPMENT_TEAM = 8VQKF583ED;
16671676
ENABLE_HARDENED_RUNTIME = YES;
16681677
GCC_OPTIMIZATION_LEVEL = 0;
1669-
MACOSX_DEPLOYMENT_TARGET = 12.6;
16701678
PRODUCT_NAME = "$(TARGET_NAME)";
16711679
SWIFT_VERSION = 5.0;
16721680
};
@@ -1679,7 +1687,6 @@
16791687
CODE_SIGN_STYLE = Automatic;
16801688
DEVELOPMENT_TEAM = 8VQKF583ED;
16811689
ENABLE_HARDENED_RUNTIME = YES;
1682-
MACOSX_DEPLOYMENT_TARGET = 12.6;
16831690
PRODUCT_NAME = "$(TARGET_NAME)";
16841691
SWIFT_OPTIMIZATION_LEVEL = "-O";
16851692
SWIFT_VERSION = 5.0;

‎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.14"
14+
public let version = "1.7.0"
1515

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

‎Viewer/Mac/WhatsNew.rtf‎

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

14+
\f1\b\fs28 \cf2 ShapeScript 1.7.0 \'97 2023-10-14\
15+
\
16+
\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0
17+
\cf2 \kerning1\expnd0\expndtw0 \'95
18+
\f0\b0 \expnd0\expndtw0\kerning0
19+
Fixed ambiguity when calling functions with parenthesized arguments.\
20+
\ \'95
21+
\f0\b0 \expnd0\expndtw0\kerning0
22+
Added error message when using more than 8 lights in a scene.\
23+
\ \'95
24+
\f0\b0 \expnd0\expndtw0\kerning0
25+
Bumped Euclid to version 0.7.1.\
26+
\
1427
\f1\b\fs28 \cf2 ShapeScript 1.6.14 \'97 2023-09-23\
1528
\
1629
\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0
@@ -35,7 +48,7 @@ What's New in ShapeScript?\
3548
Fixed out of bounds crash in iOS source editor.\
3649
\ \'95
3750
\f0\b0 \expnd0\expndtw0\kerning0
38-
Fixed some typesystem edge cases for optionals, unions and lists.\
51+
Fixed some type-system edge cases for optionals, unions and lists.\
3952
\ \'95
4053
\f0\b0 \expnd0\expndtw0\kerning0
4154
Added checked angular types to help prevent mixed angle errors.\

‎Viewer/iOS/WhatsNew.rtf‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,20 @@
55
\paperw11900\paperh16840\margl1440\margr1440\vieww24140\viewh18420\viewkind0
66
\deftab720
77

8+
\f0\b \cf2 ShapeScript 1.7.0 \'97 2023-10-14\
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+
Fixed ambiguity when calling functions with parenthesized arguments.\
15+
\ \'95
16+
\f1\b0 \expnd0\expndtw0\kerning0
17+
Added error message when using more than 8 lights in a scene.\
18+
\ \'95
19+
\f1\b0 \expnd0\expndtw0\kerning0
20+
Bumped Euclid to version 0.7.1.\
21+
\
822
\f0\b \cf2 ShapeScript 1.6.14 \'97 2023-09-23\
923
\
1024
\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0
@@ -31,7 +45,7 @@
3145
Fixed out of bounds crash in iOS source editor.\
3246
\ \'95
3347
\f1\b0 \expnd0\expndtw0\kerning0
34-
Fixed some typesystem edge cases for optionals, unions and lists.\
48+
Fixed some type-system edge cases for optionals, unions and lists.\
3549
\ \'95
3650
\f1\b0 \expnd0\expndtw0\kerning0
3751
Added checked angular types to help prevent mixed angle errors.\

‎docs/1.7.0‎

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

0 commit comments

Comments
 (0)