From f81ffa88461aaaeb1da73901731f1261d07b7333 Mon Sep 17 00:00:00 2001 From: Nick Lockwood Date: Thu, 8 Apr 2021 23:46:39 +0100 Subject: [PATCH] Update for 1.1.0 release --- .swiftformat | 1 + .travis.yml | 6 ++++-- CHANGELOG.md | 10 ++++++++++ README.md | 8 ++++---- ShapeScript.podspec.json | 4 ++-- ShapeScript.xcodeproj/project.pbxproj | 6 ++++-- ShapeScript/Info.plist | 2 +- 7 files changed, 26 insertions(+), 11 deletions(-) diff --git a/.swiftformat b/.swiftformat index abf303e1..984f39e6 100644 --- a/.swiftformat +++ b/.swiftformat @@ -4,3 +4,4 @@ --ifdef no-indent --exclude Euclid +--exclude **/XCTestManifests.swift diff --git a/.travis.yml b/.travis.yml index 33bfe08e..890d01aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: swift -osx_image: xcode11 - +osx_image: xcode11.7 script: + - set -o pipefail - xcodebuild -scheme "ShapeScript Lib" -sdk macosx clean build test +after_success: + - bash <(curl -s https://codecov.io/bash) -t 7514ee4a-dfc8-4de0-9964-c2883c941ef4 diff --git a/CHANGELOG.md b/CHANGELOG.md index a6f9946d..dc144e68 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [1.1.0](https://github.com/nicklockwood/ShapeScript/releases/tag/1.1.0) (2021-04-08) + +- Added support for background colors and images +- Added debug console +- Improved ShapeScript error handling +- Object names are now included in info popup +- Upgraded project to Swift 5.1 +- Bumped Euclid version to 0.4.0 +- Fixed Xcode warnings + ## [1.0.1](https://github.com/nicklockwood/ShapeScript/releases/tag/1.0.1) (2020-09-03) - Added iOS and tvOS support to ShapeScript framework (Viewer app is still macOS only) diff --git a/README.md b/README.md index 770e67d3..2d55a455 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Travis](https://travis-ci.org/nicklockwood/ShapeScript.svg)](https://travis-ci.org/nicklockwood/ShapeScript) [![Platforms](https://img.shields.io/badge/platforms-iOS%20|%20macOS%20|%20tvOS-lightgray.svg)]() -[![Swift 5](https://img.shields.io/badge/swift-5.0-red.svg?style=flat)](https://developer.apple.com/swift) +[![Swift 5.1](https://img.shields.io/badge/swift-5.1-red.svg?style=flat)](https://developer.apple.com/swift) [![License](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://opensource.org/licenses/MIT) [![Twitter](https://img.shields.io/badge/twitter-@nicklockwood-blue.svg)](http://twitter.com/nicklockwood) @@ -29,19 +29,19 @@ ShapeScript is packaged as a dynamic framework, which itself depends on the [Euc To install the ShapeScript framework using CocoaPods, add the following to your Podfile: ```ruby -pod 'ShapeScript', '~> 1.0' +pod 'ShapeScript', '~> 1.1' ``` To install using Carthage, add this to your Cartfile: ```ogdl -github "nicklockwood/ShapeScript" ~> 1.0 +github "nicklockwood/ShapeScript" ~> 1.1 ``` To install using Swift Package Manager, add this to the `dependencies:` section in your Package.swift file: ```swift -.package(url: "https://github.com/nicklockwood/ShapeScript.git", .upToNextMinor(from: "1.0.0")), +.package(url: "https://github.com/nicklockwood/ShapeScript.git", .upToNextMinor(from: "1.1.0")), ``` The repository also includes the ShapeScript Viewer application, a cut-down version of the ShapeScript app available on the [Mac App Store](https://apps.apple.com/app/id1441135869). It is not currently possible to install or run this app using CocoaPods, Carthage or Swift Package Manager, however you can run it by opening the included Xcode project and selecting the `ShapeScript Viewer` scheme. diff --git a/ShapeScript.podspec.json b/ShapeScript.podspec.json index c54ab480..54e5e0b8 100644 --- a/ShapeScript.podspec.json +++ b/ShapeScript.podspec.json @@ -1,6 +1,6 @@ { "name": "ShapeScript", - "version": "1.0.1", + "version": "1.1.0", "license": { "type": "MIT", "file": "LICENSE.md" @@ -10,7 +10,7 @@ "authors": "Nick Lockwood", "source": { "git": "https://github.com/nicklockwood/ShapeScript.git", - "tag": "1.0.1" + "tag": "1.1.0" }, "source_files": "ShapeScript", "requires_arc": true, diff --git a/ShapeScript.xcodeproj/project.pbxproj b/ShapeScript.xcodeproj/project.pbxproj index c66e0248..9e692870 100644 --- a/ShapeScript.xcodeproj/project.pbxproj +++ b/ShapeScript.xcodeproj/project.pbxproj @@ -590,7 +590,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer; PRODUCT_MODULE_NAME = Viewer; PRODUCT_NAME = "ShapeScript Viewer"; @@ -616,7 +616,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer; PRODUCT_MODULE_NAME = Viewer; PRODUCT_NAME = "ShapeScript Viewer"; @@ -770,6 +770,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib; PRODUCT_NAME = ShapeScript; SKIP_INSTALL = YES; @@ -799,6 +800,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib; PRODUCT_NAME = ShapeScript; SKIP_INSTALL = YES; diff --git a/ShapeScript/Info.plist b/ShapeScript/Info.plist index 7fc0f215..91936001 100644 --- a/ShapeScript/Info.plist +++ b/ShapeScript/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.1 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright