Skip to content

Commit

Permalink
Merge pull request #200 from techprimate/release/2.0
Browse files Browse the repository at this point in the history
Release of 2.0
  • Loading branch information
Philip Niedertscheider committed May 19, 2020
2 parents 97cd68d + eb8da5c commit 1353129
Show file tree
Hide file tree
Showing 509 changed files with 46,008 additions and 14,422 deletions.
27 changes: 18 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,27 @@ playground.xcworkspace

# Swift Package Manager
.build/
Example*/ManifestLoading
Example*/checkouts
Example*/dependencies-state.json
Example*/manifest.db
Exampl*/repositories

# Carthage
Carthage/Build
derived_data
Example*/Carthage
Example*/derived_data
Example*/Cartfile.resolved

# Cocoapods
Example/Pods/Local Podspecs
Example/Pods/Nimble
Example/Pods/Quick
Example/Pods/Swiftlint
Example*/Pods
Example*/Pods/Local Podspecs
Example*/Pods/Nimble
Example*/Pods/Quick
Example*/Pods/Swiftlint

# Swift Package Manager
.swiftpm

# Xcode Schemes, so Carthage doesn't complain
!Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/TPPDF.xcscheme
!Example/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF-Example.xcscheme
!Example/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF_Tests.xcscheme
!Example iOS/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF.xcscheme
!Example iOS/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF-Example.xcscheme
4 changes: 2 additions & 2 deletions .jazzy.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
author: Philip Niedertscheider
author_url: https://www.github.com/techprimate-phil
author_url: https://www.github.com/philprime
github_url: https://www.github.com/techprimate/TPPDF
root_url: https://techprimate.github.io/TPPDF/
module: TPPDF
output: docs
theme: fullwidth
xcodebuild_arguments: [-workspace, 'Example/TPPDF.xcworkspace', -scheme, 'TPPDF-Example']
xcodebuild_arguments: [-project, 'Example iOS-SwiftPM/Example.xcodeproj', -scheme, 'Example', -sdk, 'iphonesimulator']
7 changes: 3 additions & 4 deletions .slather.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
coverage_service: cobertura_xml
xcodeproj: Example/TPPDF.xcodeproj
scheme: TPPDF-Example
workspace: Example/TPPDF.xcworkspace
xcodeproj: TPPDF.xcodeproj
scheme: TPPDF-Package
source_directory: Source
configuration: Debug
binary_basename: TPPDF
binary_basename: TPPDF
147 changes: 119 additions & 28 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,126 @@
os: osx
osx_image: xcode11.2
osx_image: xcode11.4
language: objective-c
cache:
bundler: true
cocoapods: true
podfile: Example/Podfile
notifications:
slack:
secure: zqgyogEkMEjTfIZqbSOfG8SWE3+93tDyPt+Q/aRe4xO/Bd/IKcUrn0XtLDeZf38Q5Xkb3oZzg+8NMcwj0EPEbV+iO/drmJd3keAHWlLwc1Lyzq7mjibfOgwtXRuahC6z5VxPooGFH3dXz0ZWPrk4oDTv6p9uJ+8efPxZMY55lMnJvvYRVBHwIfK9pxNkOt/dC7Sflh6/46JUIefJGuSr3rgG+ImE+exp/us6lA2wu/XDDyMyAqMQPBLa2L4OL/CKqLP6NFLy00QlRtlPKW/AvyIXPI2x/k9porkK+cueGK0n3ZnZcsINdf8YKIVuTpOATmd9igXX7d2oW7FGJwlU7ttZ6gaa/zQxfHwVHKYbXdQYdfpXrB6u/tb1qpfj/CbDVgxVHEr7vXXJQdMJVnWqzXJiLlai4S3tRrLHyD86IeyhWj28jMp0JT6A9bkhrMy30Fyx3L2QMzZf17/xRI3ZJdl+Exj/f5xEngdO5yk2B98K4YWFkfJO80kmegXnH178OolaOnhHTLW/1q6l/ZBD7LVtRq1hFgcPIR0JxgsvWzX6+0dE4cZ6pb1Ulq0uj90T8ryBV+jaHdHPKxOORCkOLHfsem+5Tw5GzMBVhVNKdV7ajX1SvZmIMyoczfCsKXdU5zk5vbjigjm0fqdKY2/1AJAXDAHB7QMeQSR/WDEXNbc=

env:
global:
- WORKSPACE=Example/TPPDF.xcworkspace
- PROJECT=Example/TPPDF.xcodeproj
- TEST_FRAMEWORK_SCHEME="TPPDF-Example"
- EXAMPLE_SCHEME="TPPDF-Example"
- SOURCE_FOLDER="Source"
matrix:
- DESTINATION="OS=13.2.2,name=iPhone 11 Pro"
install:
- bundle install
- bundle exec pod repo update
- bundle exec pod install --project-directory=Example
script:
- set -o pipefail
- xcodebuild -version
- xcodebuild -showsdks
- xcodebuild -list
- xcodebuild -workspace "$WORKSPACE" -scheme "$TEST_FRAMEWORK_SCHEME" -sdk iphonesimulator -destination "$DESTINATION" -configuration Debug -derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data -enableCodeCoverage YES ONLY_ACTIVE_ARCH=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES build test | xcpretty
- xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk iphonesimulator -destination "$DESTINATION" -configuration Debug -derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data ONLY_ACTIVE_ARCH=YES build | xcpretty
- pod lib lint --allow-warnings
- WORKSPACE="Example.xcworkspace"
- PROJECT="Example.xcodeproj"
- EXAMPLE_SCHEME="Example"

stages:
- Tests
- Examples

jobs:
include:
- stage: Tests
name: "Unit Tests"
language: objective-c
cache:
bundler: true
env:
- TEST_FRAMEWORK_SCHEME="TPPDF-Package"
- PROJECT="TPPDF.xcodeproj"
install:
- bundle install
script:
- swift package resolve
- xcodebuild -project ${PROJECT}
-scheme ${TEST_FRAMEWORK_SCHEME}
-clonedSourcePackagesDirPath .
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
-sdk iphonesimulator
-destination "${DESTINATION}"
-configuration Debug
ONLY_ACTIVE_ARCH=YES
test | bundle exec xcpretty

- stage: Examples
name: "Example iOS - Cocoapods"
language: objective-c
env:
- ROOT_FOLDER="Example iOS-Cocoapods"
cache:
bundler: true
cocoapods: true
podfile: "${ROOT_FOLDER}/Podfile"
install:
- bundle install
- bundle exec pod install --project-directory="${ROOT_FOLDER}"
before_script:
- cd "${ROOT_FOLDER}"
script:
- xcodebuild -workspace "$WORKSPACE"
-scheme "$EXAMPLE_SCHEME"
-sdk iphonesimulator
-destination "$DESTINATION"
-configuration Debug
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
ONLY_ACTIVE_ARCH=YES
build | bundle exec xcpretty
- cd ../
- bundle exec pod lib lint --allow-warnings

- stage: Examples
name: "Example iOS - Carthage"
language: objective-c
cache:
bundler: true
env:
- ROOT_FOLDER="Example iOS-Carthage"
before_install:
- brew update
- brew outdated carthage || brew upgrade carthage
before_script:
- cd "${ROOT_FOLDER}"
- echo 'github "techprimate/TPPDF" "'$(git rev-parse HEAD)'"' > Cartfile
- carthage update --platform ios
script:
- xcodebuild -workspace "$WORKSPACE"
-scheme "$EXAMPLE_SCHEME"
-sdk iphonesimulator
-destination "$DESTINATION"
-configuration Debug
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
ONLY_ACTIVE_ARCH=YES
build | bundle exec xcpretty

- stage: Examples
name: "Example iOS - Swift PM"
language: objective-c
cache:
bundler: true
env:
- ROOT_FOLDER="Example iOS-SwiftPM"
script:
- cd "${ROOT_FOLDER}"
- xcodebuild -resolvePackageDependencies
-project ${PROJECT}
-scheme ${EXAMPLE_SCHEME}
-clonedSourcePackagesDirPath .
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
-configuration Debug | bundle exec xcpretty
- xcodebuild -project ${PROJECT}
-scheme ${EXAMPLE_SCHEME}
-clonedSourcePackagesDirPath .
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
-sdk iphonesimulator
-destination "${DESTINATION}"
-configuration Debug
ONLY_ACTIVE_ARCH=YES
build | bundle exec xcpretty
- xcodebuild -project ${PROJECT}
-scheme ${TEST_FRAMEWORK_SCHEME}
-clonedSourcePackagesDirPath .
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
-sdk iphonesimulator
-destination "${DESTINATION}"
-configuration Debug
ONLY_ACTIVE_ARCH=YES
test | bundle exec xcpretty

after_success:
- slather coverage -t --build-directory ${TRAVIS_BUILD_DIR}/derived_data --verbose
- bash <(curl -s https://codecov.io/bash) -f cobertura.xml -X coveragepy -X gcov -X
xcode
- bash <(curl -s https://codecov.io/bash) -f cobertura.xml -X coveragepy -X gcov -X xcode
35 changes: 34 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Change Log

## [Unreleased](https://github.com/techprimate/TPPDF/tree/HEAD) (2020-??-??)
[Full Changelog](https://github.com/techprimate/TPPDF/compare/1.6.0...HEAD)
[Full Changelog](https://github.com/techprimate/TPPDF/compare/2.0.0...HEAD)

**Implemented enhancements:**

Expand All @@ -11,6 +11,38 @@

**Merged pull requests:**

## [Unreleased](https://github.com/techprimate/TPPDF/tree/HEAD) (2020-??-??)
[Full Changelog](https://github.com/techprimate/TPPDF/compare/1.6.0...2.0.0)

**Implemented enhancements:**

- Table Merging
- Swift Package Manager Support
- Hyperlinks in texts

**Fixed bugs:**

- External document including empty pages

**Closed issues:**

- #41
- #86
- #148
- #178
- #179
- #182
- #183
- #184
- #185
- #186
- #196
- #197

**Merged pull requests:**

- #181

## [1.6.0](https://github.com/techprimate/TPPDF/tree/1.6.0) (2020-03-23)
[Full Changelog](https://github.com/techprimate/TPPDF/compare/1.5.4...1.6.0)

Expand All @@ -21,6 +53,7 @@
- Added support to embed external PDF document (Issue #31)
- Added clickable URL support for images (Issue #170)
- Added support for NSAttributedString link attributes (Issue #71)
- Added subscript range access to PDFTable and deprecated `PDFTable.setCellStyle`

**Fixed bugs:**

Expand Down

0 comments on commit 1353129

Please sign in to comment.