Update for 1.3.10 release

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.3.10](https://github.com/nicklockwood/ShapeScript/releases/tag/1.3.10) (2021-11-01)
+
+- DAE files containing triangle strips or non-triangular polygons are now loaded correctly
+- Fixed empty Geometry names not being set to nil
+- Fixed broken footer links in help pages
+- Bumped Euclid to version 0.5.14
+
 ## [1.3.9](https://github.com/nicklockwood/ShapeScript/releases/tag/1.3.9) (2021-10-22)
 
 - Added multiple camera options

LRUCache/LRUCache.xcodeproj/project.pbxproj

@@ -157,7 +157,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1010;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1310;
 				ORGANIZATIONNAME = "Nick Lockwood";
 				TargetAttributes = {
 					016FAB2821BFE78100AF60DC = {
@@ -327,13 +327,14 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -387,12 +388,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -427,6 +429,7 @@
 				SDKROOT = "";
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvos appletvsimulator";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;

LRUCache/LRUCache.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ShapeScript.podspec.json

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

ShapeScript.xcodeproj/project.pbxproj

@@ -741,7 +741,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.3.9;
+				MARKETING_VERSION = 1.3.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = "ShapeScript Viewer";
@@ -768,7 +768,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.3.9;
+				MARKETING_VERSION = 1.3.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = "ShapeScript Viewer";
@@ -921,7 +921,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.9;
+				MARKETING_VERSION = 1.3.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
 				PRODUCT_NAME = ShapeScript;
 				SKIP_INSTALL = YES;
@@ -950,7 +950,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.9;
+				MARKETING_VERSION = 1.3.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
 				PRODUCT_NAME = ShapeScript;
 				SKIP_INSTALL = YES;

ShapeScript/EvaluationContext.swift

@@ -9,6 +9,14 @@
 import Euclid
 import Foundation
 
+#if canImport(CoreGraphics)
+import CoreGraphics
+#endif
+
+#if canImport(CoreText)
+import CoreText
+#endif
+
 // MARK: Implementation
 
 public struct SourceLocation: Hashable {

ShapeScript/Scene+SceneKit.swift

@@ -146,7 +146,7 @@ public extension Geometry {
 
         if let scnData = scnData, scnData.options == options {
             return
-        } else if let path = self.path {
+        } else if let path = path {
             let wireframe = SCNGeometry(.stroke(
                 path,
                 width: options.lineWidth,
@@ -158,7 +158,7 @@ public extension Geometry {
                 geometry: wireframe,
                 wireframe: wireframe
             )
-        } else if let mesh = self.mesh {
+        } else if let mesh = mesh {
             if options.wireframe {
                 let wireframe = scnData?.wireframe ?? (
                     options.wireframeLineWidth > 0 ? SCNGeometry(.stroke(

Viewer/Document.swift

@@ -168,7 +168,7 @@ class Document: NSDocument, EvaluationDelegate {
     override func read(from url: URL, ofType _: String) throws {
         let input = try String(contentsOf: url, encoding: .utf8)
         linkedResources.removeAll()
-        if let progress = self.progress, progress.inProgress {
+        if let progress = progress, progress.inProgress {
             Swift.print("[\(progress.id)] cancelling...")
             progress.cancel()
         }
@@ -409,7 +409,7 @@ class Document: NSDocument, EvaluationDelegate {
             dimensions = "calculating…"
         }
 
-        if let selectedGeometry = self.selectedGeometry {
+        if let selectedGeometry = selectedGeometry {
             var locationString = ""
             if let location = selectedGeometry.sourceLocation {
                 locationString = "\nDefined on line \(location.line)"

Viewer/Settings.swift

@@ -221,7 +221,7 @@ private extension URL {
     }
 
     func setXattr(_ data: Data, for name: String) throws {
-        try self.withUnsafeFileSystemRepresentation { path in
+        try withUnsafeFileSystemRepresentation { path in
             let length = data.count
             let result = data.withUnsafeBytes {
                 setxattr(path, name, $0.baseAddress, length, 0, 0)
@@ -234,7 +234,7 @@ private extension URL {
 
     func posixError(_ err: Int32) -> NSError {
         NSError(domain: NSPOSIXErrorDomain, code: Int(err), userInfo: [
-            NSLocalizedDescriptionKey: String(cString: strerror(err))
+            NSLocalizedDescriptionKey: String(cString: strerror(err)),
         ])
     }
 }