From 390d1529a25deb8af9d6c8e2f3e72d9cbd8d6d4a Mon Sep 17 00:00:00 2001 From: William Entriken Date: Fri, 30 Dec 2016 20:22:43 -0500 Subject: [PATCH] update pods --- Formant Analyzer/Formant Analyzer/Info.plist | 4 ++-- .../Formant_AnalyzerUITests.swift | 8 ++++---- Formant Analyzer/Podfile.lock | 2 +- .../FDSoundActivatedRecorder.swift | 3 +++ Formant Analyzer/Pods/Manifest.lock | 2 +- .../FDSoundActivatedRecorder-prefix.pch | 8 ++++++++ .../FDSoundActivatedRecorder-umbrella.h | 8 ++++++++ .../FDSoundActivatedRecorder.xcconfig | 1 + .../FSLineChart/FSLineChart-prefix.pch | 8 ++++++++ .../FSLineChart/FSLineChart-umbrella.h | 8 ++++++++ .../FSLineChart/FSLineChart.xcconfig | 1 + .../Pods-Formant Analyzer-frameworks.sh | 12 ++++++++++-- .../Pods-Formant Analyzer-resources.sh | 3 +++ .../Pods-Formant Analyzer-umbrella.h | 8 ++++++++ .../Pods-Formant Analyzer.debug.xcconfig | 1 - .../Pods-Formant Analyzer.release.xcconfig | 1 - Formant Analyzer/fastlane/README.md | 4 ++-- Formant Analyzer/fastlane/Snapfile | 6 ++++++ 18 files changed, 74 insertions(+), 14 deletions(-) diff --git a/Formant Analyzer/Formant Analyzer/Info.plist b/Formant Analyzer/Formant Analyzer/Info.plist index 652215c..a8da1b9 100644 --- a/Formant Analyzer/Formant Analyzer/Info.plist +++ b/Formant Analyzer/Formant Analyzer/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.3.3 + 1.3.4 CFBundleSignature ???? CFBundleVersion - 1.3.3.1 + 1.3.4.2 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/Formant Analyzer/Formant AnalyzerUITests/Formant_AnalyzerUITests.swift b/Formant Analyzer/Formant AnalyzerUITests/Formant_AnalyzerUITests.swift index b2c7fcc..52cc1dc 100644 --- a/Formant Analyzer/Formant AnalyzerUITests/Formant_AnalyzerUITests.swift +++ b/Formant Analyzer/Formant AnalyzerUITests/Formant_AnalyzerUITests.swift @@ -37,7 +37,7 @@ class Formant_AnalyzerUITests: XCTestCase { func testSig() { let app = XCUIApplication() app.buttons["Sig"].tap() - delay(0.5) { + delay(1.5) { snapshot("1Sig", waitForLoadingIndicator:true) } self.waitForExpectations(timeout: 2, handler: nil) @@ -46,7 +46,7 @@ class Formant_AnalyzerUITests: XCTestCase { func testLpc() { let app = XCUIApplication() app.buttons["LPC"].tap() - delay(0.5) { + delay(1.5) { snapshot("2Lpc", waitForLoadingIndicator:true) } self.waitForExpectations(timeout: 2, handler: nil) @@ -55,7 +55,7 @@ class Formant_AnalyzerUITests: XCTestCase { func testHw() { let app = XCUIApplication() app.segmentedControls.buttons.element(boundBy: 2).tap() - delay(0.5) { + delay(1.5) { snapshot("3Hw", waitForLoadingIndicator:true) } self.waitForExpectations(timeout: 2, handler: nil) @@ -64,7 +64,7 @@ class Formant_AnalyzerUITests: XCTestCase { func testFrmnt() { let app = XCUIApplication() app.buttons["Frmnt"].tap() - delay(0.5) { + delay(1.5) { snapshot("4Frmnt", waitForLoadingIndicator:true) } self.waitForExpectations(timeout: 2, handler: nil) diff --git a/Formant Analyzer/Podfile.lock b/Formant Analyzer/Podfile.lock index 9b75eca..ce7ed03 100644 --- a/Formant Analyzer/Podfile.lock +++ b/Formant Analyzer/Podfile.lock @@ -12,4 +12,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: f0e0a1e4f479527ec2ad23dd123b9c4558fff7ae -COCOAPODS: 1.1.1 +COCOAPODS: 1.2.0.beta.3 diff --git a/Formant Analyzer/Pods/FDSoundActivatedRecorder/FDSoundActivatedRecorder/FDSoundActivatedRecorder/FDSoundActivatedRecorder.swift b/Formant Analyzer/Pods/FDSoundActivatedRecorder/FDSoundActivatedRecorder/FDSoundActivatedRecorder/FDSoundActivatedRecorder.swift index 4b908fb..f9957c6 100644 --- a/Formant Analyzer/Pods/FDSoundActivatedRecorder/FDSoundActivatedRecorder/FDSoundActivatedRecorder/FDSoundActivatedRecorder.swift +++ b/Formant Analyzer/Pods/FDSoundActivatedRecorder/FDSoundActivatedRecorder/FDSoundActivatedRecorder/FDSoundActivatedRecorder.swift @@ -177,6 +177,9 @@ open class FDSoundActivatedRecorder: NSObject, AVAudioRecorderDelegate { exportAudioMixInputParameters.setVolumeRamp(fromStartVolume: 1.0, toEndVolume: 0.0, timeRange: fadeOutTimeRange) exportAudioMix.inputParameters = [exportAudioMixInputParameters] + let presets = AVAssetExportSession.exportPresets(compatibleWith: avAsset) + + // Configure AVAssetExportSession which sets audio format let exportSession = AVAssetExportSession(asset: avAsset, presetName: AVAssetExportPresetAppleM4A)! exportSession.outputURL = trimmedAudioFileURL diff --git a/Formant Analyzer/Pods/Manifest.lock b/Formant Analyzer/Pods/Manifest.lock index 9b75eca..ce7ed03 100644 --- a/Formant Analyzer/Pods/Manifest.lock +++ b/Formant Analyzer/Pods/Manifest.lock @@ -12,4 +12,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: f0e0a1e4f479527ec2ad23dd123b9c4558fff7ae -COCOAPODS: 1.1.1 +COCOAPODS: 1.2.0.beta.3 diff --git a/Formant Analyzer/Pods/Target Support Files/FDSoundActivatedRecorder/FDSoundActivatedRecorder-prefix.pch b/Formant Analyzer/Pods/Target Support Files/FDSoundActivatedRecorder/FDSoundActivatedRecorder-prefix.pch index aa992a4..beb2a24 100644 --- a/Formant Analyzer/Pods/Target Support Files/FDSoundActivatedRecorder/FDSoundActivatedRecorder-prefix.pch +++ b/Formant Analyzer/Pods/Target Support Files/FDSoundActivatedRecorder/FDSoundActivatedRecorder-prefix.pch @@ -1,4 +1,12 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif diff --git a/Formant Analyzer/Pods/Target Support Files/FDSoundActivatedRecorder/FDSoundActivatedRecorder-umbrella.h b/Formant Analyzer/Pods/Target Support Files/FDSoundActivatedRecorder/FDSoundActivatedRecorder-umbrella.h index c0861cf..6ca5da0 100644 --- a/Formant Analyzer/Pods/Target Support Files/FDSoundActivatedRecorder/FDSoundActivatedRecorder-umbrella.h +++ b/Formant Analyzer/Pods/Target Support Files/FDSoundActivatedRecorder/FDSoundActivatedRecorder-umbrella.h @@ -1,5 +1,13 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif diff --git a/Formant Analyzer/Pods/Target Support Files/FDSoundActivatedRecorder/FDSoundActivatedRecorder.xcconfig b/Formant Analyzer/Pods/Target Support Files/FDSoundActivatedRecorder/FDSoundActivatedRecorder.xcconfig index 58f1836..4dd7d67 100644 --- a/Formant Analyzer/Pods/Target Support Files/FDSoundActivatedRecorder/FDSoundActivatedRecorder.xcconfig +++ b/Formant Analyzer/Pods/Target Support Files/FDSoundActivatedRecorder/FDSoundActivatedRecorder.xcconfig @@ -5,5 +5,6 @@ OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} +PODS_TARGET_SRCROOT = ${PODS_ROOT}/FDSoundActivatedRecorder PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} SKIP_INSTALL = YES diff --git a/Formant Analyzer/Pods/Target Support Files/FSLineChart/FSLineChart-prefix.pch b/Formant Analyzer/Pods/Target Support Files/FSLineChart/FSLineChart-prefix.pch index aa992a4..beb2a24 100644 --- a/Formant Analyzer/Pods/Target Support Files/FSLineChart/FSLineChart-prefix.pch +++ b/Formant Analyzer/Pods/Target Support Files/FSLineChart/FSLineChart-prefix.pch @@ -1,4 +1,12 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif diff --git a/Formant Analyzer/Pods/Target Support Files/FSLineChart/FSLineChart-umbrella.h b/Formant Analyzer/Pods/Target Support Files/FSLineChart/FSLineChart-umbrella.h index 76f9e7e..a8ba281 100644 --- a/Formant Analyzer/Pods/Target Support Files/FSLineChart/FSLineChart-umbrella.h +++ b/Formant Analyzer/Pods/Target Support Files/FSLineChart/FSLineChart-umbrella.h @@ -1,5 +1,13 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif #import "FSLineChart.h" diff --git a/Formant Analyzer/Pods/Target Support Files/FSLineChart/FSLineChart.xcconfig b/Formant Analyzer/Pods/Target Support Files/FSLineChart/FSLineChart.xcconfig index 0706548..5d3829b 100644 --- a/Formant Analyzer/Pods/Target Support Files/FSLineChart/FSLineChart.xcconfig +++ b/Formant Analyzer/Pods/Target Support Files/FSLineChart/FSLineChart.xcconfig @@ -4,5 +4,6 @@ HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Publi PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} +PODS_TARGET_SRCROOT = ${PODS_ROOT}/FSLineChart PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} SKIP_INSTALL = YES diff --git a/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer-frameworks.sh b/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer-frameworks.sh index dec8fc9..b051012 100755 --- a/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer-frameworks.sh +++ b/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer-frameworks.sh @@ -59,8 +59,13 @@ code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" + + if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + code_sign_cmd="$code_sign_cmd &" + fi + echo "$code_sign_cmd" + eval "$code_sign_cmd" fi } @@ -91,3 +96,6 @@ if [[ "$CONFIGURATION" == "Release" ]]; then install_framework "$BUILT_PRODUCTS_DIR/FDSoundActivatedRecorder/FDSoundActivatedRecorder.framework" install_framework "$BUILT_PRODUCTS_DIR/FSLineChart/FSLineChart.framework" fi +if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + wait +fi diff --git a/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer-resources.sh b/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer-resources.sh index 25e9d37..4602c68 100755 --- a/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer-resources.sh +++ b/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer-resources.sh @@ -18,6 +18,9 @@ case "${TARGETED_DEVICE_FAMILY}" in 2) TARGET_DEVICE_ARGS="--target-device ipad" ;; + 3) + TARGET_DEVICE_ARGS="--target-device tv" + ;; *) TARGET_DEVICE_ARGS="--target-device mac" ;; diff --git a/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer-umbrella.h b/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer-umbrella.h index a7b5074..8dd3a99 100644 --- a/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer-umbrella.h +++ b/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer-umbrella.h @@ -1,5 +1,13 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif diff --git a/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer.debug.xcconfig b/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer.debug.xcconfig index 57e9cd5..0ca52fb 100644 --- a/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer.debug.xcconfig +++ b/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer.debug.xcconfig @@ -1,5 +1,4 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -EMBEDDED_CONTENT_CONTAINS_SWIFT = YES FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/FDSoundActivatedRecorder" "$PODS_CONFIGURATION_BUILD_DIR/FSLineChart" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' diff --git a/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer.release.xcconfig b/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer.release.xcconfig index 57e9cd5..0ca52fb 100644 --- a/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer.release.xcconfig +++ b/Formant Analyzer/Pods/Target Support Files/Pods-Formant Analyzer/Pods-Formant Analyzer.release.xcconfig @@ -1,5 +1,4 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -EMBEDDED_CONTENT_CONTAINS_SWIFT = YES FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/FDSoundActivatedRecorder" "$PODS_CONFIGURATION_BUILD_DIR/FSLineChart" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' diff --git a/Formant Analyzer/fastlane/README.md b/Formant Analyzer/fastlane/README.md index 34fb64d..a8c409b 100644 --- a/Formant Analyzer/fastlane/README.md +++ b/Formant Analyzer/fastlane/README.md @@ -26,6 +26,6 @@ Deploy a new version to the App Store ---- -This README.md is auto-generated and will be re-generated every time to run [fastlane](https://fastlane.tools). +This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run. More information about fastlane can be found on [https://fastlane.tools](https://fastlane.tools). -The documentation of fastlane can be found on [GitHub](https://github.com/fastlane/fastlane/tree/master/fastlane). \ No newline at end of file +The documentation of fastlane can be found on [GitHub](https://github.com/fastlane/fastlane/tree/master/fastlane). diff --git a/Formant Analyzer/fastlane/Snapfile b/Formant Analyzer/fastlane/Snapfile index 0e0d660..affa577 100644 --- a/Formant Analyzer/fastlane/Snapfile +++ b/Formant Analyzer/fastlane/Snapfile @@ -10,6 +10,12 @@ # "iPad Pro" # ]) +devices([ + "iPhone 7", + "iPad Pro" +] +) + languages([ "en-US" ])