Skip to content

Commit f81ffa8

Browse files
nicklockwoodnicklockwood
committed
Update for 1.1.0 release
1 parent 5703b8b commit f81ffa8

7 files changed

Lines changed: 26 additions & 11 deletions

File tree

‎.swiftformat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
--ifdef no-indent
55

66
--exclude Euclid
7+
--exclude **/XCTestManifests.swift

‎.travis.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
language: swift
2-
osx_image: xcode11
3-
2+
osx_image: xcode11.7
43
script:
4+
- set -o pipefail
55
- xcodebuild -scheme "ShapeScript Lib" -sdk macosx clean build test
6+
after_success:
7+
- bash <(curl -s https://codecov.io/bash) -t 7514ee4a-dfc8-4de0-9964-c2883c941ef4

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## [1.1.0](https://github.com/nicklockwood/ShapeScript/releases/tag/1.1.0) (2021-04-08)
2+
3+
- Added support for background colors and images
4+
- Added debug console
5+
- Improved ShapeScript error handling
6+
- Object names are now included in info popup
7+
- Upgraded project to Swift 5.1
8+
- Bumped Euclid version to 0.4.0
9+
- Fixed Xcode warnings
10+
111
## [1.0.1](https://github.com/nicklockwood/ShapeScript/releases/tag/1.0.1) (2020-09-03)
212

313
- Added iOS and tvOS support to ShapeScript framework (Viewer app is still macOS only)

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Travis](https://travis-ci.org/nicklockwood/ShapeScript.svg)](https://travis-ci.org/nicklockwood/ShapeScript)
22
[![Platforms](https://img.shields.io/badge/platforms-iOS%20|%20macOS%20|%20tvOS-lightgray.svg)]()
3-
[![Swift 5](https://img.shields.io/badge/swift-5.0-red.svg?style=flat)](https://developer.apple.com/swift)
3+
[![Swift 5.1](https://img.shields.io/badge/swift-5.1-red.svg?style=flat)](https://developer.apple.com/swift)
44
[![License](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://opensource.org/licenses/MIT)
55
[![Twitter](https://img.shields.io/badge/[email protected])](http://twitter.com/nicklockwood)
66

@@ -29,19 +29,19 @@ ShapeScript is packaged as a dynamic framework, which itself depends on the [Euc
2929
To install the ShapeScript framework using CocoaPods, add the following to your Podfile:
3030

3131
```ruby
32-
pod 'ShapeScript', '~> 1.0'
32+
pod 'ShapeScript', '~> 1.1'
3333
```
3434

3535
To install using Carthage, add this to your Cartfile:
3636

3737
```ogdl
38-
github "nicklockwood/ShapeScript" ~> 1.0
38+
github "nicklockwood/ShapeScript" ~> 1.1
3939
```
4040

4141
To install using Swift Package Manager, add this to the `dependencies:` section in your Package.swift file:
4242

4343
```swift
44-
.package(url: "https://github.com/nicklockwood/ShapeScript.git", .upToNextMinor(from: "1.0.0")),
44+
.package(url: "https://github.com/nicklockwood/ShapeScript.git", .upToNextMinor(from: "1.1.0")),
4545
```
4646

4747
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.

‎ShapeScript.podspec.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ShapeScript",
3-
"version": "1.0.1",
3+
"version": "1.1.0",
44
"license": {
55
"type": "MIT",
66
"file": "LICENSE.md"
@@ -10,7 +10,7 @@
1010
"authors": "Nick Lockwood",
1111
"source": {
1212
"git": "https://github.com/nicklockwood/ShapeScript.git",
13-
"tag": "1.0.1"
13+
"tag": "1.1.0"
1414
},
1515
"source_files": "ShapeScript",
1616
"requires_arc": true,

‎ShapeScript.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@
590590
"$(inherited)",
591591
"@executable_path/../Frameworks",
592592
);
593-
MARKETING_VERSION = 1.0;
593+
MARKETING_VERSION = 1.1.0;
594594
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
595595
PRODUCT_MODULE_NAME = Viewer;
596596
PRODUCT_NAME = "ShapeScript Viewer";
@@ -616,7 +616,7 @@
616616
"$(inherited)",
617617
"@executable_path/../Frameworks",
618618
);
619-
MARKETING_VERSION = 1.0;
619+
MARKETING_VERSION = 1.1.0;
620620
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
621621
PRODUCT_MODULE_NAME = Viewer;
622622
PRODUCT_NAME = "ShapeScript Viewer";
@@ -770,6 +770,7 @@
770770
"@executable_path/../Frameworks",
771771
"@loader_path/Frameworks",
772772
);
773+
MARKETING_VERSION = 1.1.0;
773774
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
774775
PRODUCT_NAME = ShapeScript;
775776
SKIP_INSTALL = YES;
@@ -799,6 +800,7 @@
799800
"@executable_path/../Frameworks",
800801
"@loader_path/Frameworks",
801802
);
803+
MARKETING_VERSION = 1.1.0;
802804
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
803805
PRODUCT_NAME = ShapeScript;
804806
SKIP_INSTALL = YES;

‎ShapeScript/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0.1</string>
18+
<string>$(MARKETING_VERSION)</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSHumanReadableCopyright</key>

0 commit comments

Comments
 (0)