Update for 1.5.7 release

nicklockwood · Sep 26, 2022 · 2c0473a · 2c0473a
1 parent a1398d1
commit 2c0473a
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## [1.5.7](https://github.com/nicklockwood/ShapeScript/releases/tag/1.5.7) (2022-09-26)
+
+- Fixed bug where a `define` inside a block couldn't refer to `option` value
+- Fixed bug when parsing expressions ending in a `not` identifier
+- Fixed bug where view unexpectedly jumped to custom camera after reload
+- Bumped Euclid to version 0.5.30
+- Bumped LRUCache to version 1.0.3
+- Bumped SVGPath to version 1.1.1
+- Added iOS help pages
+
 ## [1.5.6](https://github.com/nicklockwood/ShapeScript/releases/tag/1.5.6) (2022-09-06)
 
 - Added ability to copy the current camera configuration for easy creation of custom cameras

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

diff --git a/ShapeScript.xcodeproj/project.pbxproj b/ShapeScript.xcodeproj/project.pbxproj
@@ -874,7 +874,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.5.6;
+				MARKETING_VERSION = 1.5.7;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = "ShapeScript Viewer";
@@ -902,7 +902,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.5.6;
+				MARKETING_VERSION = 1.5.7;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = "ShapeScript Viewer";
@@ -1062,7 +1062,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.6;
+				MARKETING_VERSION = 1.5.7;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
 				PRODUCT_NAME = ShapeScript;
 				SKIP_INSTALL = YES;
@@ -1093,7 +1093,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.6;
+				MARKETING_VERSION = 1.5.7;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
 				PRODUCT_NAME = ShapeScript;
 				SKIP_INSTALL = YES;

diff --git a/ShapeScript/Geometry.swift b/ShapeScript/Geometry.swift
@@ -242,13 +242,15 @@ public extension Geometry {
             } ?? .empty) { bounds, child in
                 bounds.formIntersection(child.bounds.transformed(by: child.transform))
             }
+        case .union, .xor, .group:
+            return Bounds(bounds: children.map {
+                $0.bounds.transformed(by: $0.transform)
+            })
         case .cone, .cube, .cylinder, .sphere, .path, .mesh,
-             .lathe, .fill, .extrude, .loft,
-             .union, .xor, .group,
-             .camera, .light:
-            return children.reduce(into: type.bounds) { bounds, child in
-                bounds.formUnion(child.bounds.transformed(by: child.transform))
-            }
+             .lathe, .fill, .extrude, .loft:
+            return type.bounds
+        case .camera, .light:
+            return .empty
         }
     }
 

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

diff --git a/ShapeScriptTests/MetadataTests.swift b/ShapeScriptTests/MetadataTests.swift
@@ -392,6 +392,10 @@ class MetadataTests: XCTestCase {
             XCTFail("Help directory for \(shapeScriptVersion) not found")
             return
         }
+        let attrs = try fm.attributesOfItem(atPath: outputDirectory.path)
+        if attrs[.type] as? FileAttributeType == .typeSymbolicLink {
+            return
+        }
         try? fm.removeItem(at: outputDirectory)
         for subdir in ["mac", "ios"] {
             let helpDir = helpDirectory.appendingPathComponent(subdir)

diff --git a/docs/1.5.7 b/docs/1.5.7
@@ -0,0 +1 @@
+1.5.6