Skip to content

Commit

Permalink
Merge pull request #83 from vineetchoudhary/development
Browse files Browse the repository at this point in the history 
Added build number & Updated dependencies
  • Loading branch information
@vineetchoudhary
vineetchoudhary authored Nov 13, 2017
2 parents b9d004d + 86f4713 commit 7eed5df
Show file tree
Hide file tree
Showing 1,378 changed files with 49,483 additions and 26,889 deletions.
6 changes: 5 additions & 1 deletion AppBox.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
DB425C051F8A517D008CB032 /* DefaultSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = DB425C041F8A517D008CB032 /* DefaultSettings.m */; };
DB45B45B1F6EC5EE0041EB42 /* PythonServer.sh in Resources */ = {isa = PBXBuildFile; fileRef = DB3D7CC81F64501F00217096 /* PythonServer.sh */; };
DB45B45C1F6EC5F10041EB42 /* SwitchXcode.sh in Resources */ = {isa = PBXBuildFile; fileRef = DB45B4591F6EC3B80041EB42 /* SwitchXcode.sh */; };
DB5F8E991FB880FB009C3BD0 /* XcodeVersion.sh in Resources */ = {isa = PBXBuildFile; fileRef = DB5F8E981FB87C79009C3BD0 /* XcodeVersion.sh */; };
DBDCFBBE1F99C7860022097B /* UploadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DBDCFBBD1F99C7860022097B /* UploadManager.m */; };
DBF290D71FA64A590046D5CE /* ProvisioningDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DBF290D51FA64A590046D5CE /* ProvisioningDetailsViewController.m */; };
DBF290D81FA64A590046D5CE /* ProvisioningDetailsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DBF290D61FA64A590046D5CE /* ProvisioningDetailsViewController.xib */; };
Expand Down Expand Up @@ -134,6 +135,7 @@
DB425C031F8A517D008CB032 /* DefaultSettings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DefaultSettings.h; sourceTree = "<group>"; };
DB425C041F8A517D008CB032 /* DefaultSettings.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DefaultSettings.m; sourceTree = "<group>"; };
DB45B4591F6EC3B80041EB42 /* SwitchXcode.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = SwitchXcode.sh; sourceTree = "<group>"; };
DB5F8E981FB87C79009C3BD0 /* XcodeVersion.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = XcodeVersion.sh; sourceTree = "<group>"; };
DBDCFBBC1F99C7860022097B /* UploadManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UploadManager.h; sourceTree = "<group>"; };
DBDCFBBD1F99C7860022097B /* UploadManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UploadManager.m; sourceTree = "<group>"; };
DBF290D41FA64A590046D5CE /* ProvisioningDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProvisioningDetailsViewController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -672,6 +674,7 @@
E1C024721E9B9DC700C87CC9 /* InstallPrivateKey.sh */,
DB3D7CC81F64501F00217096 /* PythonServer.sh */,
DB45B4591F6EC3B80041EB42 /* SwitchXcode.sh */,
DB5F8E981FB87C79009C3BD0 /* XcodeVersion.sh */,
);
path = Commands;
sourceTree = "<group>";
Expand Down Expand Up @@ -998,6 +1001,7 @@
9740CD411E005DB100224D9F /* Main.storyboard in Resources */,
E16D72E51E8912790031FB7C /* XCodePath.sh in Resources */,
DB45B45C1F6EC5F10041EB42 /* SwitchXcode.sh in Resources */,
DB5F8E991FB880FB009C3BD0 /* XcodeVersion.sh in Resources */,
E1D12EE81EC2F4360065E59A /* PreferencesTabViewController.xib in Resources */,
DB26297D1F95F35C00C4C647 /* AppBoxIcons.xcassets in Resources */,
E16437DF1D743A4E00CE8B7E /* Assets.xcassets in Resources */,
Expand Down Expand Up @@ -1061,7 +1065,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = "diff \"${PODS_ROOT}/../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";
showEnvVarsInLog = 0;
};
E1974F331E20CA770060F03F /* ShellScript */ = {
Expand Down
42 changes: 30 additions & 12 deletions AppBox/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -862,11 +862,11 @@ Gw
<objects>
<viewController id="PbW-uV-2L2" customClass="ITCLoginViewController" sceneMemberID="viewController">
<view key="view" id="22p-rt-iZL">
<rect key="frame" x="0.0" y="0.0" width="535" height="126"/>
<rect key="frame" x="0.0" y="0.0" width="535" height="144"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Po2-xN-nM2">
<rect key="frame" x="18" y="87" width="134" height="19"/>
<rect key="frame" x="18" y="77" width="134" height="19"/>
<constraints>
<constraint firstAttribute="width" constant="130" id="U2x-Xq-zhb"/>
</constraints>
Expand All @@ -877,7 +877,7 @@ Gw
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vkc-JU-DbO">
<rect key="frame" x="165" y="85" width="350" height="24"/>
<rect key="frame" x="165" y="75" width="350" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="350" id="MVD-Hc-QZD"/>
</constraints>
Expand All @@ -891,7 +891,7 @@ Gw
</connections>
</textField>
<comboBox verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="D65-om-pT7">
<rect key="frame" x="165" y="83" width="353" height="26"/>
<rect key="frame" x="165" y="73" width="353" height="26"/>
<comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="P05-jo-vV6">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -902,15 +902,15 @@ Gw
</connections>
</comboBox>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="beq-DX-d3f">
<rect key="frame" x="18" y="53" width="134" height="19"/>
<rect key="frame" x="18" y="43" width="134" height="19"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password" id="Bcx-DN-DL7">
<font key="font" metaFont="systemLight" size="15"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<secureTextField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gDv-1Z-wd2">
<rect key="frame" x="165" y="51" width="350" height="24"/>
<rect key="frame" x="165" y="41" width="350" height="24"/>
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Password" drawsBackground="YES" usesSingleLineMode="YES" id="0Lj-sX-iPw">
<font key="font" metaFont="systemLight" size="15"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -924,7 +924,7 @@ Gw
</connections>
</secureTextField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sjt-vM-8hr">
<rect key="frame" x="447" y="13" width="74" height="32"/>
<rect key="frame" x="447" y="3" width="74" height="32"/>
<buttonCell key="cell" type="push" title="Login" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="6tM-gW-nVX">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
Expand All @@ -934,7 +934,7 @@ Gw
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="f90-He-X67">
<rect key="frame" x="357" y="13" width="82" height="32"/>
<rect key="frame" x="357" y="3" width="82" height="32"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="hgJ-EJ-Kl5">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
Expand All @@ -947,10 +947,23 @@ Gw
</connections>
</button>
<progressIndicator hidden="YES" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="d4L-SC-RTJ">
<rect key="frame" x="20" y="23" width="16" height="16"/>
<rect key="frame" x="20" y="13" width="16" height="16"/>
</progressIndicator>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="6ir-tD-Xes">
<rect key="frame" x="0.0" y="107" width="535" height="5"/>
</box>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="z0x-KT-hae">
<rect key="frame" x="18" y="115" width="499" height="19"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Login with iTunes Connect" id="Sny-jA-ChF">
<font key="font" metaFont="systemLight" size="15"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
<constraints>
<constraint firstItem="z0x-KT-hae" firstAttribute="leading" secondItem="22p-rt-iZL" secondAttribute="leading" constant="20" id="4Vs-Kl-Hdz"/>
<constraint firstAttribute="trailing" secondItem="6ir-tD-Xes" secondAttribute="trailing" id="96W-aJ-XAb"/>
<constraint firstItem="D65-om-pT7" firstAttribute="centerY" secondItem="Vkc-JU-DbO" secondAttribute="centerY" id="9aM-Lz-SWg"/>
<constraint firstItem="beq-DX-d3f" firstAttribute="top" secondItem="Po2-xN-nM2" secondAttribute="bottom" constant="15" id="A9D-KP-3zh"/>
<constraint firstItem="Po2-xN-nM2" firstAttribute="centerY" secondItem="Vkc-JU-DbO" secondAttribute="centerY" id="DRn-44-7eU"/>
Expand All @@ -959,16 +972,21 @@ Gw
<constraint firstItem="d4L-SC-RTJ" firstAttribute="centerY" secondItem="f90-He-X67" secondAttribute="centerY" id="Iov-ex-sza"/>
<constraint firstItem="sjt-vM-8hr" firstAttribute="leading" secondItem="f90-He-X67" secondAttribute="trailing" constant="20" id="KLX-eg-f4o"/>
<constraint firstItem="Vkc-JU-DbO" firstAttribute="trailing" secondItem="gDv-1Z-wd2" secondAttribute="trailing" id="NYV-wF-ylA"/>
<constraint firstItem="6ir-tD-Xes" firstAttribute="leading" secondItem="22p-rt-iZL" secondAttribute="leading" id="Qks-fk-2ft"/>
<constraint firstItem="beq-DX-d3f" firstAttribute="leading" secondItem="d4L-SC-RTJ" secondAttribute="leading" id="Qzl-7p-HFp"/>
<constraint firstItem="6ir-tD-Xes" firstAttribute="top" secondItem="z0x-KT-hae" secondAttribute="bottom" constant="5" id="VOn-Fi-aDT"/>
<constraint firstItem="gDv-1Z-wd2" firstAttribute="leading" secondItem="beq-DX-d3f" secondAttribute="trailing" constant="15" id="Y5q-Lo-ejh"/>
<constraint firstItem="Vkc-JU-DbO" firstAttribute="leading" secondItem="Po2-xN-nM2" secondAttribute="trailing" constant="15" id="bic-SM-Km5"/>
<constraint firstAttribute="bottom" secondItem="sjt-vM-8hr" secondAttribute="bottom" constant="10" id="cyY-Rf-Q0q"/>
<constraint firstItem="f90-He-X67" firstAttribute="centerY" secondItem="sjt-vM-8hr" secondAttribute="centerY" id="djE-5K-rnV"/>
<constraint firstItem="Po2-xN-nM2" firstAttribute="leading" secondItem="beq-DX-d3f" secondAttribute="leading" id="e8I-hb-3hc"/>
<constraint firstItem="Vkc-JU-DbO" firstAttribute="top" secondItem="6ir-tD-Xes" secondAttribute="bottom" constant="10" id="iap-46-FAg"/>
<constraint firstItem="sjt-vM-8hr" firstAttribute="top" secondItem="gDv-1Z-wd2" secondAttribute="bottom" constant="10" id="j2g-jZ-wA9"/>
<constraint firstItem="Po2-xN-nM2" firstAttribute="trailing" secondItem="beq-DX-d3f" secondAttribute="trailing" id="mpz-gg-sTs"/>
<constraint firstAttribute="trailing" secondItem="Vkc-JU-DbO" secondAttribute="trailing" constant="20" id="pBb-T4-ma3"/>
<constraint firstItem="Po2-xN-nM2" firstAttribute="top" secondItem="22p-rt-iZL" secondAttribute="top" constant="20" id="qbZ-yX-Xhg"/>
<constraint firstItem="beq-DX-d3f" firstAttribute="centerY" secondItem="gDv-1Z-wd2" secondAttribute="centerY" id="qcg-MR-roN"/>
<constraint firstAttribute="trailing" secondItem="z0x-KT-hae" secondAttribute="trailing" constant="20" id="sWa-hg-Jvm"/>
<constraint firstItem="z0x-KT-hae" firstAttribute="top" secondItem="22p-rt-iZL" secondAttribute="top" constant="10" id="tfH-C3-t8V"/>
<constraint firstItem="gDv-1Z-wd2" firstAttribute="trailing" secondItem="sjt-vM-8hr" secondAttribute="trailing" id="ub8-kx-5nb"/>
<constraint firstItem="Po2-xN-nM2" firstAttribute="leading" secondItem="22p-rt-iZL" secondAttribute="leading" constant="20" id="y88-nq-Cbg"/>
</constraints>
Expand All @@ -984,7 +1002,7 @@ Gw
</viewController>
<customObject id="NPf-SP-fPu" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="75" y="1802"/>
<point key="canvasLocation" x="74.5" y="1817"/>
</scene>
<!--AppBox Dashboard-->
<scene sceneID="Nhl-bU-R4s">
Expand Down Expand Up @@ -1753,7 +1771,7 @@ Gw
</viewController>
<customObject id="EhG-Lb-deF" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="75" y="1527"/>
<point key="canvasLocation" x="74.5" y="1527"/>
</scene>
<!--ShowLink-->
<scene sceneID="Wfl-7U-Izx">
Expand Down
9 changes: 9 additions & 0 deletions AppBox/Commands/XcodeVersion.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh

# XcodeVersion.sh
# AppBox
#
# Created by Vineet Choudhary on 12/11/17.
# Copyright © 2017 Developer Insider. All rights reserved.

xcodebuild -version | grep Xcode
Loading

0 comments on commit 7eed5df

Please sign in to comment.