Skip to content

Commit

Permalink
v3.0 Beta 4
Browse files Browse the repository at this point in the history
  • Loading branch information
Harold committed Jun 3, 2016
1 parent 495228c commit a5da1c9
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 57 deletions.
45 changes: 24 additions & 21 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,22 @@ PODS:
- CocoaLumberjack/Core
- CocoaLumberjack/Extensions (2.3.0):
- CocoaLumberjack/Default
- Google/Analytics (2.0.4):
- FirebaseAnalytics (3.2.0):
- FirebaseInstanceID (~> 1.0)
- GoogleInterchangeUtilities (~> 1.2)
- GoogleSymbolUtilities (~> 1.1)
- GoogleUtilities (~> 1.3)
- FirebaseInstanceID (1.0.6)
- Google/Analytics (3.0.3):
- Google/Core
- GoogleAnalytics (~> 3.12)
- Google/Core (2.0.4):
- GoogleInterchangeUtilities (~> 1.0)
- GoogleNetworkingUtilities (~> 1.0)
- GoogleSymbolUtilities (~> 1.0)
- GoogleUtilities (~> 1.1)
- Google/Core (3.0.3):
- FirebaseAnalytics (~> 3.2)
- GoogleAnalytics (3.14.0)
- GoogleInterchangeUtilities (1.2.0):
- GoogleSymbolUtilities (~> 1.0)
- GoogleNetworkingUtilities (1.2.0):
- GoogleInterchangeUtilities (1.2.1):
- GoogleSymbolUtilities (~> 1.0)
- GoogleSymbolUtilities (1.1.0)
- GoogleUtilities (1.3.0):
- GoogleSymbolUtilities (1.1.1)
- GoogleUtilities (1.3.1):
- GoogleSymbolUtilities (~> 1.0)
- HDLumberjackLogFormatter (2.0.0):
- CocoaLumberjack
Expand Down Expand Up @@ -83,9 +84,10 @@ PODS:
- SimulatorStatusMagic (1.8)
- SSKeychain (1.4.0)
- SVProgressHUD (2.0.3)
- Vialer-pjsip-iOS (0.0.6)
- VialerSIPLib-iOS (0.0.24):
- Vialer-pjsip-iOS (0.0.7)
- VialerSIPLib-iOS (0.0.26):
- CocoaLumberjack (~> 2.2)
- Reachability
- Vialer-pjsip-iOS

DEPENDENCIES:
Expand Down Expand Up @@ -122,12 +124,13 @@ SPEC CHECKSUMS:
AFNetworkActivityLogger: 121486778117d53b3ab1c61d264b88081d0c3eee
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
CocoaLumberjack: 97fab7ee5f507fe54445cca7ea80f926729cfd15
Google: d0932824c5b97c96be489aa6f4e8cd6c294d637d
FirebaseAnalytics: 6f75b04e6bfb8e0b6e9ef298e04c24eea3b13863
FirebaseInstanceID: d014d574053a2fe84478f12f7bae96979e7051bb
Google: 813c467362eabc11385f5a5cc9ad0cb651a58f4e
GoogleAnalytics: 9be1afdb8deeac4bb5f13ca7f7d3b9db2a1f43dc
GoogleInterchangeUtilities: 427382e42d8a340038bec37c6fdfd316e14b5fa2
GoogleNetworkingUtilities: ec1e9911aca811eb18b7144394fee6168b607785
GoogleSymbolUtilities: eb3965ea12710569c7b80db198a39e39b18613f7
GoogleUtilities: 5c653f7df2eedf0ce0efdfe5afe4f831f375fd7a
GoogleInterchangeUtilities: def8415a862effc67d549d5b5b0b9c7a2f97d4de
GoogleSymbolUtilities: 33117db1b5f290c6fbf259585e4885b4c84b98d7
GoogleUtilities: 56c5ac05b7aa5dc417a1bb85221a9516e04d7032
HDLumberjackLogFormatter: c8d6015a1041ced2ff4720dbb0b8991bccb9f1ab
HTCopyableLabel: e67c190d2f1f8f03c9d9858a7d8ce33be7fb43fa
MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0
Expand All @@ -139,9 +142,9 @@ SPEC CHECKSUMS:
SimulatorStatusMagic: 4dbf0faa0208e9ac0d56cea06eaa5f7a5f3d02fb
SSKeychain: c71293fa57216a40ab06c23f4085387583293de4
SVProgressHUD: b0830714205bea1317ea1a2ebc71e5633af334d4
Vialer-pjsip-iOS: 63c7bb430ddbe564c5914e59018637bcf7cbe608
VialerSIPLib-iOS: f261348419a1bfb709c3a79872e54f2ac42d981e
Vialer-pjsip-iOS: f56c29e0b34e40410acef67afeaa8c23e775ac16
VialerSIPLib-iOS: c3b206906fb7bfabff086133539f0824f41808eb

PODFILE CHECKSUM: 247588f3b8f20091659fe53fcd642a443b4e1860

COCOAPODS: 1.0.0
COCOAPODS: 1.0.1
58 changes: 29 additions & 29 deletions Vialer.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@
F275FDAF1C5FA253006AEEA2 /* APNSHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = F275FDAE1C5FA253006AEEA2 /* APNSHandler.m */; };
F275FDB21C608BA4006AEEA2 /* APNSHandlerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F275FDB11C608BA4006AEEA2 /* APNSHandlerTests.m */; };
F2A7AEF51CF332D800889DD8 /* ReachabilityBarViewControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F2A7AEF41CF332D700889DD8 /* ReachabilityBarViewControllerTests.m */; };
F2A7AEFB1CF4757600889DD8 /* TestKVOObserverClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F2A7AEFA1CF4757600889DD8 /* TestKVOObserverClass.m */; };
F2A7AEF81CF34E4900889DD8 /* TestReachabilityManagerDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F2A7AEF71CF34E4900889DD8 /* TestReachabilityManagerDelegate.m */; };
F2A7AEFB1CF4757600889DD8 /* TestKVOObserverClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F2A7AEFA1CF4757600889DD8 /* TestKVOObserverClass.m */; };
F2A7DAC11BF4A14A0078B35D /* SystemUserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F2A7DAC01BF4A14A0078B35D /* SystemUserTests.m */; };
F2B3C64F1CC9130200F8BF53 /* Snapshot-Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4234D441C60ED13005710B7 /* Snapshot-Constants.swift */; };
F2B40BDE1C731F3E00502769 /* Middleware.m in Sources */ = {isa = PBXBuildFile; fileRef = F2B40BDB1C731F3E00502769 /* Middleware.m */; };
Expand Down Expand Up @@ -485,9 +485,9 @@
F2872E2F1CC8CF6000D3ACB0 /* Snapfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Snapfile; sourceTree = "<group>"; };
F2A7AEF41CF332D700889DD8 /* ReachabilityBarViewControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReachabilityBarViewControllerTests.m; sourceTree = "<group>"; };
F2A7AEF61CF34E4900889DD8 /* TestReachabilityManagerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestReachabilityManagerDelegate.h; sourceTree = "<group>"; };
F2A7AEF71CF34E4900889DD8 /* TestReachabilityManagerDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestReachabilityManagerDelegate.m; sourceTree = "<group>"; };
F2A7AEF91CF4757600889DD8 /* TestKVOObserverClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestKVOObserverClass.h; sourceTree = "<group>"; };
F2A7AEFA1CF4757600889DD8 /* TestKVOObserverClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestKVOObserverClass.m; sourceTree = "<group>"; };
F2A7AEF71CF34E4900889DD8 /* TestReachabilityManagerDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestReachabilityManagerDelegate.m; sourceTree = "<group>"; };
F2A7DAC01BF4A14A0078B35D /* SystemUserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SystemUserTests.m; sourceTree = "<group>"; };
F2B40BDA1C731F3E00502769 /* Middleware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Middleware.h; sourceTree = "<group>"; };
F2B40BDB1C731F3E00502769 /* Middleware.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Middleware.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1670,15 +1670,15 @@
isa = PBXNativeTarget;
buildConfigurationList = C41FD8CA1C60A08400BBE6D7 /* Build configuration list for PBXNativeTarget "Voys" */;
buildPhases = (
CB4D755316F30B7F97E17449 /* 📦 Check Pods Manifest.lock */,
CB4D755316F30B7F97E17449 /* [CP] Check Pods Manifest.lock */,
C41FD8571C60A08400BBE6D7 /* Sources */,
C41FD88E1C60A08400BBE6D7 /* Frameworks */,
C41FD8A61C60A08400BBE6D7 /* Resources */,
C41FD8C51C60A08400BBE6D7 /* Update Version number */,
C41FD8C61C60A08400BBE6D7 /* Update Build number */,
C41FD8C71C60A08400BBE6D7 /* Embed Frameworks */,
382BCA50B55F303F9D6BF46C /* 📦 Embed Pods Frameworks */,
6C79F00C2DF4042B2C7C7FFF /* 📦 Copy Pods Resources */,
382BCA50B55F303F9D6BF46C /* [CP] Embed Pods Frameworks */,
6C79F00C2DF4042B2C7C7FFF /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -1711,12 +1711,12 @@
isa = PBXNativeTarget;
buildConfigurationList = C4F49F2E1BF0B45700C25159 /* Build configuration list for PBXNativeTarget "VialerTests" */;
buildPhases = (
4DFC09E18AE1FE43ABB3E46C /* 📦 Check Pods Manifest.lock */,
4DFC09E18AE1FE43ABB3E46C /* [CP] Check Pods Manifest.lock */,
C4F49F231BF0B45700C25159 /* Sources */,
C4F49F241BF0B45700C25159 /* Frameworks */,
C4F49F251BF0B45700C25159 /* Resources */,
07833F6B14C0EE54FC6B830F /* 📦 Embed Pods Frameworks */,
D2C68056AA86FC8678B941F2 /* 📦 Copy Pods Resources */,
07833F6B14C0EE54FC6B830F /* [CP] Embed Pods Frameworks */,
D2C68056AA86FC8678B941F2 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -1750,15 +1750,15 @@
isa = PBXNativeTarget;
buildConfigurationList = FB4226FE182261D200707349 /* Build configuration list for PBXNativeTarget "Vialer" */;
buildPhases = (
20B165A0DEA7287824F30DD2 /* 📦 Check Pods Manifest.lock */,
20B165A0DEA7287824F30DD2 /* [CP] Check Pods Manifest.lock */,
FB4226C9182261D200707349 /* Sources */,
FB4226CA182261D200707349 /* Frameworks */,
FB4226CB182261D200707349 /* Resources */,
F298A9741B5E28D100467E31 /* Update Version number */,
F217146F1B54F4F00078B0A0 /* Update Build number */,
3D1A5E8E1AE6308500DBE64B /* Embed Frameworks */,
C26A2F1F62DA3526B1E57F25 /* 📦 Embed Pods Frameworks */,
EB6E7B83E0AF42709163E492 /* 📦 Copy Pods Resources */,
C26A2F1F62DA3526B1E57F25 /* [CP] Embed Pods Frameworks */,
EB6E7B83E0AF42709163E492 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -1938,89 +1938,89 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
07833F6B14C0EE54FC6B830F /* 📦 Embed Pods Frameworks */ = {
07833F6B14C0EE54FC6B830F /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VialerTests/Pods-VialerTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
20B165A0DEA7287824F30DD2 /* 📦 Check Pods Manifest.lock */ = {
20B165A0DEA7287824F30DD2 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Check Pods Manifest.lock";
name = "[CP] 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;
};
382BCA50B55F303F9D6BF46C /* 📦 Embed Pods Frameworks */ = {
382BCA50B55F303F9D6BF46C /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Voys/Pods-Voys-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
4DFC09E18AE1FE43ABB3E46C /* 📦 Check Pods Manifest.lock */ = {
4DFC09E18AE1FE43ABB3E46C /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Check Pods Manifest.lock";
name = "[CP] 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;
};
6C79F00C2DF4042B2C7C7FFF /* 📦 Copy Pods Resources */ = {
6C79F00C2DF4042B2C7C7FFF /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Voys/Pods-Voys-resources.sh\"\n";
showEnvVarsInLog = 0;
};
C26A2F1F62DA3526B1E57F25 /* 📦 Embed Pods Frameworks */ = {
C26A2F1F62DA3526B1E57F25 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -2057,44 +2057,44 @@
shellScript = "\"${SRCROOT}/scripts/update_build_number.sh\"";
showEnvVarsInLog = 0;
};
CB4D755316F30B7F97E17449 /* 📦 Check Pods Manifest.lock */ = {
CB4D755316F30B7F97E17449 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Check Pods Manifest.lock";
name = "[CP] 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;
};
D2C68056AA86FC8678B941F2 /* 📦 Copy Pods Resources */ = {
D2C68056AA86FC8678B941F2 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VialerTests/Pods-VialerTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
EB6E7B83E0AF42709163E492 /* 📦 Copy Pods Resources */ = {
EB6E7B83E0AF42709163E492 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
4 changes: 2 additions & 2 deletions Vialer.xcodeproj/xcshareddata/xcschemes/Vialer.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
buildConfiguration = "AdHocDistribution"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
Expand Down Expand Up @@ -108,7 +108,7 @@
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
buildConfiguration = "Release">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
Expand Down
22 changes: 19 additions & 3 deletions Vialer.xcodeproj/xcshareddata/xcschemes/Voys.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,27 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
buildConfiguration = "AdHocDistribution"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C4F49F261BF0B45700C25159"
BuildableName = "VialerTests.xctest"
BlueprintName = "VialerTests"
ReferencedContainer = "container:Vialer.xcodeproj">
</BuildableReference>
<SkippedTests>
<Test
Identifier = "TwoStepCallTests/testNotificationObserverIsRemovedWhenDealloced">
</Test>
</SkippedTests>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
Expand Down Expand Up @@ -90,7 +106,7 @@
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
buildConfiguration = "Release">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ - (void)testUpdateDeviceRecordFail502 {
//Then
NSHTTPURLResponse *response = [[error userInfo] objectForKey:AFNetworkingOperationFailingURLResponseErrorKey];
XCTAssert(response.statusCode == statusCodeToReturn,
@"Unexpected HTTP status code returned, expected: %d, received: %ld", statusCodeToReturn, response.statusCode);
@"Unexpected HTTP status code returned, expected: %d, received: %ld", statusCodeToReturn, (long)response.statusCode);
}
[expectation fulfill];
}];
Expand Down Expand Up @@ -98,7 +98,7 @@ - (void)testSentCallResponseFailsWith408 {
//Then
NSHTTPURLResponse *response = [[error userInfo] objectForKey:AFNetworkingOperationFailingURLResponseErrorKey];
XCTAssert(response.statusCode == statusCodeToReturn,
@"Unexpected HTTP status code returned, expected: %d, received: %ld", statusCodeToReturn, response.statusCode);
@"Unexpected HTTP status code returned, expected: %d, received: %ld", statusCodeToReturn, (long)response.statusCode);

}
[expectation fulfill];
Expand Down
1 change: 1 addition & 0 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ platform :ios do
username: ENV["ITC_USERNAME"],
team_name: ENV["APP_TEAM"],
skip_submission: true,
skip_waiting_for_build_processing: true,
)

slack(
Expand Down

0 comments on commit a5da1c9

Please sign in to comment.