diff --git a/.gitmodules b/.gitmodules index aa20c66..a0188c0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "Vendor/xctoolchain"] path = Vendor/xctoolchain - url = https://github.com/ParsePlatform/xctoolchain.git + url = https://github.com/nlutsenko/xctoolchain.git diff --git a/.travis.yml b/.travis.yml index bc2930e..362995a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ branches: - master-v3 language: objective-c os: osx -osx_image: xcode8 +osx_image: xcode9 env: global: - LC_CTYPE=en_US.UTF-8 @@ -22,7 +22,7 @@ script: - | if [ "$TEST_TYPE" = iOS ]; then set -o pipefail - xcodebuild test -workspace ParseFacebookUtils.xcworkspace -sdk iphonesimulator -scheme ParseFacebookUtilsV4-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 4s" -destination "platform=iOS Simulator,name=iPhone 6 Plus" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty + xcodebuild test -workspace ParseFacebookUtils.xcworkspace -sdk iphonesimulator -scheme ParseFacebookUtilsV4-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 6 Plus" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty elif [ "$TEST_TYPE" = CocoaPods ]; then pod lib lint --use-libraries ParseFacebookUtilsV4.podspec elif [ "$TEST_TYPE" = Package ]; then diff --git a/ParseFacebookUtils.xcodeproj/project.pbxproj b/ParseFacebookUtils.xcodeproj/project.pbxproj index a87d390..252d083 100644 --- a/ParseFacebookUtils.xcodeproj/project.pbxproj +++ b/ParseFacebookUtils.xcodeproj/project.pbxproj @@ -187,7 +187,7 @@ name = Products; sourceTree = ""; }; - 0867D691FE84028FC02AAC07 /* Breakpad */ = { + 0867D691FE84028FC02AAC07 = { isa = PBXGroup; children = ( F52CD63A1B58383C0051AB86 /* Configurations */, @@ -594,7 +594,7 @@ en, Base, ); - mainGroup = 0867D691FE84028FC02AAC07 /* Breakpad */; + mainGroup = 0867D691FE84028FC02AAC07; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; projectRoot = ""; @@ -720,13 +720,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-ParseFacebookUtilsV4-UnitTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; A72EB79485B8A201DDE9573A /* [CP] Embed Pods Frameworks */ = { @@ -735,9 +738,12 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-ParseFacebookUtilsV4-UnitTests/Pods-ParseFacebookUtilsV4-UnitTests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/ParseFacebookUtilsV4.podspec b/ParseFacebookUtilsV4.podspec index 001f71c..b678c96 100644 --- a/ParseFacebookUtilsV4.podspec +++ b/ParseFacebookUtilsV4.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'ParseFacebookUtilsV4' - s.version = '1.11.1' + s.version = '1.11.2' s.license = { :type => 'BSD' } s.homepage = 'http://parseplatform.org/' s.summary = 'Parse is a complete technology stack to power your app\'s backend.' @@ -10,7 +10,7 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/ParsePlatform/ParseFacebookUtils-iOS.git", :tag => "v4-#{s.version.to_s}" } s.platform = :ios, :tvos - s.ios.deployment_target = '7.0' + s.ios.deployment_target = '9.0' s.tvos.deployment_target = '9.0' s.requires_arc = true @@ -31,10 +31,11 @@ Pod::Spec.new do |s| 'Social' s.libraries = 'z', 'sqlite3' - s.dependency 'Bolts/Tasks', '>= 1.8.4' + s.dependency 'Bolts/Tasks', '~> 1.9' s.dependency 'Parse', '~> 1.15.1' - s.dependency 'FBSDKCoreKit', '~> 4.24.0' + s.dependency 'FBSDKCoreKit', '~> 4.28.0' - s.ios.dependency 'FBSDKLoginKit', '~> 4.24.0' - s.tvos.dependency 'FBSDKTVOSKit', '~> 4.24.0' + s.ios.dependency 'FBSDKLoginKit', '~> 4.28.0' + s.tvos.dependency 'FBSDKTVOSKit', '~> 4.28.0' + s.tvos.dependency 'FBSDKShareKit', '~> 4.28.0' end diff --git a/Podfile.lock b/Podfile.lock index 7188902..7f730ae 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -9,4 +9,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 7f73b647320ae8e03a939adea9db9d7515147c5e -COCOAPODS: 1.0.1 +COCOAPODS: 1.3.1