Skip to content

Commit

Permalink
v2.2.0 (#62)
Browse files Browse the repository at this point in the history
  • Loading branch information
dehli authored Oct 31, 2023
1 parent 4c38a18 commit fbd92a0
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
language: objective-c

# Xcode version
osx_image: xcode9.2
osx_image: xcode14.2

# Specify the opening file for the project
xcode_workspace: TouchDraw.xcworkspace
Expand All @@ -18,4 +18,4 @@ install:

script:
- swiftlint
- set -o pipefail && xcodebuild -workspace $TRAVIS_XCODE_WORKSPACE -scheme $TRAVIS_XCODE_SCHEME -sdk $TRAVIS_XCODE_SDK -destination 'OS=10.1,name=iPhone 6' build test | xcpretty
- set -o pipefail && xcodebuild -workspace $TRAVIS_XCODE_WORKSPACE -scheme $TRAVIS_XCODE_SCHEME -sdk $TRAVIS_XCODE_SDK -destination 'OS=16.2,name=iPhone 14' build test | xcpretty
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 2.2.0

- Update for Xcode 15 (thanks to @ricsantos!)
- Fix assertion due to zero size (thanks to @ricsantos!)
- Fix [CI](https://app.travis-ci.com/github/dehli/TouchDraw)

# 2.1.3

- Update Package.swift
Expand Down
2 changes: 1 addition & 1 deletion Demo/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- TouchDraw (2.1.3)
- TouchDraw (2.2.0)

DEPENDENCIES:
- TouchDraw (from `../`)
Expand Down
4 changes: 2 additions & 2 deletions Demo/Pods/Local Podspecs/TouchDraw.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Demo/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Demo/Pods/Target Support Files/TouchDraw/Info.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Demo/TouchDrawDemo/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ class ViewController: UIViewController, TouchDrawViewDelegate {
}

@IBAction func randomColor(_ sender: AnyObject) {
let r = CGFloat(arc4random() % 255) / 255
let g = CGFloat(arc4random() % 255) / 255
let b = CGFloat(arc4random() % 255) / 255
let red = CGFloat(arc4random() % 255) / 255
let green = CGFloat(arc4random() % 255) / 255
let blue = CGFloat(arc4random() % 255) / 255

let color = UIColor(red: r, green: g, blue: b, alpha: 1.0)
let color = UIColor(red: red, green: green, blue: blue, alpha: 1.0)
drawView.setColor(color)
eraserButton.isEnabled = true
}
Expand Down
12 changes: 6 additions & 6 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
import PackageDescription

let package = Package(
name: "TouchDraw",
name: "TouchDraw",
platforms: [
.iOS(.v10)
],
products: [
.library(name: "TouchDraw", targets: ["TouchDraw"]),
products: [
.library(name: "TouchDraw", targets: ["TouchDraw"])
],
targets: [
.target(name: "TouchDraw", path: "Sources"),
targets: [
.target(name: "TouchDraw", path: "Sources")
]
)
)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The easiest way to include `TouchDraw` is by using `CocoaPods` and adding the fo

```
use_frameworks!
pod 'TouchDraw', '~> 2.1'
pod 'TouchDraw', '~> 2.2'
```

If you're not using CocoaPods, you can add the `TouchDrawView.swift` file to your project.
Expand Down
6 changes: 3 additions & 3 deletions Sources/TouchDrawView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -309,9 +309,9 @@ fileprivate extension TouchDrawView {
drawLine(fromPoint: point, toPoint: point, properties: properties)
}

for i in stride(from: 1, to: points.count, by: 1) {
let point0 = points[i - 1]
let point1 = points[i]
for index in stride(from: 1, to: points.count, by: 1) {
let point0 = points[index - 1]
let point1 = points[index]
drawLine(fromPoint: point0, toPoint: point1, properties: properties)
}
}
Expand Down
2 changes: 1 addition & 1 deletion TouchDraw.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
Pod::Spec.new do |s|

s.name = "TouchDraw"
s.version = "2.1.3"
s.version = "2.2.0"
s.summary = "TouchDraw is a UIView you can draw on."

s.description = <<-DESC
Expand Down
8 changes: 4 additions & 4 deletions TouchDraw.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
INFOPLIST_FILE = TouchDrawTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.dehli.TouchDrawTests;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -258,7 +258,7 @@
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
INFOPLIST_FILE = TouchDrawTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.dehli.TouchDrawTests;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -314,7 +314,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -366,7 +366,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down
2 changes: 1 addition & 1 deletion TouchDraw/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>2.1.3</string>
<string>2.2.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit fbd92a0

Please sign in to comment.