Merge branch 'dev'

.codebeatignore

@@ -0,0 +1,2 @@
+docs/*
+Demo/*

.gitignore

@@ -33,10 +33,11 @@ timeline.xctimeline
 playground.xcworkspace
 
 # Swift Package Manager
-#
-# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 Packages/
 .build/
+Package.pins
+Package.resolved
+*.xcodeproj
 
 # CocoaPods
 #
@@ -64,3 +65,5 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
+
+**/.DS_Store

Scripts/ci.sh → .scripts/ci.sh

@@ -50,12 +50,7 @@ echo "📅 Version: `swift --version`";
 
 echo "🚀 Building";
 
-if [[ $OS == "macOS" ]];
-then
-    swift build -Xlinker -lz;
-else
-    swift build -Xlinker -rpath=.build/debug/ -Xlinker -lz;
-fi
+make debug;
 
 if [[ $? != 0 ]]; 
 then 
@@ -65,12 +60,7 @@ fi
 
 echo "💼 Building Release";
 
-if [[ $OS == "macOS" ]];
-then
-    swift build -c release -Xlinker -lz;
-else
-    swift build -c release -Xlinker -rpath=.build/release/ -Xlinker -lz;
-fi
+make release;
 
 if [[ $? != 0 ]]; 
 then 
@@ -80,12 +70,7 @@ fi
 
 echo "🔎 Testing";
 
-if [[ $OS == "macOS" ]];
-then
-    swift test -Xlinker -lz
-else
-    swift test -Xlinker -rpath=.build/debug/ -Xlinker -lz
-fi
+make test;
 
 if [[ $? != 0 ]];
 then 

Scripts/coverage.sh → .scripts/coverage.sh

@@ -20,6 +20,7 @@ echo "🚀  Testing: $SCHEME_NAME";
 
 rvm install 2.2.3
 gem install xcpretty
+make generate-xcodeproj
 WORKING_DIRECTORY=$(PWD) xcodebuild -project $PROJ_NAME.xcodeproj -scheme $SCHEME_NAME -sdk macosx10.12 -destination arch=x86_64 -configuration Debug -enableCodeCoverage YES test | xcpretty
 bash <(curl -s https://codecov.io/bash)
 

.travis.yml

@@ -3,25 +3,27 @@ language: generic
 matrix:
   include:
     - os: osx
-      osx_image: xcode8
-      env: RUN_TESTS="NO" POD_LINT="YES"
+      osx_image: xcode8.3
+      env: SWIFT_VERSION="3.1" RUN_TESTS="NO" POD_LINT="YES"
     - os: osx
-      osx_image: xcode8
-      env: RUN_TESTS="YES" POD_LINT="NO"
+      osx_image: xcode8.3
+      env: SWIFT_VERSION="3.1" RUN_TESTS="YES" POD_LINT="NO"
     - os: linux
       sudo: required
       dist: trusty
-      env: RUN_TESTS="YES" POD_LINT="NO"
+      env: SWIFT_VERSION="3.1" RUN_TESTS="YES" POD_LINT="NO"
 
 script:
   - if [[ $POD_LINT == "YES" ]]; then
-      gem install cocoapods && pod lib lint --allow-warnings;
+      gem install cocoapods;
+      pod repo update --silent;
+      pod lib lint --swift-version=$SWIFT_VERSION --allow-warnings;
     fi
   - if [[ $RUN_TESTS == "YES" ]]; then
-      eval Scripts/ci.sh;
+      eval .scripts/ci.sh;
     fi
 
 after_success:
   - if [[ $RUN_TESTS == "YES" ]]; then
-      eval Scripts/coverage.sh;
+      eval .scripts/coverage.sh;
     fi

CHANGELOG.md

@@ -1,5 +1,38 @@
 # Change Log
 
+## [0.2.0](https://github.com/WeirdMath/SwiftyHaru/tree/0.2.0) (2017-06-25)
+
+Please note that this version requires Swift 3.1.
+
+**Breaking changes:**
+
+- Changed the signature of the `DrawingContext.fill(_:evenOddRule:stroke:)` and `DrawingContext.clip(to:evenOddRule:_:)` methods. Instead of `Bool` value for fill rule they now require the `Path.FillRule` enum value.
+
+**Closed issues:**
+
+- Implement high-level grid drawing [\#6](https://github.com/WeirdMath/SwiftyHaru/issues/6)
+- Package has unsupported layout for linux [\#7](https://github.com/WeirdMath/SwiftyHaru/issues/7)
+
+**Implemented features:**
+
+- Loading TrueType fonts from a .ttc collection
+- Getting a bounding box of a specified text put at a specified position
+- Getting the ascent of a font
+- Getting the descent of a font
+- Getting the x-height of a font
+- Getting the cap height of a font
+- Setting metadata (author, creator, title, subject, keywords, creation date, modification date)
+- Setting a password, encryption mode and permissions
+- Setting a compression mode
+- Getting the depth of the graphics state stack
+- Closure-based syntax for saving and restoring the graphics state
+- Showing a text in a provided rectangle
+- **High-level customizable interface for drawing grids!**
+
+**Fixes:**
+
+- Setting `miterLimit`, `font` and `fontSize` of `DrawingContext`, `width` and `height` of `PDFPage` to an invalid value now causes precondition failure.
+
 ## [0.1.0](https://github.com/WeirdMath/SwiftyHaru/tree/0.1.0) (2016-11-02)
 **Closed issues:**