Skip to content

Commit 6f448c9

Browse files
author
Philip Niedertscheider
authored
Merge pull request #213 from techprimate/release/2.1.1
Release/2.1.1
2 parents eb59331 + ccc3e2a commit 6f448c9

20 files changed

+176
-133
lines changed

‎.travis.yml

+17-31
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
os: osx
2-
osx_image: xcode11.4
2+
osx_image: xcode11.6
33
language: objective-c
44

55
env:
66
global:
7-
- DESTINATION="OS=13.2.2,name=iPhone 11 Pro"
7+
- DESTINATION="OS=13.4,name=iPhone 11 Pro"
88
- WORKSPACE="Example.xcworkspace"
99
- PROJECT="Example.xcodeproj"
1010
- EXAMPLE_SCHEME="Example"
1111

1212
- secure: y71ScxtfYr3/DI0XKjGz8Bmia33QF9vO5euPJJbQ6kD5ADhEFkici/YZWxDkYtEZocKaUHIR4KYrKya2kTwJC630s2wLg974gERcUATZkWxeJdKgpfZ2aZtqYNPPDxozMTFtiT4kaw5HiD0usJUgnWKqf/XsTW+3BpTJA58xqXChcXulibs9FJvPz6ZVxW+dNW3F5xtC3GCOWk3Rofrw8GJXdCfie/CaJUvxaQVm9hOwKn0Akpe6rvFKlMtfYOLL9yclaMAM+Um7uFVZwhCPHtAzXvpOhA2U/n7eXy/fNpoXxi9zf+epD1iiFmxJQfc1ZO6jkUJEksLXdO3pEMnoe205Bm70QMO6l9gyuq6Z2cUcCBrd2wDzfLYBoOqapgachpTQifotXX6rapm5pCDhg0pMCRihH5moFnsE7jqz2Lo4n68cvSa9+Irr97HmvH+GdF++VIVGK4/GJOErwGUx0Nh32BIeV3p4D+MNm918mAEO7a66a1RiTKNAr1xnrAtCl0k4XeZPCp0uQQ0TEVOxi/vecIS3k6mNMJw5W9tE0F7fun8kHdv6EKrzKIBkyDxMsh2Z5zVqE3wRcCuD+7FgrcmYDUXyk+t1o2cMNs7iZkKFQAG69+qXviTXnaD9Mq0LGP1sx+OQpQKzde9CAC+tgj+1fqD41jqr6zHJqaEOxvs=
13+
1314
stages:
1415
- Tests
1516
- Examples
@@ -20,13 +21,10 @@ jobs:
2021
- stage: Tests
2122
name: "Unit Tests"
2223
language: objective-c
23-
cache:
24-
bundler: true
24+
cache: bundler
2525
env:
2626
- TEST_FRAMEWORK_SCHEME="TPPDF-Package"
2727
- PROJECT="TPPDF.xcodeproj"
28-
install:
29-
- bundle install
3028
script:
3129
- swift package resolve
3230
- xcodebuild -project ${PROJECT}
@@ -37,7 +35,7 @@ jobs:
3735
-destination "${DESTINATION}"
3836
-configuration Debug
3937
ONLY_ACTIVE_ARCH=YES
40-
test | bundle exec xcpretty
38+
test | xcpretty && exit ${PIPESTATUS[0]}
4139

4240
after_success:
4341
- slather coverage -t --build-directory ${TRAVIS_BUILD_DIR}/derived_data --verb>
@@ -52,10 +50,8 @@ jobs:
5250
bundler: true
5351
cocoapods: true
5452
podfile: "${ROOT_FOLDER}/Podfile"
55-
install:
56-
- bundle install
57-
- bundle exec pod install --project-directory="${ROOT_FOLDER}"
5853
before_script:
54+
- bundle exec pod install --project-directory="${ROOT_FOLDER}"
5955
- cd "${ROOT_FOLDER}"
6056
script:
6157
- xcodebuild -workspace "$WORKSPACE"
@@ -65,39 +61,33 @@ jobs:
6561
-configuration Debug
6662
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
6763
ONLY_ACTIVE_ARCH=YES
68-
build | bundle exec xcpretty
64+
build | xcpretty && exit ${PIPESTATUS[0]}
6965
- cd ../
7066
- bundle exec pod lib lint --allow-warnings
7167

7268
- stage: Examples
7369
name: "Example iOS - Carthage"
7470
language: objective-c
75-
cache:
76-
bundler: true
71+
if: type != pull_request
7772
env:
7873
- ROOT_FOLDER="Example iOS-Carthage"
79-
before_install:
80-
- brew update
81-
- brew outdated carthage || brew upgrade carthage
8274
before_script:
8375
- cd "${ROOT_FOLDER}"
8476
- echo 'github "techprimate/TPPDF" "'$(git rev-parse HEAD)'"' > Cartfile
85-
- carthage update --platform ios
77+
- carthage update --platform ios --cache-builds
8678
script:
87-
- xcodebuild -workspace "$WORKSPACE"
79+
- xcodebuild -project "$PROJECT"
8880
-scheme "$EXAMPLE_SCHEME"
8981
-sdk iphonesimulator
9082
-destination "$DESTINATION"
9183
-configuration Debug
9284
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
9385
ONLY_ACTIVE_ARCH=YES
94-
build | bundle exec xcpretty
86+
build | xcpretty && exit ${PIPESTATUS[0]}
9587

9688
- stage: Examples
9789
name: "Example iOS - Swift PM"
9890
language: objective-c
99-
cache:
100-
bundler: true
10191
env:
10292
- ROOT_FOLDER="Example iOS-SwiftPM"
10393
script:
@@ -107,7 +97,7 @@ jobs:
10797
-scheme ${EXAMPLE_SCHEME}
10898
-clonedSourcePackagesDirPath .
10999
-derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
110-
-configuration Debug | bundle exec xcpretty
100+
-configuration Debug | xcpretty && exit ${PIPESTATUS[0]}
111101
- xcodebuild -project ${PROJECT}
112102
-scheme ${EXAMPLE_SCHEME}
113103
-clonedSourcePackagesDirPath .
@@ -116,7 +106,7 @@ jobs:
116106
-destination "${DESTINATION}"
117107
-configuration Debug
118108
ONLY_ACTIVE_ARCH=YES
119-
build | bundle exec xcpretty
109+
build | xcpretty && exit ${PIPESTATUS[0]}
120110
- xcodebuild -project ${PROJECT}
121111
-scheme ${TEST_FRAMEWORK_SCHEME}
122112
-clonedSourcePackagesDirPath .
@@ -125,17 +115,13 @@ jobs:
125115
-destination "${DESTINATION}"
126116
-configuration Debug
127117
ONLY_ACTIVE_ARCH=YES
128-
test | bundle exec xcpretty
118+
test | xcpretty && exit ${PIPESTATUS[0]}
129119

130120
- stage: Documentation
131121
name: Generate Documentation
132122
language: objective-c
133-
git.depth: false
134-
if: branch = master
135-
cache:
136-
bundler: true
137-
install:
138-
- bundle install
123+
if: branch = master AND type != pull_request
124+
cache: bundler
139125
script:
140126
- git remote update
141127
- git fetch origin gh-pages:gh-pages --depth 1
@@ -145,5 +131,5 @@ jobs:
145131
- git config user.name "Travis"
146132
- git config user.email "jazzy@travis-ci.com"
147133
- git commit -m "Updated docs for $TRAVIS_TAG"
148-
- git remote add secure-origin https://${GITHUB_TOKEN}@github.com/$TRAVIS_REPO_SLUG.git
134+
- git remote add secure-origin https://${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
149135
- git push secure-origin gh-pages

‎CHANGELOG.md

+14-2
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/2.1.0...HEAD)
4+
[Full Changelog](https://github.com/techprimate/TPPDF/compare/2.1.1...HEAD)
55

66
**Implemented enhancements:**
77

@@ -11,7 +11,19 @@
1111

1212
**Merged pull requests:**
1313

14-
## [2.1.0](https://github.com/techprimate/TPPDF/tree/HEAD) (2020-06-15)
14+
## [2.1.1](https://github.com/techprimate/TPPDF/tree/2.1.1) (2020-06-16)
15+
[Full Changelog](https://github.com/techprimate/TPPDF/compare/2.1.0...2.1.1)
16+
17+
**Implemented enhancements:**
18+
19+
- Added raw representable to `PDFTableCellAlignment`
20+
- Added support for groups inside section columns
21+
22+
**Fixed bugs:**
23+
24+
- Fixed indentations inside sections
25+
26+
## [2.1.0](https://github.com/techprimate/TPPDF/tree/2.1.0) (2020-06-15)
1527
[Full Changelog](https://github.com/techprimate/TPPDF/compare/2.0.1...2.1.0)
1628

1729
**Implemented enhancements:**

‎Example iOS-Carthage/Example.xcodeproj/project.pbxproj

+31-4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
D49855542461FB0B00D54270 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = D49855382461FB0B00D54270 /* Icon.png */; };
4242
D49855562461FB9A00D54270 /* Examples.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855552461FB9A00D54270 /* Examples.swift */; };
4343
D4D28D2323AA1A6D00028D5A /* ExamplesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4D28D2223AA1A6D00028D5A /* ExamplesListViewController.swift */; };
44+
D4FF9A28249A488A006FF2ED /* TPPDF.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4FF9A27249A488A006FF2ED /* TPPDF.framework */; };
4445
/* End PBXBuildFile section */
4546

4647
/* Begin PBXFileReference section */
@@ -80,13 +81,15 @@
8081
D49855382461FB0B00D54270 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
8182
D49855552461FB9A00D54270 /* Examples.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Examples.swift; sourceTree = "<group>"; };
8283
D4D28D2223AA1A6D00028D5A /* ExamplesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExamplesListViewController.swift; sourceTree = "<group>"; };
84+
D4FF9A27249A488A006FF2ED /* TPPDF.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TPPDF.framework; path = Carthage/Build/iOS/TPPDF.framework; sourceTree = SOURCE_ROOT; };
8385
/* End PBXFileReference section */
8486

8587
/* Begin PBXFrameworksBuildPhase section */
8688
607FACCD1AFB9204008FA782 /* Frameworks */ = {
8789
isa = PBXFrameworksBuildPhase;
8890
buildActionMask = 2147483647;
8991
files = (
92+
D4FF9A28249A488A006FF2ED /* TPPDF.framework in Frameworks */,
9093
);
9194
runOnlyForDeploymentPostprocessing = 0;
9295
};
@@ -96,6 +99,7 @@
9699
607FACC71AFB9204008FA782 = {
97100
isa = PBXGroup;
98101
children = (
102+
D4FF9A26249A487B006FF2ED /* Frameworks */,
99103
607FACD21AFB9204008FA782 /* Example */,
100104
607FACD11AFB9204008FA782 /* Products */,
101105
);
@@ -227,6 +231,15 @@
227231
path = "../../Shared iOS/UI";
228232
sourceTree = "<group>";
229233
};
234+
D4FF9A26249A487B006FF2ED /* Frameworks */ = {
235+
isa = PBXGroup;
236+
children = (
237+
D4FF9A27249A488A006FF2ED /* TPPDF.framework */,
238+
);
239+
name = Frameworks;
240+
path = Example;
241+
sourceTree = "<group>";
242+
};
230243
/* End PBXGroup section */
231244

232245
/* Begin PBXNativeTarget section */
@@ -235,9 +248,9 @@
235248
buildConfigurationList = 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "Example" */;
236249
buildPhases = (
237250
607FACCC1AFB9204008FA782 /* Sources */,
238-
D4E6F9A21FA732720049890F /* Swift Lint */,
239251
607FACCD1AFB9204008FA782 /* Frameworks */,
240252
607FACCE1AFB9204008FA782 /* Resources */,
253+
D4FF9A2A249A489C006FF2ED /* Carthage */,
241254
);
242255
buildRules = (
243256
);
@@ -309,19 +322,25 @@
309322
/* End PBXResourcesBuildPhase section */
310323

311324
/* Begin PBXShellScriptBuildPhase section */
312-
D4E6F9A21FA732720049890F /* Swift Lint */ = {
325+
D4FF9A2A249A489C006FF2ED /* Carthage */ = {
313326
isa = PBXShellScriptBuildPhase;
314327
buildActionMask = 2147483647;
315328
files = (
316329
);
330+
inputFileListPaths = (
331+
);
317332
inputPaths = (
333+
"$(SRCROOT)/Carthage/Build/iOS/TPPDF.framework",
334+
);
335+
name = Carthage;
336+
outputFileListPaths = (
318337
);
319-
name = "Swift Lint";
320338
outputPaths = (
339+
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/TPPDF.framework",
321340
);
322341
runOnlyForDeploymentPostprocessing = 0;
323342
shellPath = /bin/sh;
324-
shellScript = "if which swiftlint >/dev/null; then\n \"swiftlint\" --config ../.swiftlint.yml\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
343+
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
325344
};
326345
/* End PBXShellScriptBuildPhase section */
327346

@@ -493,6 +512,10 @@
493512
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
494513
CODE_SIGN_STYLE = Manual;
495514
DEVELOPMENT_TEAM = "";
515+
FRAMEWORK_SEARCH_PATHS = (
516+
"$(inherited)",
517+
"$(PROJECT_DIR)/Carthage/Build/iOS",
518+
);
496519
GCC_WARN_UNUSED_LABEL = YES;
497520
GCC_WARN_UNUSED_PARAMETER = YES;
498521
INFOPLIST_FILE = Example/Info.plist;
@@ -513,6 +536,10 @@
513536
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
514537
CODE_SIGN_STYLE = Manual;
515538
DEVELOPMENT_TEAM = "";
539+
FRAMEWORK_SEARCH_PATHS = (
540+
"$(inherited)",
541+
"$(PROJECT_DIR)/Carthage/Build/iOS",
542+
);
516543
GCC_WARN_UNUSED_LABEL = YES;
517544
GCC_WARN_UNUSED_PARAMETER = YES;
518545
INFOPLIST_FILE = Example/Info.plist;

‎Example iOS-Cocoapods/Example.xcodeproj/project.pbxproj

-15
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@
263263
buildPhases = (
264264
E638F0EEF355F6576E268BF8 /* [CP] Check Pods Manifest.lock */,
265265
607FACCC1AFB9204008FA782 /* Sources */,
266-
D4E6F9A21FA732720049890F /* Swift Lint */,
267266
607FACCD1AFB9204008FA782 /* Frameworks */,
268267
607FACCE1AFB9204008FA782 /* Resources */,
269268
C8B36E6B00AE6F96B71D6C6B /* [CP] Embed Pods Frameworks */,
@@ -352,20 +351,6 @@
352351
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
353352
showEnvVarsInLog = 0;
354353
};
355-
D4E6F9A21FA732720049890F /* Swift Lint */ = {
356-
isa = PBXShellScriptBuildPhase;
357-
buildActionMask = 2147483647;
358-
files = (
359-
);
360-
inputPaths = (
361-
);
362-
name = "Swift Lint";
363-
outputPaths = (
364-
);
365-
runOnlyForDeploymentPostprocessing = 0;
366-
shellPath = /bin/sh;
367-
shellScript = "echo \"info: Looking for SwiftLint in Pods folder: \" ${PODS_ROOT}\n\nif which swiftlint >/dev/null; then\n \"${PODS_ROOT}/SwiftLint/swiftlint\" --config ../.swiftlint.yml\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
368-
};
369354
E638F0EEF355F6576E268BF8 /* [CP] Check Pods Manifest.lock */ = {
370355
isa = PBXShellScriptBuildPhase;
371356
buildActionMask = 2147483647;

‎Example iOS-Cocoapods/Podfile.lock

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
PODS:
2-
- SwiftLint (0.39.2)
3-
- TPPDF (1.6.0):
4-
- SwiftLint
2+
- TPPDF (2.1.0)
53

64
DEPENDENCIES:
75
- TPPDF (from `../`)
86

9-
SPEC REPOS:
10-
trunk:
11-
- SwiftLint
12-
137
EXTERNAL SOURCES:
148
TPPDF:
159
:path: "../"
1610

1711
SPEC CHECKSUMS:
18-
SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447
19-
TPPDF: 0148af2eb1c6b6de1024be58f65bbe70cf7fb2d5
12+
TPPDF: d2b1551bb2a2ece3fca96b35d261bd0e5cdedbf5
2013

2114
PODFILE CHECKSUM: 5dce4fe74396d7a60f8c89b090ddd3e853429276
2215

0 commit comments

Comments
 (0)