Merge pull request #213 from techprimate/release/2.1.1

Release/2.1.1
techprimate · Jun 17, 2020 · 6f448c9 · 6f448c9
2 parents eb59331 + ccc3e2a
commit 6f448c9
Show file tree

Hide file tree

Showing 20 changed files with 176 additions and 133 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,16 @@
 os: osx
-osx_image: xcode11.4
+osx_image: xcode11.6
 language: objective-c
 
 env:
   global:
-  - DESTINATION="OS=13.2.2,name=iPhone 11 Pro"
+  - DESTINATION="OS=13.4,name=iPhone 11 Pro"
   - WORKSPACE="Example.xcworkspace"
   - PROJECT="Example.xcodeproj"
   - EXAMPLE_SCHEME="Example"
 
   - secure: y71ScxtfYr3/DI0XKjGz8Bmia33QF9vO5euPJJbQ6kD5ADhEFkici/YZWxDkYtEZocKaUHIR4KYrKya2kTwJC630s2wLg974gERcUATZkWxeJdKgpfZ2aZtqYNPPDxozMTFtiT4kaw5HiD0usJUgnWKqf/XsTW+3BpTJA58xqXChcXulibs9FJvPz6ZVxW+dNW3F5xtC3GCOWk3Rofrw8GJXdCfie/CaJUvxaQVm9hOwKn0Akpe6rvFKlMtfYOLL9yclaMAM+Um7uFVZwhCPHtAzXvpOhA2U/n7eXy/fNpoXxi9zf+epD1iiFmxJQfc1ZO6jkUJEksLXdO3pEMnoe205Bm70QMO6l9gyuq6Z2cUcCBrd2wDzfLYBoOqapgachpTQifotXX6rapm5pCDhg0pMCRihH5moFnsE7jqz2Lo4n68cvSa9+Irr97HmvH+GdF++VIVGK4/GJOErwGUx0Nh32BIeV3p4D+MNm918mAEO7a66a1RiTKNAr1xnrAtCl0k4XeZPCp0uQQ0TEVOxi/vecIS3k6mNMJw5W9tE0F7fun8kHdv6EKrzKIBkyDxMsh2Z5zVqE3wRcCuD+7FgrcmYDUXyk+t1o2cMNs7iZkKFQAG69+qXviTXnaD9Mq0LGP1sx+OQpQKzde9CAC+tgj+1fqD41jqr6zHJqaEOxvs=
+
 stages:
   - Tests
   - Examples
@@ -20,13 +21,10 @@ jobs:
   - stage: Tests
     name: "Unit Tests"
     language: objective-c
-    cache:
-      bundler: true
+    cache: bundler
     env:
     - TEST_FRAMEWORK_SCHEME="TPPDF-Package"
     - PROJECT="TPPDF.xcodeproj"
-    install:
-    - bundle install
     script:
     - swift package resolve
     - xcodebuild -project ${PROJECT}
@@ -37,7 +35,7 @@ jobs:
                  -destination "${DESTINATION}"
                  -configuration Debug
                  ONLY_ACTIVE_ARCH=YES
-                 test | bundle exec xcpretty
+                 test | xcpretty && exit ${PIPESTATUS[0]}
 
     after_success:
     - slather coverage -t --build-directory ${TRAVIS_BUILD_DIR}/derived_data --verb>
@@ -52,10 +50,8 @@ jobs:
       bundler: true
       cocoapods: true
     podfile: "${ROOT_FOLDER}/Podfile"
-    install:
-    - bundle install
-    - bundle exec pod install --project-directory="${ROOT_FOLDER}"
     before_script:
+    - bundle exec pod install --project-directory="${ROOT_FOLDER}"
     - cd "${ROOT_FOLDER}"
     script:
     - xcodebuild -workspace "$WORKSPACE"
@@ -65,39 +61,33 @@ jobs:
                  -configuration Debug
                  -derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
                  ONLY_ACTIVE_ARCH=YES
-                 build | bundle exec xcpretty
+                 build | xcpretty  && exit ${PIPESTATUS[0]}
     - cd ../
     - bundle exec pod lib lint --allow-warnings
 
   - stage: Examples
     name: "Example iOS - Carthage"
     language: objective-c
-    cache:
-      bundler: true
+    if: type != pull_request
     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
+    - carthage update --platform ios --cache-builds
     script:
-    - xcodebuild -workspace "$WORKSPACE"
+    - xcodebuild -project "$PROJECT"
                  -scheme "$EXAMPLE_SCHEME"
                  -sdk iphonesimulator
                  -destination "$DESTINATION"
                  -configuration Debug
                  -derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
                  ONLY_ACTIVE_ARCH=YES
-                 build | bundle exec xcpretty
+                 build | xcpretty  && exit ${PIPESTATUS[0]}
 
   - stage: Examples
     name: "Example iOS - Swift PM"
     language: objective-c
-    cache:
-      bundler: true
     env:
     - ROOT_FOLDER="Example iOS-SwiftPM"
     script:
@@ -107,7 +97,7 @@ jobs:
                  -scheme ${EXAMPLE_SCHEME}
                  -clonedSourcePackagesDirPath .
                  -derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
-                 -configuration Debug | bundle exec xcpretty
+                 -configuration Debug | xcpretty && exit ${PIPESTATUS[0]}
     - xcodebuild -project ${PROJECT}
                  -scheme ${EXAMPLE_SCHEME}
                  -clonedSourcePackagesDirPath .
@@ -116,7 +106,7 @@ jobs:
                  -destination "${DESTINATION}"
                  -configuration Debug
                  ONLY_ACTIVE_ARCH=YES
-                 build | bundle exec xcpretty
+                 build | xcpretty  && exit ${PIPESTATUS[0]}
     - xcodebuild -project ${PROJECT}
                  -scheme ${TEST_FRAMEWORK_SCHEME}
                  -clonedSourcePackagesDirPath .
@@ -125,17 +115,13 @@ jobs:
                  -destination "${DESTINATION}"
                  -configuration Debug
                  ONLY_ACTIVE_ARCH=YES
-                 test | bundle exec xcpretty
+                 test | xcpretty && exit ${PIPESTATUS[0]}
 
   - stage: Documentation
     name: Generate Documentation
     language: objective-c
-    git.depth: false
-    if: branch = master
-    cache:
-      bundler: true
-    install:
-    - bundle install
+    if: branch = master AND type != pull_request
+    cache: bundler
     script:
     - git remote update
     - git fetch origin gh-pages:gh-pages --depth 1
@@ -145,5 +131,5 @@ jobs:
     - git config user.name  "Travis"
     - git config user.email "jazzy@travis-ci.com"
     - git commit -m "Updated docs for $TRAVIS_TAG"
-    - git remote add secure-origin https://${GITHUB_TOKEN}@github.com/$TRAVIS_REPO_SLUG.git
+    - git remote add secure-origin https://${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
     - git push secure-origin gh-pages
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Change Log
 
 ## [Unreleased](https://github.com/techprimate/TPPDF/tree/HEAD) (2020-??-??)
-[Full Changelog](https://github.com/techprimate/TPPDF/compare/2.1.0...HEAD)
+[Full Changelog](https://github.com/techprimate/TPPDF/compare/2.1.1...HEAD)
 
 **Implemented enhancements:**
 
@@ -11,7 +11,19 @@
 
 **Merged pull requests:**
 
-## [2.1.0](https://github.com/techprimate/TPPDF/tree/HEAD) (2020-06-15)
+## [2.1.1](https://github.com/techprimate/TPPDF/tree/2.1.1) (2020-06-16)
+[Full Changelog](https://github.com/techprimate/TPPDF/compare/2.1.0...2.1.1)
+
+**Implemented enhancements:**
+
+- Added raw representable to `PDFTableCellAlignment`
+- Added support for groups inside section columns
+
+**Fixed bugs:**
+
+- Fixed indentations inside sections
+
+## [2.1.0](https://github.com/techprimate/TPPDF/tree/2.1.0) (2020-06-15)
 [Full Changelog](https://github.com/techprimate/TPPDF/compare/2.0.1...2.1.0)
 
 **Implemented enhancements:**

diff --git a/Example iOS-Carthage/Example.xcodeproj/project.pbxproj b/Example iOS-Carthage/Example.xcodeproj/project.pbxproj
@@ -41,6 +41,7 @@
 		D49855542461FB0B00D54270 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = D49855382461FB0B00D54270 /* Icon.png */; };
 		D49855562461FB9A00D54270 /* Examples.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855552461FB9A00D54270 /* Examples.swift */; };
 		D4D28D2323AA1A6D00028D5A /* ExamplesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4D28D2223AA1A6D00028D5A /* ExamplesListViewController.swift */; };
+		D4FF9A28249A488A006FF2ED /* TPPDF.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4FF9A27249A488A006FF2ED /* TPPDF.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -80,13 +81,15 @@
 		D49855382461FB0B00D54270 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
 		D49855552461FB9A00D54270 /* Examples.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Examples.swift; sourceTree = "<group>"; };
 		D4D28D2223AA1A6D00028D5A /* ExamplesListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExamplesListViewController.swift; sourceTree = "<group>"; };
+		D4FF9A27249A488A006FF2ED /* TPPDF.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TPPDF.framework; path = Carthage/Build/iOS/TPPDF.framework; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		607FACCD1AFB9204008FA782 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D4FF9A28249A488A006FF2ED /* TPPDF.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -96,6 +99,7 @@
 		607FACC71AFB9204008FA782 = {
 			isa = PBXGroup;
 			children = (
+				D4FF9A26249A487B006FF2ED /* Frameworks */,
 				607FACD21AFB9204008FA782 /* Example */,
 				607FACD11AFB9204008FA782 /* Products */,
 			);
@@ -227,6 +231,15 @@
 			path = "../../Shared iOS/UI";
 			sourceTree = "<group>";
 		};
+		D4FF9A26249A487B006FF2ED /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				D4FF9A27249A488A006FF2ED /* TPPDF.framework */,
+			);
+			name = Frameworks;
+			path = Example;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -235,9 +248,9 @@
 			buildConfigurationList = 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "Example" */;
 			buildPhases = (
 				607FACCC1AFB9204008FA782 /* Sources */,
-				D4E6F9A21FA732720049890F /* Swift Lint */,
 				607FACCD1AFB9204008FA782 /* Frameworks */,
 				607FACCE1AFB9204008FA782 /* Resources */,
+				D4FF9A2A249A489C006FF2ED /* Carthage */,
 			);
 			buildRules = (
 			);
@@ -309,19 +322,25 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		D4E6F9A21FA732720049890F /* Swift Lint */ = {
+		D4FF9A2A249A489C006FF2ED /* Carthage */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
+				"$(SRCROOT)/Carthage/Build/iOS/TPPDF.framework",
+			);
+			name = Carthage;
+			outputFileListPaths = (
 			);
-			name = "Swift Lint";
 			outputPaths = (
+				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/TPPDF.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			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";
+			shellScript = "/usr/local/bin/carthage copy-frameworks\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -493,6 +512,10 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_PARAMETER = YES;
 				INFOPLIST_FILE = Example/Info.plist;
@@ -513,6 +536,10 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_PARAMETER = YES;
 				INFOPLIST_FILE = Example/Info.plist;

diff --git a/Example iOS-Cocoapods/Example.xcodeproj/project.pbxproj b/Example iOS-Cocoapods/Example.xcodeproj/project.pbxproj
@@ -263,7 +263,6 @@
 			buildPhases = (
 				E638F0EEF355F6576E268BF8 /* [CP] Check Pods Manifest.lock */,
 				607FACCC1AFB9204008FA782 /* Sources */,
-				D4E6F9A21FA732720049890F /* Swift Lint */,
 				607FACCD1AFB9204008FA782 /* Frameworks */,
 				607FACCE1AFB9204008FA782 /* Resources */,
 				C8B36E6B00AE6F96B71D6C6B /* [CP] Embed Pods Frameworks */,
@@ -352,20 +351,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D4E6F9A21FA732720049890F /* Swift Lint */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Swift Lint";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			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";
-		};
 		E638F0EEF355F6576E268BF8 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/Example iOS-Cocoapods/Podfile.lock b/Example iOS-Cocoapods/Podfile.lock
@@ -1,22 +1,15 @@
 PODS:
-  - SwiftLint (0.39.2)
-  - TPPDF (1.6.0):
-    - SwiftLint
+  - TPPDF (2.1.0)
 
 DEPENDENCIES:
   - TPPDF (from `../`)
 
-SPEC REPOS:
-  trunk:
-    - SwiftLint
-
 EXTERNAL SOURCES:
   TPPDF:
     :path: "../"
 
 SPEC CHECKSUMS:
-  SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447
-  TPPDF: 0148af2eb1c6b6de1024be58f65bbe70cf7fb2d5
+  TPPDF: d2b1551bb2a2ece3fca96b35d261bd0e5cdedbf5
 
 PODFILE CHECKSUM: 5dce4fe74396d7a60f8c89b090ddd3e853429276