diff --git a/.travis.yml b/.travis.yml index 0880eaa..6d0288f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,12 +17,6 @@ matrix: env: FASTLANE_ENV=tvos11_xcode9 - osx_image: xcode9.2 env: FASTLANE_ENV=osx - - osx_image: xcode8.3 - env: FASTLANE_ENV=ios10_xcode8 - - osx_image: xcode7.3 - env: FASTLANE_ENV=ios9_xcode7 - - osx_image: xcode7.3 - env: FASTLANE_ENV=ios8_xcode7 before_install: # Force bundler 1.12.5 because version 1.13 has issues, see https://github.com/fastlane/fastlane/issues/6065#issuecomment-246044617 - gem uninstall bundler -v '>1.12.5' --force --executables || echo "bundler >1.12.5 is not installed" diff --git a/AFNetworkActivityLogger.xcodeproj/project.pbxproj b/AFNetworkActivityLogger.xcodeproj/project.pbxproj index 1615f51..5844cff 100644 --- a/AFNetworkActivityLogger.xcodeproj/project.pbxproj +++ b/AFNetworkActivityLogger.xcodeproj/project.pbxproj @@ -345,7 +345,6 @@ 29D77A9E1BCC49C9005B1EF5 /* Frameworks */, 29D77A9F1BCC49C9005B1EF5 /* Headers */, 29D77AA01BCC49C9005B1EF5 /* Resources */, - 29D77AAD1BCC4A12005B1EF5 /* ShellScript */, ); buildRules = ( ); @@ -365,7 +364,6 @@ 29D77AB21BCC4BDD005B1EF5 /* Headers */, 29D77AB31BCC4BDD005B1EF5 /* Resources */, 29D77AC01BCC4C7F005B1EF5 /* CopyFiles */, - 29D77AC31BCC4C96005B1EF5 /* ShellScript */, ); buildRules = ( ); @@ -384,7 +382,6 @@ 29D77AC51BCC4D4D005B1EF5 /* Frameworks */, 29D77AC61BCC4D4D005B1EF5 /* Headers */, 29D77AC71BCC4D4D005B1EF5 /* Resources */, - 29D77AD71BCC4DC5005B1EF5 /* ShellScript */, ); buildRules = ( ); @@ -403,7 +400,6 @@ 29D96E611BCC34CD00F571A5 /* Frameworks */, 29D96E621BCC34CD00F571A5 /* Headers */, 29D96E631BCC34CD00F571A5 /* Resources */, - 29D96E771BCC36E700F571A5 /* ShellScript */, ); buildRules = ( ); @@ -489,6 +485,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 29D96E5B1BCC34CD00F571A5; @@ -559,65 +556,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 29D77AAD1BCC4A12005B1EF5 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/Mac/AFNetworking.framework", - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; - 29D77AC31BCC4C96005B1EF5 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/watchOS/AFNetworking.framework", - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; - 29D77AD71BCC4DC5005B1EF5 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/tvOS/AFNetworking.framework", - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; - 29D96E771BCC36E700F571A5 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/AFNetworking.framework", - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 297DF57D1C1F1CA2001FA807 /* Sources */ = { isa = PBXSourcesBuildPhase; diff --git a/AFNetworkActivityLogger.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/AFNetworkActivityLogger.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/AFNetworkActivityLogger.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Cartfile b/Cartfile index f225503..c892cb1 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "AFNetworking/AFNetworking" ~> 3.0 \ No newline at end of file +github "AFNetworking/AFNetworking" ~> 4.0 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index b0813f1..ea2fdf0 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "AFNetworking/AFNetworking" "3.2.0" +github "AFNetworking/AFNetworking" "4.0.1"