Skip to content

Commit 1353129

Browse files
author
Philip Niedertscheider
authored
Merge pull request #200 from techprimate/release/2.0
Release of 2.0
2 parents 97cd68d + eb8da5c commit 1353129

File tree

509 files changed

+46008
-14422
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

509 files changed

+46008
-14422
lines changed

‎.gitignore

+18-9
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,27 @@ playground.xcworkspace
3434

3535
# Swift Package Manager
3636
.build/
37+
Example*/ManifestLoading
38+
Example*/checkouts
39+
Example*/dependencies-state.json
40+
Example*/manifest.db
41+
Exampl*/repositories
3742

3843
# Carthage
39-
Carthage/Build
40-
derived_data
44+
Example*/Carthage
45+
Example*/derived_data
46+
Example*/Cartfile.resolved
4147

4248
# Cocoapods
43-
Example/Pods/Local Podspecs
44-
Example/Pods/Nimble
45-
Example/Pods/Quick
46-
Example/Pods/Swiftlint
49+
Example*/Pods
50+
Example*/Pods/Local Podspecs
51+
Example*/Pods/Nimble
52+
Example*/Pods/Quick
53+
Example*/Pods/Swiftlint
54+
55+
# Swift Package Manager
56+
.swiftpm
4757

4858
# Xcode Schemes, so Carthage doesn't complain
49-
!Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/TPPDF.xcscheme
50-
!Example/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF-Example.xcscheme
51-
!Example/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF_Tests.xcscheme
59+
!Example iOS/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF.xcscheme
60+
!Example iOS/TPPDF.xcodeproj/xcsharedata/xcschemes/TPPDF-Example.xcscheme

‎.jazzy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
author: Philip Niedertscheider
2-
author_url: https://www.github.com/techprimate-phil
2+
author_url: https://www.github.com/philprime
33
github_url: https://www.github.com/techprimate/TPPDF
44
root_url: https://techprimate.github.io/TPPDF/
55
module: TPPDF
66
output: docs
77
theme: fullwidth
8-
xcodebuild_arguments: [-workspace, 'Example/TPPDF.xcworkspace', -scheme, 'TPPDF-Example']
8+
xcodebuild_arguments: [-project, 'Example iOS-SwiftPM/Example.xcodeproj', -scheme, 'Example', -sdk, 'iphonesimulator']

‎.slather.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
coverage_service: cobertura_xml
2-
xcodeproj: Example/TPPDF.xcodeproj
3-
scheme: TPPDF-Example
4-
workspace: Example/TPPDF.xcworkspace
2+
xcodeproj: TPPDF.xcodeproj
3+
scheme: TPPDF-Package
54
source_directory: Source
65
configuration: Debug
7-
binary_basename: TPPDF
6+
binary_basename: TPPDF

‎.travis.yml

+119-28
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,126 @@
11
os: osx
2-
osx_image: xcode11.2
2+
osx_image: xcode11.4
33
language: objective-c
4-
cache:
5-
bundler: true
6-
cocoapods: true
7-
podfile: Example/Podfile
8-
notifications:
9-
slack:
10-
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=
4+
115
env:
126
global:
13-
- WORKSPACE=Example/TPPDF.xcworkspace
14-
- PROJECT=Example/TPPDF.xcodeproj
15-
- TEST_FRAMEWORK_SCHEME="TPPDF-Example"
16-
- EXAMPLE_SCHEME="TPPDF-Example"
17-
- SOURCE_FOLDER="Source"
18-
matrix:
197
- DESTINATION="OS=13.2.2,name=iPhone 11 Pro"
20-
install:
21-
- bundle install
22-
- bundle exec pod repo update
23-
- bundle exec pod install --project-directory=Example
24-
script:
25-
- set -o pipefail
26-
- xcodebuild -version
27-
- xcodebuild -showsdks
28-
- xcodebuild -list
29-
- 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
30-
- xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk iphonesimulator -destination "$DESTINATION" -configuration Debug -derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data ONLY_ACTIVE_ARCH=YES build | xcpretty
31-
- pod lib lint --allow-warnings
8+
- WORKSPACE="Example.xcworkspace"
9+
- PROJECT="Example.xcodeproj"
10+
- EXAMPLE_SCHEME="Example"
11+
12+
stages:
13+
- Tests
14+
- Examples
15+
16+
jobs:
17+
include:
18+
- stage: Tests
19+
name: "Unit Tests"
20+
language: objective-c
21+
cache:
22+
bundler: true
23+
env:
24+
- TEST_FRAMEWORK_SCHEME="TPPDF-Package"
25+
- PROJECT="TPPDF.xcodeproj"
26+
install:
27+
- bundle install
28+
script:
29+
- swift package resolve
30+
- xcodebuild -project ${PROJECT}
31+
-scheme ${TEST_FRAMEWORK_SCHEME}
32+
-clonedSourcePackagesDirPath .
33+
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
34+
-sdk iphonesimulator
35+
-destination "${DESTINATION}"
36+
-configuration Debug
37+
ONLY_ACTIVE_ARCH=YES
38+
test | bundle exec xcpretty
39+
40+
- stage: Examples
41+
name: "Example iOS - Cocoapods"
42+
language: objective-c
43+
env:
44+
- ROOT_FOLDER="Example iOS-Cocoapods"
45+
cache:
46+
bundler: true
47+
cocoapods: true
48+
podfile: "${ROOT_FOLDER}/Podfile"
49+
install:
50+
- bundle install
51+
- bundle exec pod install --project-directory="${ROOT_FOLDER}"
52+
before_script:
53+
- cd "${ROOT_FOLDER}"
54+
script:
55+
- xcodebuild -workspace "$WORKSPACE"
56+
-scheme "$EXAMPLE_SCHEME"
57+
-sdk iphonesimulator
58+
-destination "$DESTINATION"
59+
-configuration Debug
60+
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
61+
ONLY_ACTIVE_ARCH=YES
62+
build | bundle exec xcpretty
63+
- cd ../
64+
- bundle exec pod lib lint --allow-warnings
65+
66+
- stage: Examples
67+
name: "Example iOS - Carthage"
68+
language: objective-c
69+
cache:
70+
bundler: true
71+
env:
72+
- ROOT_FOLDER="Example iOS-Carthage"
73+
before_install:
74+
- brew update
75+
- brew outdated carthage || brew upgrade carthage
76+
before_script:
77+
- cd "${ROOT_FOLDER}"
78+
- echo 'github "techprimate/TPPDF" "'$(git rev-parse HEAD)'"' > Cartfile
79+
- carthage update --platform ios
80+
script:
81+
- xcodebuild -workspace "$WORKSPACE"
82+
-scheme "$EXAMPLE_SCHEME"
83+
-sdk iphonesimulator
84+
-destination "$DESTINATION"
85+
-configuration Debug
86+
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
87+
ONLY_ACTIVE_ARCH=YES
88+
build | bundle exec xcpretty
89+
90+
- stage: Examples
91+
name: "Example iOS - Swift PM"
92+
language: objective-c
93+
cache:
94+
bundler: true
95+
env:
96+
- ROOT_FOLDER="Example iOS-SwiftPM"
97+
script:
98+
- cd "${ROOT_FOLDER}"
99+
- xcodebuild -resolvePackageDependencies
100+
-project ${PROJECT}
101+
-scheme ${EXAMPLE_SCHEME}
102+
-clonedSourcePackagesDirPath .
103+
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
104+
-configuration Debug | bundle exec xcpretty
105+
- xcodebuild -project ${PROJECT}
106+
-scheme ${EXAMPLE_SCHEME}
107+
-clonedSourcePackagesDirPath .
108+
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
109+
-sdk iphonesimulator
110+
-destination "${DESTINATION}"
111+
-configuration Debug
112+
ONLY_ACTIVE_ARCH=YES
113+
build | bundle exec xcpretty
114+
- xcodebuild -project ${PROJECT}
115+
-scheme ${TEST_FRAMEWORK_SCHEME}
116+
-clonedSourcePackagesDirPath .
117+
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
118+
-sdk iphonesimulator
119+
-destination "${DESTINATION}"
120+
-configuration Debug
121+
ONLY_ACTIVE_ARCH=YES
122+
test | bundle exec xcpretty
123+
32124
after_success:
33125
- slather coverage -t --build-directory ${TRAVIS_BUILD_DIR}/derived_data --verbose
34-
- bash <(curl -s https://codecov.io/bash) -f cobertura.xml -X coveragepy -X gcov -X
35-
xcode
126+
- bash <(curl -s https://codecov.io/bash) -f cobertura.xml -X coveragepy -X gcov -X xcode

‎CHANGELOG.md

+34-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Change Log
22

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

66
**Implemented enhancements:**
77

@@ -11,6 +11,38 @@
1111

1212
**Merged pull requests:**
1313

14+
## [Unreleased](https://github.com/techprimate/TPPDF/tree/HEAD) (2020-??-??)
15+
[Full Changelog](https://github.com/techprimate/TPPDF/compare/1.6.0...2.0.0)
16+
17+
**Implemented enhancements:**
18+
19+
- Table Merging
20+
- Swift Package Manager Support
21+
- Hyperlinks in texts
22+
23+
**Fixed bugs:**
24+
25+
- External document including empty pages
26+
27+
**Closed issues:**
28+
29+
- #41
30+
- #86
31+
- #148
32+
- #178
33+
- #179
34+
- #182
35+
- #183
36+
- #184
37+
- #185
38+
- #186
39+
- #196
40+
- #197
41+
42+
**Merged pull requests:**
43+
44+
- #181
45+
1446
## [1.6.0](https://github.com/techprimate/TPPDF/tree/1.6.0) (2020-03-23)
1547
[Full Changelog](https://github.com/techprimate/TPPDF/compare/1.5.4...1.6.0)
1648

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

2558
**Fixed bugs:**
2659

0 commit comments

Comments
 (0)