Skip to content

Commit

Permalink
Update for 1.1.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
nicklockwood committed Apr 8, 2021
1 parent 5703b8b commit f81ffa8
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 11 deletions.
1 change: 1 addition & 0 deletions .swiftformat
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
--ifdef no-indent

--exclude Euclid
--exclude **/XCTestManifests.swift
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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/[email protected])](http://twitter.com/nicklockwood)

Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ShapeScript.podspec.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ShapeScript",
"version": "1.0.1",
"version": "1.1.0",
"license": {
"type": "MIT",
"file": "LICENSE.md"
Expand All @@ -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,
Expand Down
6 changes: 4 additions & 2 deletions ShapeScript.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ShapeScript/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.1</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
Expand Down

0 comments on commit f81ffa8

Please sign in to comment.