Skip to content

C
cocoapods
Commit 0d968362 authored by Danielle Tomlinson's avatar Danielle Tomlinson Committed by GitHub
Browse files
Options

Merge pull request #6282 from CocoaPods/dani_circleci_examples 

[CI] Run Examples on Xcode 8 using CircleCI
parents e0bb44c7 8a32432d
Show whitespace changes
Inline Side-by-side
Showing with 362 additions and 28 deletions
.circle-scripts/fetch-cocoapods-repo-from-s3.sh 0 → 100755
View file @ 0d968362
#!/usr/bin/env bash
set -o nounset
set -o errexit
set -o pipefail
REPOS_LOCATION="$HOME/.cocoapods/repos"
MASTER_REPO_LOCATION="$REPOS_LOCATION/master"
S3_BUCKET="cocoapods-specs"
tempfile=$(mktemp)
cleanup() {
echo "Download from S3 failed, cleaning up and falling back to standard checkout..."
rm -rf "$MASTER_REPO_LOCATION"
rm "$tempfile"
}
trap cleanup ERR
# Only install awscli if it's not in the image. pip will exit with
# non-zero exit code if the package is not installed. Hiding all output
# from package installation to not to confuse users.
if ! pip show awscli > /dev/null 2>&1 ; then
sudo pip install --ignore-installed awscli > /dev/null 2>&1
fi
rm -rf "$MASTER_REPO_LOCATION"
mkdir -p "$REPOS_LOCATION"
echo "Downloading CocoaPods master repo from $S3_BUCKET S3 bucket..."
# --no-sign-request forces awscli to not to use any credentials.
aws s3 --no-sign-request cp "s3://$S3_BUCKET/latest.tar.gz" "$tempfile" > /dev/null
echo "Uncompressing CocoaPods master repo..."
# We expect the structure with the "master" as the top dir in the archive.
tar -C "$REPOS_LOCATION" -xzf "$tempfile"
echo "Successfully downloaded CocoaPods master repo."
COCOAPODS_GIT_REV="$(cd $MASTER_REPO_LOCATION && git rev-parse HEAD)"
echo "Using specs repo revision $COCOAPODS_GIT_REV."
rm "$tempfile"
.travis.yml
View file @ 0d968362
...@@ -8,10 +8,6 @@ git: ...@@ -8,10 +8,6 @@ git:
matrix: matrix:
include: include:
- rvm: system
env: COCOAPODS_CI_TASKS=EXAMPLES
osx_image: xcode7.3
language: objective-c
- rvm: 2.4.0 - rvm: 2.4.0
env: COCOAPODS_CI_TASKS=LINT env: COCOAPODS_CI_TASKS=LINT
git: git:
......
Rakefile
View file @ 0d968362
...@@ -255,11 +255,11 @@ begin ...@@ -255,11 +255,11 @@ begin
namespace :examples do namespace :examples do
desc 'Open all example workspaces in Xcode, which recreates the schemes.' desc 'Open all example workspaces in Xcode, which recreates the schemes.'
task :recreate_workspace_schemes do task :recreate_workspace_schemes do
examples.each do |example| Dir['examples/*'].each do |example|
Dir.chdir(example.to_s) do Dir.chdir(example.to_s) do
# TODO: we need to open the workspace in Xcode at least once, otherwise it might not contain schemes. # TODO: we need to open the workspace in Xcode at least once, otherwise it might not contain schemes.
# The schemes do not seem to survive a SCM round-trip. # The schemes do not seem to survive a SCM round-trip.
sh "open '#{example.basename}.xcworkspace'" sh 'open *.xcworkspace'
sleep 5 sleep 5
end end
end end
...@@ -295,10 +295,9 @@ begin ...@@ -295,10 +295,9 @@ begin
when :osx when :osx
execute_command "xcodebuild -workspace '#{workspace_path}' -scheme '#{scheme_name}' clean build" execute_command "xcodebuild -workspace '#{workspace_path}' -scheme '#{scheme_name}' clean build"
when :ios when :ios
# Specifically build against the simulator SDK so we don't have to deal with code signing.
# Need to use the iPhone 6s, since this is the default simulator paired with a watch in Xcode 7.3
test_flag = (scheme_name.start_with? 'Test') ? 'test' : '' test_flag = (scheme_name.start_with? 'Test') ? 'test' : ''
execute_command "xcodebuild -workspace '#{workspace_path}' -scheme '#{scheme_name}' clean build #{test_flag} ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 6s'"
execute_command "xcodebuild -workspace '#{workspace_path}' -scheme '#{scheme_name}' clean build #{test_flag} ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 7'"
else else
raise "Unknown platform #{platform}" raise "Unknown platform #{platform}"
end end
......
circle.yml 0 → 100644
View file @ 0d968362
machine:
ruby:
version: system
xcode:
version: "8.2"
dependencies:
override:
- sudo gem update --system
- bundle check || bundle install --path .bundle
- .circle-scripts/fetch-cocoapods-repo-from-s3.sh
cache_directories:
- .bundle
test:
pre:
- git config --global user.email "tests@cocoapods.org"
- git config --global user.name "CocoaPods Tests"
- bundle exec pod env
override:
- bundle exec rake spec:all:
environment:
COCOAPODS_CI_TASKS: EXAMPLES
examples/AFNetworking Example/Examples.xcworkspace/xcshareddata/Examples.xcscmblueprint 0 → 100644
View file @ 0d968362
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : 9223372036854775807,
"9F9800D332981B4632368512DE7ED0F103520D36" : 9223372036854775807
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "2D0B9AFD-08AE-404F-B67A-C467D3EF2114",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : "CocoaPods\/",
"9F9800D332981B4632368512DE7ED0F103520D36" : ""
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "Examples",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "examples\/AFNetworking Example\/Examples.xcworkspace",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:CocoaPods\/CocoaPods.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/CocoaPods\/Rainforest.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9F9800D332981B4632368512DE7ED0F103520D36"
}
]
}
\ No newline at end of file
examples/Alamofire Example/Alamofire/Source/Alamofire.swift
View file @ 0d968362
...@@ -49,7 +49,7 @@ extension String: URLStringConvertible { ...@@ -49,7 +49,7 @@ extension String: URLStringConvertible {
extension NSURL: URLStringConvertible { extension NSURL: URLStringConvertible {
public var URLString: String { public var URLString: String {
return absoluteString return absoluteString!
} }
} }
......
examples/Alamofire Example/Alamofire/Source/Download.swift
View file @ 0d968362
...@@ -152,7 +152,7 @@ extension Request { ...@@ -152,7 +152,7 @@ extension Request {
let directoryURLs = NSFileManager.defaultManager().URLsForDirectory(directory, inDomains: domain) let directoryURLs = NSFileManager.defaultManager().URLsForDirectory(directory, inDomains: domain)
if !directoryURLs.isEmpty { if !directoryURLs.isEmpty {
return directoryURLs[0].URLByAppendingPathComponent(response.suggestedFilename!) return directoryURLs[0].URLByAppendingPathComponent(response.suggestedFilename!)!
} }
return temporaryURL return temporaryURL
......
examples/Alamofire Example/Alamofire/Source/ServerTrustPolicy.swift
View file @ 0d968362
...@@ -238,12 +238,12 @@ public enum ServerTrustPolicy { ...@@ -238,12 +238,12 @@ public enum ServerTrustPolicy {
private func trustIsValid(trust: SecTrust) -> Bool { private func trustIsValid(trust: SecTrust) -> Bool {
var isValid = false var isValid = false
var result = SecTrustResultType(kSecTrustResultInvalid) var result = SecTrustResultType.Invalid
let status = SecTrustEvaluate(trust, &result) let status = SecTrustEvaluate(trust, &result)
if status == errSecSuccess { if status == errSecSuccess {
let unspecified = SecTrustResultType(kSecTrustResultUnspecified) let unspecified = SecTrustResultType.Unspecified
let proceed = SecTrustResultType(kSecTrustResultProceed) let proceed = SecTrustResultType.Proceed
isValid = result == unspecified || result == proceed isValid = result == unspecified || result == proceed
} }
......
examples/Alamofire Example/Alamofire/Source/Upload.swift
View file @ 0d968362
...@@ -310,10 +310,10 @@ extension Manager { ...@@ -310,10 +310,10 @@ extension Manager {
let tempDirectoryURL = NSURL(fileURLWithPath: NSTemporaryDirectory()) let tempDirectoryURL = NSURL(fileURLWithPath: NSTemporaryDirectory())
let directoryURL = tempDirectoryURL.URLByAppendingPathComponent("com.alamofire.manager/multipart.form.data") let directoryURL = tempDirectoryURL.URLByAppendingPathComponent("com.alamofire.manager/multipart.form.data")
let fileName = NSUUID().UUIDString let fileName = NSUUID().UUIDString
let fileURL = directoryURL.URLByAppendingPathComponent(fileName) let fileURL = directoryURL!.URLByAppendingPathComponent(fileName)!
do { do {
try fileManager.createDirectoryAtURL(directoryURL, withIntermediateDirectories: true, attributes: nil) try fileManager.createDirectoryAtURL(directoryURL!, withIntermediateDirectories: true, attributes: nil)
try formData.writeEncodedDataToDisk(fileURL) try formData.writeEncodedDataToDisk(fileURL)
dispatch_async(dispatch_get_main_queue()) { dispatch_async(dispatch_get_main_queue()) {
......
examples/Alamofire Example/Example/HTTPBin.swift
View file @ 0d968362
...@@ -38,7 +38,7 @@ enum HTTPBinRoute: URLStringConvertible { ...@@ -38,7 +38,7 @@ enum HTTPBinRoute: URLStringConvertible {
} }
}() }()
return NSURL(string: path, relativeToURL: NSURL(string: baseURLString))!.absoluteString return NSURL(string: path, relativeToURL: NSURL(string: baseURLString))!.absoluteString!
} }
} }
examples/Alamofire Example/Example/Images.xcassets/AppIcon.appiconset/Contents.json
View file @ 0d968362
{ {
"images" : [ "images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{ {
"idiom" : "iphone", "idiom" : "iphone",
"size" : "29x29", "size" : "29x29",
"scale" : "2x" "scale" : "2x"
}, },
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{ {
"idiom" : "iphone", "idiom" : "iphone",
"size" : "40x40", "size" : "40x40",
"scale" : "2x" "scale" : "2x"
}, },
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
},
{ {
"idiom" : "iphone", "idiom" : "iphone",
"size" : "60x60", "size" : "60x60",
"scale" : "2x" "scale" : "2x"
}, },
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{ {
"idiom" : "ipad", "idiom" : "ipad",
"size" : "29x29", "size" : "29x29",
...@@ -44,6 +79,11 @@ ...@@ -44,6 +79,11 @@
"idiom" : "ipad", "idiom" : "ipad",
"size" : "76x76", "size" : "76x76",
"scale" : "2x" "scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
} }
], ],
"info" : { "info" : {
......
examples/Alamofire Example/Example/Images.xcassets/Logo.imageset/Contents.json
View file @ 0d968362
...@@ -2,13 +2,17 @@ ...@@ -2,13 +2,17 @@
"images" : [ "images" : [
{ {
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x", "filename" : "Logo.png",
"filename" : "Logo.png" "scale" : "1x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x", "filename" : "Logo@2x.png",
"filename" : "Logo@2x.png" "scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
} }
], ],
"info" : { "info" : {
......
examples/Alamofire Example/Examples.xcworkspace/xcshareddata/Examples.xcscmblueprint 0 → 100644
View file @ 0d968362
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : 9223372036854775807,
"9F9800D332981B4632368512DE7ED0F103520D36" : 9223372036854775807
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "421F3881-3A8F-419B-97D3-792E652539B9",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : "CocoaPods\/",
"9F9800D332981B4632368512DE7ED0F103520D36" : ""
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "Examples",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "examples\/Alamofire Example\/Examples.xcworkspace",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:CocoaPods\/CocoaPods.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/CocoaPods\/Rainforest.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9F9800D332981B4632368512DE7ED0F103520D36"
}
]
}
\ No newline at end of file
examples/Alamofire Example/iOS Example.xcodeproj/project.pbxproj
View file @ 0d968362
...@@ -330,6 +330,7 @@ ...@@ -330,6 +330,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "iOS Example"; PRODUCT_NAME = "iOS Example";
SWIFT_VERSION = 2.3;
}; };
name = Debug; name = Debug;
}; };
...@@ -342,6 +343,7 @@ ...@@ -342,6 +343,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "iOS Example"; PRODUCT_NAME = "iOS Example";
SWIFT_VERSION = 2.3;
}; };
name = Release; name = Release;
}; };
......
examples/HeaderMappingsDir Example/Examples.xcworkspace/xcshareddata/Examples.xcscmblueprint 0 → 100644
View file @ 0d968362
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : 9223372036854775807,
"9F9800D332981B4632368512DE7ED0F103520D36" : 9223372036854775807
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "3B83F557-73E2-4DAC-BE5C-0CC1CC89A726",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : "CocoaPods\/",
"9F9800D332981B4632368512DE7ED0F103520D36" : ""
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "Examples",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "examples\/HeaderMappingsDir Example\/Examples.xcworkspace",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:CocoaPods\/CocoaPods.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/CocoaPods\/Rainforest.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9F9800D332981B4632368512DE7ED0F103520D36"
}
]
}
\ No newline at end of file
examples/HeaderMappingsDir Example/HeaderMappingsDir Example.xcodeproj/project.pbxproj
View file @ 0d968362
...@@ -298,6 +298,7 @@ ...@@ -298,6 +298,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.HeaderMappingsDir-Example"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.HeaderMappingsDir-Example";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
}; };
name = Debug; name = Debug;
}; };
...@@ -311,6 +312,7 @@ ...@@ -311,6 +312,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.HeaderMappingsDir-Example"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.HeaderMappingsDir-Example";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
}; };
name = Release; name = Release;
}; };
......
examples/Resource Bundle Example/Examples.xcworkspace/xcshareddata/Examples.xcscmblueprint 0 → 100644
View file @ 0d968362
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : 9223372036854775807,
"9F9800D332981B4632368512DE7ED0F103520D36" : 9223372036854775807
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "4653A148-D3A2-4E43-8FEA-A2DCF2D36B91",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : "CocoaPods\/",
"9F9800D332981B4632368512DE7ED0F103520D36" : ""
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "Examples",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "examples\/Resource Bundle Example\/Examples.xcworkspace",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:CocoaPods\/CocoaPods.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/CocoaPods\/Rainforest.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9F9800D332981B4632368512DE7ED0F103520D36"
}
]
}
\ No newline at end of file
examples/Resource Bundle Example/Resource Bundle Example.xcodeproj/project.pbxproj
View file @ 0d968362
...@@ -344,6 +344,7 @@ ...@@ -344,6 +344,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.example.Resource-Bundle-Example"; PRODUCT_BUNDLE_IDENTIFIER = "com.example.Resource-Bundle-Example";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
}; };
name = Debug; name = Debug;
}; };
...@@ -357,6 +358,7 @@ ...@@ -357,6 +358,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.example.Resource-Bundle-Example"; PRODUCT_BUNDLE_IDENTIFIER = "com.example.Resource-Bundle-Example";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
}; };
name = Release; name = Release;
}; };
......
examples/TestInclusions/Examples.xcworkspace/xcshareddata/Examples.xcscmblueprint 0 → 100644
View file @ 0d968362
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : 9223372036854775807,
"9F9800D332981B4632368512DE7ED0F103520D36" : 9223372036854775807
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "56EE5E45-CDCD-4F97-BA23-32FCF95A9C24",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : "CocoaPods\/",
"9F9800D332981B4632368512DE7ED0F103520D36" : ""
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "Examples",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "examples\/TestInclusions\/Examples.xcworkspace",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:CocoaPods\/CocoaPods.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/CocoaPods\/Rainforest.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9F9800D332981B4632368512DE7ED0F103520D36"
}
]
}
\ No newline at end of file
examples/Vendored Framework Example/Examples.xcworkspace/xcshareddata/Examples.xcscmblueprint 0 → 100644
View file @ 0d968362
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : 9223372036854775807,
"9F9800D332981B4632368512DE7ED0F103520D36" : 9223372036854775807
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "CE1474ED-5B87-4F25-BE71-42DFAB941282",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : "CocoaPods\/",
"9F9800D332981B4632368512DE7ED0F103520D36" : ""
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "Examples",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "examples\/Vendored Framework Example\/Examples.xcworkspace",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:CocoaPods\/CocoaPods.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/CocoaPods\/Rainforest.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9F9800D332981B4632368512DE7ED0F103520D36"
}
]
}
\ No newline at end of file
examples/Vendored Framework Example/Vendored Framework Example.xcodeproj/project.pbxproj
View file @ 0d968362
...@@ -331,6 +331,7 @@ ...@@ -331,6 +331,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.Vendored-Framework-Example"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.Vendored-Framework-Example";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
}; };
name = Debug; name = Debug;
}; };
...@@ -343,6 +344,7 @@ ...@@ -343,6 +344,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.Vendored-Framework-Example"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.Vendored-Framework-Example";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
}; };
name = Release; name = Release;
}; };
......
examples/watchOS Example/Alamofire/Source/Alamofire.swift
View file @ 0d968362
...@@ -49,7 +49,7 @@ extension String: URLStringConvertible { ...@@ -49,7 +49,7 @@ extension String: URLStringConvertible {
extension NSURL: URLStringConvertible { extension NSURL: URLStringConvertible {
public var URLString: String { public var URLString: String {
return absoluteString return absoluteString!
} }
} }
......
examples/watchOS Example/Alamofire/Source/Download.swift
View file @ 0d968362
...@@ -152,7 +152,7 @@ extension Request { ...@@ -152,7 +152,7 @@ extension Request {
let directoryURLs = NSFileManager.defaultManager().URLsForDirectory(directory, inDomains: domain) let directoryURLs = NSFileManager.defaultManager().URLsForDirectory(directory, inDomains: domain)
if !directoryURLs.isEmpty { if !directoryURLs.isEmpty {
return directoryURLs[0].URLByAppendingPathComponent(response.suggestedFilename!) return directoryURLs[0].URLByAppendingPathComponent(response.suggestedFilename!)!
} }
return temporaryURL return temporaryURL
......
examples/watchOS Example/Alamofire/Source/ServerTrustPolicy.swift
View file @ 0d968362
...@@ -238,12 +238,12 @@ public enum ServerTrustPolicy { ...@@ -238,12 +238,12 @@ public enum ServerTrustPolicy {
private func trustIsValid(trust: SecTrust) -> Bool { private func trustIsValid(trust: SecTrust) -> Bool {
var isValid = false var isValid = false
var result = SecTrustResultType(kSecTrustResultInvalid) var result = SecTrustResultType.Invalid
let status = SecTrustEvaluate(trust, &result) let status = SecTrustEvaluate(trust, &result)
if status == errSecSuccess { if status == errSecSuccess {
let unspecified = SecTrustResultType(kSecTrustResultUnspecified) let unspecified = SecTrustResultType.Unspecified
let proceed = SecTrustResultType(kSecTrustResultProceed) let proceed = SecTrustResultType.Proceed
isValid = result == unspecified || result == proceed isValid = result == unspecified || result == proceed
} }
......
examples/watchOS Example/Alamofire/Source/Upload.swift
View file @ 0d968362
...@@ -310,10 +310,10 @@ extension Manager { ...@@ -310,10 +310,10 @@ extension Manager {
let tempDirectoryURL = NSURL(fileURLWithPath: NSTemporaryDirectory()) let tempDirectoryURL = NSURL(fileURLWithPath: NSTemporaryDirectory())
let directoryURL = tempDirectoryURL.URLByAppendingPathComponent("com.alamofire.manager/multipart.form.data") let directoryURL = tempDirectoryURL.URLByAppendingPathComponent("com.alamofire.manager/multipart.form.data")
let fileName = NSUUID().UUIDString let fileName = NSUUID().UUIDString
let fileURL = directoryURL.URLByAppendingPathComponent(fileName) let fileURL = directoryURL!.URLByAppendingPathComponent(fileName)!
do { do {
try fileManager.createDirectoryAtURL(directoryURL, withIntermediateDirectories: true, attributes: nil) try fileManager.createDirectoryAtURL(directoryURL!, withIntermediateDirectories: true, attributes: nil)
try formData.writeEncodedDataToDisk(fileURL) try formData.writeEncodedDataToDisk(fileURL)
dispatch_async(dispatch_get_main_queue()) { dispatch_async(dispatch_get_main_queue()) {
......
examples/watchOS Example/Examples.xcworkspace/xcshareddata/Examples.xcscmblueprint 0 → 100644
View file @ 0d968362
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : 9223372036854775807,
"9F9800D332981B4632368512DE7ED0F103520D36" : 9223372036854775807
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "3EE1CEB8-DC5D-4B33-82EE-51CA71900C02",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C" : "CocoaPods\/",
"9F9800D332981B4632368512DE7ED0F103520D36" : ""
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "Examples",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "examples\/watchOS Example\/Examples.xcworkspace",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:CocoaPods\/CocoaPods.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9B3204A8D3160EB3616BC7CB1D3FCCFBB4BF3F2C"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/CocoaPods\/Rainforest.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9F9800D332981B4632368512DE7ED0F103520D36"
}
]
}
\ No newline at end of file
examples/watchOS Example/watchOSsample.xcodeproj/project.pbxproj
View file @ 0d968362
...@@ -572,6 +572,7 @@ ...@@ -572,6 +572,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = org.vu0.watchOSsample; PRODUCT_BUNDLE_IDENTIFIER = org.vu0.watchOSsample;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
}; };
name = Debug; name = Debug;
}; };
...@@ -584,6 +585,7 @@ ...@@ -584,6 +585,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = org.vu0.watchOSsample; PRODUCT_BUNDLE_IDENTIFIER = org.vu0.watchOSsample;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
}; };
name = Release; name = Release;
}; };
...@@ -598,6 +600,7 @@ ...@@ -598,6 +600,7 @@
PRODUCT_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos; SDKROOT = watchos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = 4; TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2; WATCHOS_DEPLOYMENT_TARGET = 2.2;
}; };
...@@ -614,6 +617,7 @@ ...@@ -614,6 +617,7 @@
PRODUCT_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos; SDKROOT = watchos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = 4; TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2; WATCHOS_DEPLOYMENT_TARGET = 2.2;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment