Update for 1.7.0 release

nicklockwood · Oct 15, 2023 · c453e22 · c453e22
1 parent 06935c8
commit c453e22
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## [1.7.0](https://github.com/nicklockwood/ShapeScript/releases/tag/1.7.0) (2023-10-14)
+
+- Fixed ambiguity when calling functions with parenthesized arguments
+- Added error message when using more than 8 lights in a scene
+- Bumped Euclid to version 0.7.1
+
 ## [1.6.14](https://github.com/nicklockwood/ShapeScript/releases/tag/1.6.14) (2023-09-23)
 
 - Bumped Euclid to version 0.6.18 (fixes crash when building with Xcode 15)
@@ -10,7 +16,7 @@
 - Added error hint for misspelled else keyword
 - Added Value.errorDescription for clearer error messages
 - Fixed out of bounds crash in iOS source editor
-- Fixed some typesystem edge cases for optionals, unions and lists
+- Fixed some type-system edge cases for optionals, unions and lists
 - Added checked angular types to help prevent mixed angle errors
 - Added regression tests for example shape files
 - Bumped Euclid to version 0.6.15

diff --git a/ShapeScript.podspec.json b/ShapeScript.podspec.json
@@ -1,6 +1,6 @@
 {
   "name": "ShapeScript",
-  "version": "1.6.14",
+  "version": "1.7.0",
   "license": {
     "type": "MIT",
     "file": "LICENSE.md"
@@ -10,7 +10,7 @@
   "authors": "Nick Lockwood",
   "source": {
     "git": "https://github.com/nicklockwood/ShapeScript.git",
-    "tag": "1.6.14"
+    "tag": "1.7.0"
   },
   "source_files": ["ShapeScript", "LRUCache/Sources", "SVGPath/Sources"],
   "requires_arc": true,

diff --git a/ShapeScript.xcodeproj/project.pbxproj b/ShapeScript.xcodeproj/project.pbxproj
@@ -827,8 +827,9 @@
 		01BFB38D21425C8500E47A7C /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1430;
-				LastUpgradeCheck = 1420;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = "Nick Lockwood";
 				TargetAttributes = {
 					0152E5C4214500990082A5A3 = {
@@ -1315,7 +1316,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.6.14;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = "ShapeScript Viewer";
@@ -1343,7 +1344,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.6.14;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = "ShapeScript Viewer";
@@ -1373,7 +1374,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.14;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = ShapeScript;
@@ -1405,7 +1406,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.14;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = ShapeScript;
@@ -1473,7 +1474,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1536,7 +1537,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
@@ -1560,6 +1561,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = ShapeScript/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1568,7 +1570,9 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.14;
+				MARKETING_VERSION = 1.7.0;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
 				PRODUCT_NAME = ShapeScript;
 				SKIP_INSTALL = YES;
@@ -1594,6 +1598,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = ShapeScript/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1602,7 +1607,9 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.14;
+				MARKETING_VERSION = 1.7.0;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
 				PRODUCT_NAME = ShapeScript;
 				SKIP_INSTALL = YES;
@@ -1629,6 +1636,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PRODUCT_BUNDLE_IDENTIFIER = com.GeometryScriptTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
@@ -1651,6 +1659,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				PRODUCT_BUNDLE_IDENTIFIER = com.GeometryScriptTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
@@ -1666,7 +1675,6 @@
 				DEVELOPMENT_TEAM = 8VQKF583ED;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				MACOSX_DEPLOYMENT_TARGET = 12.6;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 			};
@@ -1679,7 +1687,6 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 8VQKF583ED;
 				ENABLE_HARDENED_RUNTIME = YES;
-				MACOSX_DEPLOYMENT_TARGET = 12.6;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;

diff --git a/ShapeScript/Interpreter.swift b/ShapeScript/Interpreter.swift
@@ -11,7 +11,7 @@ import Foundation
 
 // MARK: Public interface
 
-public let version = "1.6.14"
+public let version = "1.7.0"
 
 public protocol EvaluationDelegate: AnyObject {
     func resolveURL(for path: String) -> URL

diff --git a/Viewer/Mac/WhatsNew.rtf b/Viewer/Mac/WhatsNew.rtf
@@ -11,6 +11,19 @@ What's New in ShapeScript?\
 \
 \pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0
 
+\f1\b\fs28 \cf2 ShapeScript 1.7.0 \'97 2023-10-14\
+\
+\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0
+\cf2 \kerning1\expnd0\expndtw0   \'95
+\f0\b0 \expnd0\expndtw0\kerning0
+  Fixed ambiguity when calling functions with parenthesized arguments.\
+\   \'95
+\f0\b0 \expnd0\expndtw0\kerning0
+  Added error message when using more than 8 lights in a scene.\
+\   \'95
+\f0\b0 \expnd0\expndtw0\kerning0
+  Bumped Euclid to version 0.7.1.\
+\
 \f1\b\fs28 \cf2 ShapeScript 1.6.14 \'97 2023-09-23\
 \
 \pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0
@@ -35,7 +48,7 @@ What's New in ShapeScript?\
   Fixed out of bounds crash in iOS source editor.\
 \   \'95
 \f0\b0 \expnd0\expndtw0\kerning0
-  Fixed some typesystem edge cases for optionals, unions and lists.\
+  Fixed some type-system edge cases for optionals, unions and lists.\
 \   \'95
 \f0\b0 \expnd0\expndtw0\kerning0
   Added checked angular types to help prevent mixed angle errors.\

diff --git a/Viewer/iOS/WhatsNew.rtf b/Viewer/iOS/WhatsNew.rtf
@@ -5,6 +5,20 @@
 \paperw11900\paperh16840\margl1440\margr1440\vieww24140\viewh18420\viewkind0
 \deftab720
 
+\f0\b \cf2 ShapeScript 1.7.0 \'97 2023-10-14\
+\
+\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0
+\cf2 \kerning1\expnd0\expndtw0
+\f1\b0 \expnd0\expndtw0\kerning0   \'95
+\f1\b0 \expnd0\expndtw0\kerning0
+  Fixed ambiguity when calling functions with parenthesized arguments.\
+\   \'95
+\f1\b0 \expnd0\expndtw0\kerning0
+  Added error message when using more than 8 lights in a scene.\
+\   \'95
+\f1\b0 \expnd0\expndtw0\kerning0
+  Bumped Euclid to version 0.7.1.\
+\
 \f0\b \cf2 ShapeScript 1.6.14 \'97 2023-09-23\
 \
 \pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0
@@ -31,7 +45,7 @@
   Fixed out of bounds crash in iOS source editor.\
 \   \'95
 \f1\b0 \expnd0\expndtw0\kerning0
-  Fixed some typesystem edge cases for optionals, unions and lists.\
+  Fixed some type-system edge cases for optionals, unions and lists.\
 \   \'95
 \f1\b0 \expnd0\expndtw0\kerning0
   Added checked angular types to help prevent mixed angle errors.\

diff --git a/docs/1.7.0 b/docs/1.7.0
@@ -0,0 +1 @@
+1.6.12