Skip to content

Commit 8709abe

Browse files
tjeerdintveentjeerdintveen
authored
Merge pull request #111 from tus/maintenance/dependency-cleanup
Maintenance/dependency cleanup
2 parents 54ed608 + c3183d9 commit 8709abe

File tree

7 files changed

+144
-267
lines changed

7 files changed

+144
-267
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Changelog
2+
3+
## Upcoming version
4+
5+
- [MINOR] Example project runs again
6+
- [MINOR] Removed POD dependencies in lockfile

‎Example/Podfile‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,8 @@ use_frameworks!
22

33
target 'TUSKit_Example' do
44
pod 'TUSKit', :path => '../'
5-
pod 'TLPhotoPicker'
65

76
target 'TUSKit_Tests' do
87
inherit! :search_paths
9-
pod 'AppSpectorSDK'
10-
pod 'Quick', '~> 1.2.0'
11-
pod 'Nimble', '~> 7.0'
12-
pod 'FBSnapshotTestCase' , '~> 2.1.4'
13-
pod 'Nimble-Snapshots' , '~> 6.3.0'
148
end
159
end

‎Example/Podfile.lock‎

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,16 @@
11
PODS:
2-
- AppSpectorSDK (1.2.9)
3-
- FBSnapshotTestCase (2.1.4):
4-
- FBSnapshotTestCase/SwiftSupport (= 2.1.4)
5-
- FBSnapshotTestCase/Core (2.1.4)
6-
- FBSnapshotTestCase/SwiftSupport (2.1.4):
7-
- FBSnapshotTestCase/Core
8-
- Nimble (7.3.4)
9-
- Nimble-Snapshots (6.3.0):
10-
- Nimble-Snapshots/Core (= 6.3.0)
11-
- Nimble-Snapshots/Core (6.3.0):
12-
- FBSnapshotTestCase (~> 2.0)
13-
- Nimble (~> 7.0)
14-
- Quick (1.2.0)
15-
- TLPhotoPicker (2.1.3)
16-
- TUSKit (2.0.0)
2+
- TUSKit (2.1.0)
173

184
DEPENDENCIES:
19-
- AppSpectorSDK
20-
- FBSnapshotTestCase (~> 2.1.4)
21-
- Nimble (~> 7.0)
22-
- Nimble-Snapshots (~> 6.3.0)
23-
- Quick (~> 1.2.0)
24-
- TLPhotoPicker
255
- TUSKit (from `../`)
266

27-
SPEC REPOS:
28-
trunk:
29-
- AppSpectorSDK
30-
- FBSnapshotTestCase
31-
- Nimble
32-
- Nimble-Snapshots
33-
- Quick
34-
- TLPhotoPicker
35-
367
EXTERNAL SOURCES:
378
TUSKit:
389
:path: "../"
3910

4011
SPEC CHECKSUMS:
41-
AppSpectorSDK: 7e24097809d39d868e9ecdc76377fd519ac95aa6
42-
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
43-
Nimble: 051e3d8912d40138fa5591c78594f95fb172af37
44-
Nimble-Snapshots: f5459b5b091678dc942d03ec4741cacb58ba4a52
45-
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
46-
TLPhotoPicker: 2c4a20d62952bd368edbf44d18476f663a718ada
47-
TUSKit: befb40e402aae1ee35a6b2b1edda26416bd0e473
12+
TUSKit: 1a935c22c0719dee2f00d2767f01fcea63ae2aa0
4813

49-
PODFILE CHECKSUM: 56e9b6c1fa8da25eda882f2eaba8707f765eb8e1
14+
PODFILE CHECKSUM: de359d918c991c88499eaaf36013a47b21196991
5015

5116
COCOAPODS: 1.10.1

‎Example/TUSKit.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
4D3BD4E125328B0F00084000 /* UploadTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D3BD4E025328B0F00084000 /* UploadTest.swift */; };
1111
4D3BD4E325328D4400084000 /* memeCat.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 4D3BD4E225328D4400084000 /* memeCat.jpg */; };
1212
4DA4E6EB2488BA8700F4581F /* test.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 4DA4E6EA2488BA8700F4581F /* test.mp4 */; };
13-
4DE4B777247B7258009E5E4C /* TLPhotoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DE4B775247B7258009E5E4C /* TLPhotoViewController.swift */; };
1413
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
1514
607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; };
1615
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
@@ -37,7 +36,6 @@
3736
4D3BD4E025328B0F00084000 /* UploadTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadTest.swift; sourceTree = "<group>"; };
3837
4D3BD4E225328D4400084000 /* memeCat.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = memeCat.jpg; sourceTree = "<group>"; };
3938
4DA4E6EA2488BA8700F4581F /* test.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = test.mp4; sourceTree = "<group>"; };
40-
4DE4B775247B7258009E5E4C /* TLPhotoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TLPhotoViewController.swift; sourceTree = "<group>"; };
4139
607FACD01AFB9204008FA782 /* TUSKit_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TUSKit_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
4240
607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4341
607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -115,7 +113,6 @@
115113
607FACDC1AFB9204008FA782 /* Images.xcassets */,
116114
607FACDE1AFB9204008FA782 /* LaunchScreen.xib */,
117115
607FACD31AFB9204008FA782 /* Supporting Files */,
118-
4DE4B775247B7258009E5E4C /* TLPhotoViewController.swift */,
119116
);
120117
name = "Example for TUSKit";
121118
path = TUSKit;
@@ -198,7 +195,6 @@
198195
607FACE11AFB9204008FA782 /* Sources */,
199196
607FACE21AFB9204008FA782 /* Frameworks */,
200197
607FACE31AFB9204008FA782 /* Resources */,
201-
79C99260D816B9FAB1198C6C /* [CP] Embed Pods Frameworks */,
202198
);
203199
buildRules = (
204200
);
@@ -327,45 +323,17 @@
327323
);
328324
inputPaths = (
329325
"${PODS_ROOT}/Target Support Files/Pods-TUSKit_Example/Pods-TUSKit_Example-frameworks.sh",
330-
"${BUILT_PRODUCTS_DIR}/TLPhotoPicker/TLPhotoPicker.framework",
331326
"${BUILT_PRODUCTS_DIR}/TUSKit/TUSKit.framework",
332327
);
333328
name = "[CP] Embed Pods Frameworks";
334329
outputPaths = (
335-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TLPhotoPicker.framework",
336330
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TUSKit.framework",
337331
);
338332
runOnlyForDeploymentPostprocessing = 0;
339333
shellPath = /bin/sh;
340334
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TUSKit_Example/Pods-TUSKit_Example-frameworks.sh\"\n";
341335
showEnvVarsInLog = 0;
342336
};
343-
79C99260D816B9FAB1198C6C /* [CP] Embed Pods Frameworks */ = {
344-
isa = PBXShellScriptBuildPhase;
345-
buildActionMask = 2147483647;
346-
files = (
347-
);
348-
inputPaths = (
349-
"${PODS_ROOT}/Target Support Files/Pods-TUSKit_Tests/Pods-TUSKit_Tests-frameworks.sh",
350-
"${PODS_ROOT}/AppSpectorSDK/AppSpectorSDK.framework",
351-
"${BUILT_PRODUCTS_DIR}/FBSnapshotTestCase/FBSnapshotTestCase.framework",
352-
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
353-
"${BUILT_PRODUCTS_DIR}/Nimble-Snapshots/Nimble_Snapshots.framework",
354-
"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
355-
);
356-
name = "[CP] Embed Pods Frameworks";
357-
outputPaths = (
358-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AppSpectorSDK.framework",
359-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSnapshotTestCase.framework",
360-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework",
361-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble_Snapshots.framework",
362-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework",
363-
);
364-
runOnlyForDeploymentPostprocessing = 0;
365-
shellPath = /bin/sh;
366-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TUSKit_Tests/Pods-TUSKit_Tests-frameworks.sh\"\n";
367-
showEnvVarsInLog = 0;
368-
};
369337
/* End PBXShellScriptBuildPhase section */
370338

371339
/* Begin PBXSourcesBuildPhase section */
@@ -375,7 +343,6 @@
375343
files = (
376344
607FACD81AFB9204008FA782 /* ViewController.swift in Sources */,
377345
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */,
378-
4DE4B777247B7258009E5E4C /* TLPhotoViewController.swift in Sources */,
379346
);
380347
runOnlyForDeploymentPostprocessing = 0;
381348
};

‎Example/TUSKit/Base.lproj/Main.storyboard‎

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
33
<device id="retina4_7" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
77
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
88
</dependencies>
99
<scenes>
@@ -19,14 +19,14 @@
1919
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
2020
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
2121
<subviews>
22-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8Ah-xZ-IKx">
22+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8Ah-xZ-IKx">
2323
<rect key="frame" x="145" y="332" width="85" height="30"/>
2424
<state key="normal" title="Upload Files"/>
2525
<connections>
2626
<action selector="uploadAction:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="XO4-Hd-j6t"/>
2727
</connections>
2828
</button>
29-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="npe-mI-BQB">
29+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="npe-mI-BQB">
3030
<rect key="frame" x="161.5" y="294" width="52" height="30"/>
3131
<state key="normal" title="Add file"/>
3232
<connections>
@@ -46,7 +46,7 @@
4646
<nil key="highlightedColor"/>
4747
</label>
4848
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="# of files uploaded" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cR9-w5-0PQ">
49-
<rect key="frame" x="116.5" y="267" width="142" height="21"/>
49+
<rect key="frame" x="117" y="267" width="141" height="21"/>
5050
<fontDescription key="fontDescription" type="system" pointSize="17"/>
5151
<nil key="textColor"/>
5252
<nil key="highlightedColor"/>
@@ -58,16 +58,8 @@
5858
<nil key="highlightedColor"/>
5959
</label>
6060
<progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SkZ-Hi-3fU">
61-
<rect key="frame" x="16" y="399" width="343" height="2"/>
61+
<rect key="frame" x="16" y="399" width="343" height="4"/>
6262
</progressView>
63-
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sjf-P8-2i2">
64-
<rect key="frame" x="158" y="131" width="58" height="30"/>
65-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
66-
<state key="normal" title="TLPhoto"/>
67-
<connections>
68-
<segue destination="ga3-te-7hI" kind="show" id="sqe-P0-KYN"/>
69-
</connections>
70-
</button>
7163
</subviews>
7264
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
7365
<constraints>
@@ -103,24 +95,5 @@
10395
</objects>
10496
<point key="canvasLocation" x="136.80000000000001" y="124.58770614692655"/>
10597
</scene>
106-
<!--Photo View Controller-->
107-
<scene sceneID="HEw-EH-B4X">
108-
<objects>
109-
<viewController id="ga3-te-7hI" customClass="TLPhotoViewController" customModule="TUSKit_Example" customModuleProvider="target" sceneMemberID="viewController">
110-
<layoutGuides>
111-
<viewControllerLayoutGuide type="top" id="Ks8-WA-UOY"/>
112-
<viewControllerLayoutGuide type="bottom" id="jeM-El-JII"/>
113-
</layoutGuides>
114-
<view key="view" contentMode="scaleToFill" id="fPc-NN-8sn">
115-
<rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
116-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
117-
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
118-
</view>
119-
<navigationItem key="navigationItem" id="Mt8-kx-dAC"/>
120-
</viewController>
121-
<placeholder placeholderIdentifier="IBFirstResponder" id="m8D-YU-zbU" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
122-
</objects>
123-
<point key="canvasLocation" x="961" y="125"/>
124-
</scene>
12598
</scenes>
12699
</document>

‎Example/TUSKit/TLPhotoViewController.swift‎

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)