Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Installation method agnostic #5

Merged
merged 7 commits into from
Dec 17, 2015
Merged

Installation method agnostic #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2fac5f5
removed pod frameworks
Dec 17, 2015
73c2c71
changed deployment target to match sdk
Dec 17, 2015
77c0b5c
removed pod build phases
Dec 17, 2015
3eb4350
added linked frameworks manually
Dec 17, 2015
7a5d35a
inherit other linker flags
Dec 17, 2015
e09662b
Re-adding placeholder access token
Dec 17, 2015
78b7985
check for default value
kwhinnery Dec 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 36 additions & 71 deletions VideoQuickStart.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,31 @@
objects = {

/* Begin PBXBuildFile section */
304A80C11C23350000CB8C03 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 304A80C01C23350000CB8C03 /* libc++.tbd */; };
304A80C31C23350500CB8C03 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 304A80C21C23350500CB8C03 /* AudioToolbox.framework */; };
304A80C51C23350A00CB8C03 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 304A80C41C23350A00CB8C03 /* VideoToolbox.framework */; };
304A80C71C23351000CB8C03 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 304A80C61C23351000CB8C03 /* AVFoundation.framework */; };
304A80C91C23351600CB8C03 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 304A80C81C23351600CB8C03 /* CoreTelephony.framework */; };
304A80CB1C23351B00CB8C03 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 304A80CA1C23351B00CB8C03 /* GLKit.framework */; };
304A80CD1C23352100CB8C03 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 304A80CC1C23352100CB8C03 /* CoreMedia.framework */; };
304A80CF1C23352700CB8C03 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 304A80CE1C23352700CB8C03 /* SystemConfiguration.framework */; };
8B79D46A1C2252A100489AA5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B79D4691C2252A100489AA5 /* AppDelegate.swift */; };
8B79D46C1C2252A100489AA5 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B79D46B1C2252A100489AA5 /* ViewController.swift */; };
8B79D46F1C2252A100489AA5 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8B79D46D1C2252A100489AA5 /* Main.storyboard */; };
8B79D4711C2252A100489AA5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8B79D4701C2252A100489AA5 /* Assets.xcassets */; };
8B79D4741C2252A100489AA5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8B79D4721C2252A100489AA5 /* LaunchScreen.storyboard */; };
8B9921771C225C1E00DC3BCA /* SwiftyJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B9921761C225C1E00DC3BCA /* SwiftyJSON.swift */; };
A4ADB4CC9C5A87B18F6CBEC0 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC661054F23B83854509E6B /* libPods.a */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
7CC661054F23B83854509E6B /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
7F14455A0C0F97E4136AE1F4 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
304A80C01C23350000CB8C03 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
304A80C21C23350500CB8C03 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
304A80C41C23350A00CB8C03 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
304A80C61C23351000CB8C03 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
304A80C81C23351600CB8C03 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
304A80CA1C23351B00CB8C03 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
304A80CC1C23352100CB8C03 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
304A80CE1C23352700CB8C03 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
8B79D4661C2252A100489AA5 /* VideoQuickStart.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VideoQuickStart.app; sourceTree = BUILT_PRODUCTS_DIR; };
8B79D4691C2252A100489AA5 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
8B79D46B1C2252A100489AA5 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand All @@ -28,34 +41,38 @@
8B79D4751C2252A100489AA5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8B9921761C225C1E00DC3BCA /* SwiftyJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftyJSON.swift; sourceTree = "<group>"; };
8B9921781C225C6700DC3BCA /* VideoQuickStartBridgingHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VideoQuickStartBridgingHeader.h; sourceTree = "<group>"; };
F9D8095B8EA04DE69649CF03 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
8B79D4631C2252A100489AA5 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A4ADB4CC9C5A87B18F6CBEC0 /* libPods.a in Frameworks */,
304A80CF1C23352700CB8C03 /* SystemConfiguration.framework in Frameworks */,
304A80CD1C23352100CB8C03 /* CoreMedia.framework in Frameworks */,
304A80CB1C23351B00CB8C03 /* GLKit.framework in Frameworks */,
304A80C91C23351600CB8C03 /* CoreTelephony.framework in Frameworks */,
304A80C71C23351000CB8C03 /* AVFoundation.framework in Frameworks */,
304A80C51C23350A00CB8C03 /* VideoToolbox.framework in Frameworks */,
304A80C31C23350500CB8C03 /* AudioToolbox.framework in Frameworks */,
304A80C11C23350000CB8C03 /* libc++.tbd in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
51D6D47CB8ECCEA1EB9AC69B /* Pods */ = {
isa = PBXGroup;
children = (
F9D8095B8EA04DE69649CF03 /* Pods.debug.xcconfig */,
7F14455A0C0F97E4136AE1F4 /* Pods.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
5A82245B3CA8AD8931FA33E9 /* Frameworks */ = {
isa = PBXGroup;
children = (
7CC661054F23B83854509E6B /* libPods.a */,
304A80CE1C23352700CB8C03 /* SystemConfiguration.framework */,
304A80CC1C23352100CB8C03 /* CoreMedia.framework */,
304A80CA1C23351B00CB8C03 /* GLKit.framework */,
304A80C81C23351600CB8C03 /* CoreTelephony.framework */,
304A80C61C23351000CB8C03 /* AVFoundation.framework */,
304A80C41C23350A00CB8C03 /* VideoToolbox.framework */,
304A80C21C23350500CB8C03 /* AudioToolbox.framework */,
304A80C01C23350000CB8C03 /* libc++.tbd */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -65,7 +82,6 @@
children = (
8B79D4681C2252A100489AA5 /* VideoQuickStart */,
8B79D4671C2252A100489AA5 /* Products */,
51D6D47CB8ECCEA1EB9AC69B /* Pods */,
5A82245B3CA8AD8931FA33E9 /* Frameworks */,
);
sourceTree = "<group>";
Expand Down Expand Up @@ -124,12 +140,9 @@
isa = PBXNativeTarget;
buildConfigurationList = 8B79D4781C2252A100489AA5 /* Build configuration list for PBXNativeTarget "VideoQuickStart" */;
buildPhases = (
B8D55EAC0011CE88DE441569 /* Check Pods Manifest.lock */,
8B79D4621C2252A100489AA5 /* Sources */,
8B79D4631C2252A100489AA5 /* Frameworks */,
8B79D4641C2252A100489AA5 /* Resources */,
55ACB98550C2314B7A6C5CF3 /* Embed Pods Frameworks */,
AA03B70BF437B8F404ED8F1A /* Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -186,54 +199,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
55ACB98550C2314B7A6C5CF3 /* 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/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
AA03B70BF437B8F404ED8F1A /* 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/Pods-resources.sh\"\n";
showEnvVarsInLog = 0;
};
B8D55EAC0011CE88DE441569 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
outputPaths = (
);
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";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
8B79D4621C2252A100489AA5 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -352,13 +317,13 @@
};
8B79D4791C2252A100489AA5 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F9D8095B8EA04DE69649CF03 /* Pods.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = VideoQuickStart/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.twilio.VideoQuickStart;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = VideoQuickStart/VideoQuickStartBridgingHeader.h;
Expand All @@ -367,13 +332,13 @@
};
8B79D47A1C2252A100489AA5 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7F14455A0C0F97E4136AE1F4 /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = VideoQuickStart/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.twilio.VideoQuickStart;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = VideoQuickStart/VideoQuickStartBridgingHeader.h;
Expand Down
5 changes: 5 additions & 0 deletions VideoQuickStart/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
}
],
"info" : {
Expand Down
5 changes: 3 additions & 2 deletions VideoQuickStart/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ViewController: UIViewController {

// Configure access token manually for testing, if desired! Create one manually in the console
// at https://www.twilio.com/user/account/video/dev-tools/testing-tools
var accessToken = ""
var accessToken = "TWILIO_ACCESS_TOKEN"

// Configure remote URL to fetch token from
var tokenUrl = "http://localhost:8000/token.php"
Expand Down Expand Up @@ -49,7 +49,8 @@ class ViewController: UIViewController {
super.viewDidLoad()

// Configure access token either from server or manually
if self.accessToken.isEmpty {
// If the default wasn't changed, try fetching from server
if self.accessToken == "TWILIO_ACCESS_TOKEN" {
// If the token wasn't configured manually, try to fetch it from server
let config = NSURLSessionConfiguration.defaultSessionConfiguration()
let session = NSURLSession(configuration: config, delegate: nil, delegateQueue: nil)
Expand Down