From 6c4c59814c436d437c7f499503c8397b98f0f44d Mon Sep 17 00:00:00 2001 From: Laura Skelton Date: Mon, 5 Oct 2015 18:05:41 -0700 Subject: [PATCH 1/9] Target iOS8 --- FiltersExample/FastttCameraDemo.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/FiltersExample/FastttCameraDemo.xcodeproj/project.pbxproj b/FiltersExample/FastttCameraDemo.xcodeproj/project.pbxproj index f2d5764..8c061e8 100644 --- a/FiltersExample/FastttCameraDemo.xcodeproj/project.pbxproj +++ b/FiltersExample/FastttCameraDemo.xcodeproj/project.pbxproj @@ -503,6 +503,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = FastttCameraDemo/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -514,6 +515,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = FastttCameraDemo/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; }; From 023eead1b01c86f2c936a0826cbc345d39fd7e52 Mon Sep 17 00:00:00 2001 From: Laura Skelton Date: Mon, 5 Oct 2015 18:07:03 -0700 Subject: [PATCH 2/9] Use correct preview orientation if fixed interface --- FastttCamera/Filters/FastttFilterCamera.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/FastttCamera/Filters/FastttFilterCamera.m b/FastttCamera/Filters/FastttFilterCamera.m index 4c5a5fb..7c8a468 100644 --- a/FastttCamera/Filters/FastttFilterCamera.m +++ b/FastttCamera/Filters/FastttFilterCamera.m @@ -635,6 +635,11 @@ - (void)_setPreviewVideoOrientation || orientation == UIDeviceOrientationFaceDown) { orientation = UIDeviceOrientationPortrait; } + + if (!self.interfaceRotatesWithOrientation) { + orientation = self.fixedInterfaceOrientation; + } + _stillCamera.outputImageOrientation = (UIInterfaceOrientation)orientation; } From 0c04ffa5f5df3fb09f5683d6723353ab87d91d30 Mon Sep 17 00:00:00 2001 From: Laura Skelton Date: Mon, 5 Oct 2015 18:10:10 -0700 Subject: [PATCH 3/9] Fix simulator destination --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6c45d24..6ba5f17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ podfile: FiltersExample/Podfile env: - LC_CTYPE=en_US.UTF-8 LANG=en_US.UTF-8 script: -- set -o pipefail && xcodebuild -workspace FiltersExample/FastttCameraDemo.xcworkspace -scheme FastttCameraDemo -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6 Plus" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test | xcpretty -c +- set -o pipefail && xcodebuild -workspace FiltersExample/FastttCameraDemo.xcworkspace -scheme FastttCameraDemo -sdk iphonesimulator -destination "platform=iOS Simulator,OS=9.0,name=iPhone 5s" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test | xcpretty -c - pod lib lint --quick - obcd --path FastttCamera find HeaderStyle after_success: slather From 954c186d3ef64699698bda66342870e1ca0c393c Mon Sep 17 00:00:00 2001 From: Laura Skelton Date: Mon, 5 Oct 2015 18:21:43 -0700 Subject: [PATCH 4/9] Bump to 0.3.4 --- FastttCamera.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FastttCamera.podspec b/FastttCamera.podspec index e7926aa..1b4a8f2 100644 --- a/FastttCamera.podspec +++ b/FastttCamera.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "FastttCamera" - s.version = "0.3.3" + s.version = "0.3.4" s.summary = "A fast, straightforward implementation of AVFoundation camera with customizable real-time photo filters." s.homepage = "https://github.com/IFTTT/FastttCamera" s.license = 'MIT' From b9b00f27dfd90fafd2021ca0c1a244044a4d236a Mon Sep 17 00:00:00 2001 From: Laura Skelton Date: Mon, 5 Oct 2015 18:25:42 -0700 Subject: [PATCH 5/9] Update pods --- Example/Podfile.lock | 12 ++++++------ FiltersExample/Podfile.lock | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 100849b..e40ef81 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -3,12 +3,12 @@ PODS: - Expecta+Snapshots (2.0.0): - Expecta (~> 1.0) - FBSnapshotTestCase/Core (~> 2.0.3) - - FastttCamera (0.3.3): - - FastttCamera/Default (= 0.3.3) - - FastttCamera/Default (0.3.3) + - FastttCamera (0.3.4): + - FastttCamera/Default (= 0.3.4) + - FastttCamera/Default (0.3.4) - FBSnapshotTestCase/Core (2.0.4) - Masonry (0.6.1) - - OCMock (3.1.5) + - OCMock (3.2) - Specta (1.0.4) DEPENDENCIES: @@ -26,10 +26,10 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Expecta: 9d1bff6c8b0eeee73a166a2ee898892478927a15 Expecta+Snapshots: 29b38dd695bc72a0ed2bea833937d78df41943ba - FastttCamera: 59d134f763f3a257014e6c6eb3e33eb03dc49ec1 + FastttCamera: 51f16712cbd5bdb08bc6231b957325c6be5e478d FBSnapshotTestCase: d94cf34841c9e77390e29009e8e2713479d48753 Masonry: 4972309f2f134de9dd312f4dc4a21359b50e6caa - OCMock: 4c2925291f80407c3738dd1db14d21d0cc278864 + OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb Specta: 69bb134672aae190a1379ff91df07dad8dd1f869 COCOAPODS: 0.38.2 diff --git a/FiltersExample/Podfile.lock b/FiltersExample/Podfile.lock index a748e8d..e12f92f 100644 --- a/FiltersExample/Podfile.lock +++ b/FiltersExample/Podfile.lock @@ -3,14 +3,14 @@ PODS: - Expecta+Snapshots (2.0.0): - Expecta (~> 1.0) - FBSnapshotTestCase/Core (~> 2.0.3) - - FastttCamera/Default (0.3.3) - - FastttCamera/Filters (0.3.3): + - FastttCamera/Default (0.3.4) + - FastttCamera/Filters (0.3.4): - FastttCamera/Default - GPUImage (~> 0.1.0) - FBSnapshotTestCase/Core (2.0.4) - GPUImage (0.1.7) - Masonry (0.6.1) - - OCMock (3.1.5) + - OCMock (3.2) - Specta (1.0.4) DEPENDENCIES: @@ -28,11 +28,11 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Expecta: 9d1bff6c8b0eeee73a166a2ee898892478927a15 Expecta+Snapshots: 29b38dd695bc72a0ed2bea833937d78df41943ba - FastttCamera: 59d134f763f3a257014e6c6eb3e33eb03dc49ec1 + FastttCamera: 51f16712cbd5bdb08bc6231b957325c6be5e478d FBSnapshotTestCase: d94cf34841c9e77390e29009e8e2713479d48753 GPUImage: 733a5f0fab92df9de1c37ba9df520a833ccb406d Masonry: 4972309f2f134de9dd312f4dc4a21359b50e6caa - OCMock: 4c2925291f80407c3738dd1db14d21d0cc278864 + OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb Specta: 69bb134672aae190a1379ff91df07dad8dd1f869 COCOAPODS: 0.38.2 From 7f195b9d5fa1724893e2b126fb2d765656a475a1 Mon Sep 17 00:00:00 2001 From: Laura Skelton Date: Mon, 5 Oct 2015 18:27:45 -0700 Subject: [PATCH 6/9] Add pod version number --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2f9189f..80c3d8c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![FastttCamera Logo](./Docs/fastttcamera_banner.jpg) -[![Build Status](https://travis-ci.org/IFTTT/FastttCamera.svg?branch=master)](https://travis-ci.org/IFTTT/FastttCamera) [![Coverage Status](https://coveralls.io/repos/IFTTT/FastttCamera/badge.svg)](https://coveralls.io/r/IFTTT/FastttCamera) +[![CocoaPods Version](https://img.shields.io/cocoapods/v/FastttCamera.svg)](http://cocoadocs.org/docsets/FastttCamera) [![Build Status](https://travis-ci.org/IFTTT/FastttCamera.svg?branch=master)](https://travis-ci.org/IFTTT/FastttCamera) [![Coverage Status](https://coveralls.io/repos/IFTTT/FastttCamera/badge.svg)](https://coveralls.io/r/IFTTT/FastttCamera) `FastttCamera` is a wrapper around `AVFoundation` that allows you to build your own powerful custom camera app without all the headaches of using `AVFoundation` directly. From e22e0b8e398f49909b1981b462476fdfb82a481e Mon Sep 17 00:00:00 2001 From: Max Meyers Date: Thu, 26 May 2016 17:14:57 -0700 Subject: [PATCH 7/9] Update Podfile to support CocoaPods 1.0. --- .../FastttCamera.xcodeproj/project.pbxproj | 110 +++++++++++------- Example/Podfile | 17 ++- Example/Podfile.lock | 6 +- 3 files changed, 83 insertions(+), 50 deletions(-) diff --git a/Example/FastttCamera.xcodeproj/project.pbxproj b/Example/FastttCamera.xcodeproj/project.pbxproj index 616a7d2..759e608 100644 --- a/Example/FastttCamera.xcodeproj/project.pbxproj +++ b/Example/FastttCamera.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - 51862F434E7883F39F12B059 /* libPods-FastttCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DFFC49FDE42DF3F0DC25CCE /* libPods-FastttCamera.a */; }; - 86A312B9D5A7F65E2C40BAC6 /* libPods-FastttCameraTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 681900DCC8097FD462E46556 /* libPods-FastttCameraTests.a */; }; + 4C919A752452D6B889592318 /* libPods-FastttCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D67EFF1504E0A50EB57D1275 /* libPods-FastttCamera.a */; }; + DC0A33DB4A0EE2F1F41FA5B0 /* libPods-FastttCamera-FastttCameraTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F9AB7CE82B7818B5AD9623F /* libPods-FastttCamera-FastttCameraTests.a */; }; FA1916571AA68D1F00C51681 /* FastttFocusSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = FA1916561AA68D1F00C51681 /* FastttFocusSpec.m */; }; FA1916591AA68D3C00C51681 /* UIViewControllerFastttCameraSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = FA1916581AA68D3C00C51681 /* UIViewControllerFastttCameraSpec.m */; }; FA28C5441A9BB488009DBB83 /* FastttCameraTest.png in Resources */ = {isa = PBXBuildFile; fileRef = FA28C5411A9BB488009DBB83 /* FastttCameraTest.png */; }; @@ -42,12 +42,12 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 0DFFC49FDE42DF3F0DC25CCE /* libPods-FastttCamera.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FastttCamera.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 48AF9CCB180708078DE6E516 /* Pods-FastttCameraTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCameraTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCameraTests/Pods-FastttCameraTests.debug.xcconfig"; sourceTree = ""; }; - 5141270C1ECE47804F132180 /* Pods-FastttCameraTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCameraTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCameraTests/Pods-FastttCameraTests.release.xcconfig"; sourceTree = ""; }; - 681900DCC8097FD462E46556 /* libPods-FastttCameraTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FastttCameraTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 78E1CD45A5522076D78AA110 /* Pods-FastttCamera.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCamera.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCamera/Pods-FastttCamera.debug.xcconfig"; sourceTree = ""; }; - 9E06B3209BE8DAEF88292AE7 /* Pods-FastttCamera.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCamera.release.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCamera/Pods-FastttCamera.release.xcconfig"; sourceTree = ""; }; + 027C9048D236E26032130398 /* Pods-FastttCamera.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCamera.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCamera/Pods-FastttCamera.debug.xcconfig"; sourceTree = ""; }; + 6F9AB7CE82B7818B5AD9623F /* libPods-FastttCamera-FastttCameraTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FastttCamera-FastttCameraTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B34120259D718FF104495E4E /* Pods-FastttCamera-FastttCameraTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCamera-FastttCameraTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCamera-FastttCameraTests/Pods-FastttCamera-FastttCameraTests.release.xcconfig"; sourceTree = ""; }; + B382500DAE4F9FCE2C3784FD /* Pods-FastttCamera.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCamera.release.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCamera/Pods-FastttCamera.release.xcconfig"; sourceTree = ""; }; + D67EFF1504E0A50EB57D1275 /* libPods-FastttCamera.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FastttCamera.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + E067B6C029ECAA7B4C5AE191 /* Pods-FastttCamera-FastttCameraTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCamera-FastttCameraTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCamera-FastttCameraTests/Pods-FastttCamera-FastttCameraTests.debug.xcconfig"; sourceTree = ""; }; FA1916561AA68D1F00C51681 /* FastttFocusSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FastttFocusSpec.m; sourceTree = ""; }; FA1916581AA68D3C00C51681 /* UIViewControllerFastttCameraSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIViewControllerFastttCameraSpec.m; sourceTree = ""; }; FA28C5411A9BB488009DBB83 /* FastttCameraTest.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = FastttCameraTest.png; sourceTree = ""; }; @@ -85,7 +85,7 @@ buildActionMask = 2147483647; files = ( FA574BD21A8991270061849B /* Accelerate.framework in Frameworks */, - 51862F434E7883F39F12B059 /* libPods-FastttCamera.a in Frameworks */, + 4C919A752452D6B889592318 /* libPods-FastttCamera.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -93,32 +93,32 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 86A312B9D5A7F65E2C40BAC6 /* libPods-FastttCameraTests.a in Frameworks */, + DC0A33DB4A0EE2F1F41FA5B0 /* libPods-FastttCamera-FastttCameraTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0839C141103D606E86EDEFE0 /* Pods */ = { + 4B6C9BACA635F1867D2C649C /* Frameworks */ = { isa = PBXGroup; children = ( - 78E1CD45A5522076D78AA110 /* Pods-FastttCamera.debug.xcconfig */, - 9E06B3209BE8DAEF88292AE7 /* Pods-FastttCamera.release.xcconfig */, - 48AF9CCB180708078DE6E516 /* Pods-FastttCameraTests.debug.xcconfig */, - 5141270C1ECE47804F132180 /* Pods-FastttCameraTests.release.xcconfig */, + FA574BD11A8991270061849B /* Accelerate.framework */, + D67EFF1504E0A50EB57D1275 /* libPods-FastttCamera.a */, + 6F9AB7CE82B7818B5AD9623F /* libPods-FastttCamera-FastttCameraTests.a */, ); - name = Pods; + name = Frameworks; sourceTree = ""; }; - 4B6C9BACA635F1867D2C649C /* Frameworks */ = { + A440DF1F3DF4372C8BEB1822 /* Pods */ = { isa = PBXGroup; children = ( - FA574BD11A8991270061849B /* Accelerate.framework */, - 0DFFC49FDE42DF3F0DC25CCE /* libPods-FastttCamera.a */, - 681900DCC8097FD462E46556 /* libPods-FastttCameraTests.a */, + 027C9048D236E26032130398 /* Pods-FastttCamera.debug.xcconfig */, + B382500DAE4F9FCE2C3784FD /* Pods-FastttCamera.release.xcconfig */, + E067B6C029ECAA7B4C5AE191 /* Pods-FastttCamera-FastttCameraTests.debug.xcconfig */, + B34120259D718FF104495E4E /* Pods-FastttCamera-FastttCameraTests.release.xcconfig */, ); - name = Frameworks; + name = Pods; sourceTree = ""; }; FA28C5401A9BB488009DBB83 /* Test Images */ = { @@ -138,8 +138,8 @@ FAC389951A8928440005EFDD /* Example */, FAC389AF1A8928440005EFDD /* FastttCameraTests */, FAC389941A8928440005EFDD /* Products */, - 0839C141103D606E86EDEFE0 /* Pods */, 4B6C9BACA635F1867D2C649C /* Frameworks */, + A440DF1F3DF4372C8BEB1822 /* Pods */, ); sourceTree = ""; }; @@ -212,11 +212,12 @@ isa = PBXNativeTarget; buildConfigurationList = FAC389B61A8928440005EFDD /* Build configuration list for PBXNativeTarget "FastttCamera" */; buildPhases = ( - FE4976FB8F98C95B28CCECC1 /* Check Pods Manifest.lock */, + A523EB39C390B0E416B33C5E /* 📦 Check Pods Manifest.lock */, FAC3898F1A8928440005EFDD /* Sources */, FAC389901A8928440005EFDD /* Frameworks */, FAC389911A8928440005EFDD /* Resources */, - 1168D0FD6A65C88D5D995162 /* Copy Pods Resources */, + 6DDD63F078028E0F3152F696 /* 📦 Embed Pods Frameworks */, + 0C722632AE5B4ADF4323027F /* 📦 Copy Pods Resources */, ); buildRules = ( ); @@ -231,11 +232,12 @@ isa = PBXNativeTarget; buildConfigurationList = FAC389B91A8928440005EFDD /* Build configuration list for PBXNativeTarget "FastttCameraTests" */; buildPhases = ( - 6758E4F8109EFADAED29F515 /* Check Pods Manifest.lock */, + 85418A2F1F4A10F69A7359CF /* 📦 Check Pods Manifest.lock */, FAC389A81A8928440005EFDD /* Sources */, FAC389A91A8928440005EFDD /* Frameworks */, FAC389AA1A8928440005EFDD /* Resources */, - 1EFFADC47AB10325E84178B2 /* Copy Pods Resources */, + 48EDCB104F0C53B3DD9BD263 /* 📦 Embed Pods Frameworks */, + A658D0FD67F6FCC2199E491E /* 📦 Copy Pods Resources */, ); buildRules = ( ); @@ -307,14 +309,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1168D0FD6A65C88D5D995162 /* Copy Pods Resources */ = { + 0C722632AE5B4ADF4323027F /* 📦 Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "📦 Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -322,29 +324,44 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FastttCamera/Pods-FastttCamera-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 1EFFADC47AB10325E84178B2 /* Copy Pods Resources */ = { + 48EDCB104F0C53B3DD9BD263 /* 📦 Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "📦 Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FastttCamera-FastttCameraTests/Pods-FastttCamera-FastttCameraTests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 6DDD63F078028E0F3152F696 /* 📦 Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "📦 Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FastttCameraTests/Pods-FastttCameraTests-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FastttCamera/Pods-FastttCamera-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 6758E4F8109EFADAED29F515 /* Check Pods Manifest.lock */ = { + 85418A2F1F4A10F69A7359CF /* 📦 Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "📦 Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -352,14 +369,14 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - FE4976FB8F98C95B28CCECC1 /* Check Pods Manifest.lock */ = { + A523EB39C390B0E416B33C5E /* 📦 Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "📦 Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -367,6 +384,21 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; + A658D0FD67F6FCC2199E491E /* 📦 Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "📦 Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FastttCamera-FastttCameraTests/Pods-FastttCamera-FastttCameraTests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -491,7 +523,7 @@ }; FAC389B71A8928440005EFDD /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 78E1CD45A5522076D78AA110 /* Pods-FastttCamera.debug.xcconfig */; + baseConfigurationReference = 027C9048D236E26032130398 /* Pods-FastttCamera.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -535,7 +567,7 @@ }; FAC389B81A8928440005EFDD /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9E06B3209BE8DAEF88292AE7 /* Pods-FastttCamera.release.xcconfig */; + baseConfigurationReference = B382500DAE4F9FCE2C3784FD /* Pods-FastttCamera.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -579,7 +611,7 @@ }; FAC389BA1A8928440005EFDD /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 48AF9CCB180708078DE6E516 /* Pods-FastttCameraTests.debug.xcconfig */; + baseConfigurationReference = E067B6C029ECAA7B4C5AE191 /* Pods-FastttCamera-FastttCameraTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( @@ -599,7 +631,7 @@ }; FAC389BB1A8928440005EFDD /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5141270C1ECE47804F132180 /* Pods-FastttCameraTests.release.xcconfig */; + baseConfigurationReference = B34120259D718FF104495E4E /* Pods-FastttCamera-FastttCameraTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( diff --git a/Example/Podfile b/Example/Podfile index e71930d..c2577ee 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,6 +1,6 @@ source 'https://github.com/CocoaPods/Specs.git' -xcodeproj 'FastttCamera' +project 'FastttCamera' platform :ios, '7.0' @@ -9,14 +9,13 @@ def install_pods pod 'Masonry', '0.6.1' end -target 'FastttCamera', :exclusive => true do +target 'FastttCamera' do install_pods -end -target 'FastttCameraTests', :exclusive => true do - install_pods - pod 'Specta' - pod 'Expecta' - pod 'Expecta+Snapshots' - pod 'OCMock' + target 'FastttCameraTests' do + pod 'Specta' + pod 'Expecta' + pod 'Expecta+Snapshots' + pod 'OCMock' + end end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index e40ef81..1a951e1 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -21,7 +21,7 @@ DEPENDENCIES: EXTERNAL SOURCES: FastttCamera: - :path: ../FastttCamera.podspec + :path: "../FastttCamera.podspec" SPEC CHECKSUMS: Expecta: 9d1bff6c8b0eeee73a166a2ee898892478927a15 @@ -32,4 +32,6 @@ SPEC CHECKSUMS: OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb Specta: 69bb134672aae190a1379ff91df07dad8dd1f869 -COCOAPODS: 0.38.2 +PODFILE CHECKSUM: 8b803b068d0f7869491602ceaa035cda38f4a00b + +COCOAPODS: 1.0.0 From ad90bd37a2f1a58b5a375be84cce76aaa083a371 Mon Sep 17 00:00:00 2001 From: tony-yan-yu Date: Wed, 30 Jun 2021 14:13:31 +0800 Subject: [PATCH 8/9] Update FastttCamera.m --- FastttCamera/FastttCamera.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/FastttCamera/FastttCamera.m b/FastttCamera/FastttCamera.m index 75a2213..3e0cc84 100644 --- a/FastttCamera/FastttCamera.m +++ b/FastttCamera/FastttCamera.m @@ -607,8 +607,10 @@ - (void)_processImage:(UIImage *)image withCropRect:(CGRect)cropRect maxDimensio [capturedImage scaleToMaxDimension:maxDimension withCallback:scaleCallback]; } else if (fromCamera && self.scalesImage) { - [capturedImage scaleToSize:self.view.bounds.size - withCallback:scaleCallback]; + dispatch_async(dispatch_get_main_queue(), ^(void) { + //Run UI Updates + [capturedImage scaleToSize:self.view.bounds.size withCallback:scaleCallback]; + }); } if (fromCamera && !self.isCapturingImage) { From 1721da415ef47f5190aee12f1db756bc98ac802d Mon Sep 17 00:00:00 2001 From: Siddharth Sathyam Date: Tue, 6 Jul 2021 15:13:30 -0500 Subject: [PATCH 9/9] Update FastttCamera.podspec --- FastttCamera.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FastttCamera.podspec b/FastttCamera.podspec index 1b4a8f2..3ad54a7 100644 --- a/FastttCamera.podspec +++ b/FastttCamera.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "FastttCamera" - s.version = "0.3.4" + s.version = "0.3.5" s.summary = "A fast, straightforward implementation of AVFoundation camera with customizable real-time photo filters." s.homepage = "https://github.com/IFTTT/FastttCamera" s.license = 'MIT'