Skip to content

Commit

Permalink
Merge pull request #6 from transloadit/development
Browse files Browse the repository at this point in the history
1.0.2 Patch
  • Loading branch information
MMasterson authored Apr 18, 2018
2 parents 0a27d77 + 14f6bfe commit c4e1328
Show file tree
Hide file tree
Showing 77 changed files with 1,529 additions and 2,332 deletions.
Binary file removed Example/.Podfile.swp
Binary file not shown.
13 changes: 13 additions & 0 deletions Example/CommonCrypto.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// CommonCrypto.xcconfig
// Transloadit
//
// Created by Mark Masterson on 2/20/18.
// Copyright © 2018 Mark R. Masterson. All rights reserved.
//
MODULEMAP_FILE[sdk=iphoneos*] = \
$(SRCROOT)/CommonCrypto/iphoneos.modulemap
MODULEMAP_FILE[sdk=iphonesimulator*] = \
$(SRCROOT)/CommonCrypto/iphonesimulator.modulemap
MODULEMAP_FILE[sdk=macosx*] = \
$(SRCROOT)/CommonCrypto/macosx.modulemap
19 changes: 19 additions & 0 deletions Example/CommonCrypto/CommonCrypto.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// CommonCrypto.h
// CommonCrypto
//
// Created by Mark Masterson on 2/20/18.
// Copyright © 2018 Mark R. Masterson. All rights reserved.
//

#import <UIKit/UIKit.h>

//! Project version number for CommonCrypto.
FOUNDATION_EXPORT double CommonCryptoVersionNumber;

//! Project version string for CommonCrypto.
FOUNDATION_EXPORT const unsigned char CommonCryptoVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <CommonCrypto/PublicHeader.h>


24 changes: 24 additions & 0 deletions Example/CommonCrypto/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
36 changes: 36 additions & 0 deletions Example/CommonCryptoTests/CommonCryptoTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//
// CommonCryptoTests.swift
// CommonCryptoTests
//
// Created by Mark Masterson on 2/20/18.
// Copyright © 2018 Mark R. Masterson. All rights reserved.
//

import XCTest
@testable import CommonCrypto

class CommonCryptoTests: XCTestCase {

override func setUp() {
super.setUp()
// Put setup code here. This method is called before the invocation of each test method in the class.
}

override func tearDown() {
// Put teardown code here. This method is called after the invocation of each test method in the class.
super.tearDown()
}

func testExample() {
// This is an example of a functional test case.
// Use XCTAssert and related functions to verify your tests produce the correct results.
}

func testPerformanceExample() {
// This is an example of a performance test case.
self.measure {
// Put the code you want to measure the time of here.
}
}

}
22 changes: 22 additions & 0 deletions Example/CommonCryptoTests/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ use_frameworks!


target 'Transloadit_MacOS_Example' do
pod 'TransloaditKit', :path => '../'
pod 'Transloadit', :path => '..'
end


target 'Transloadit_Example' do
pod 'TransloaditKit', :path => '../'
pod 'Transloadit', :path => '..'
target 'Transloadit_Tests' do
inherit! :search_paths

Expand Down
15 changes: 6 additions & 9 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
PODS:
- Arcane (0.5.0)
- FBSnapshotTestCase (2.1.4):
- FBSnapshotTestCase/SwiftSupport (= 2.1.4)
- FBSnapshotTestCase/Core (2.1.4)
- FBSnapshotTestCase/SwiftSupport (2.1.4):
- FBSnapshotTestCase/Core
- TransloaditKit (0.0.5):
- Arcane
- Transloadit (1.0.1):
- TUSKit
- TUSKit (1.3.10)

DEPENDENCIES:
- FBSnapshotTestCase
- TransloaditKit (from `../`)
- Transloadit (from `..`)

EXTERNAL SOURCES:
TransloaditKit:
:path: ../
Transloadit:
:path: ..

SPEC CHECKSUMS:
Arcane: 61f912466a57490ab852d733eaea3b32d66a241f
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
TransloaditKit: a3fed5df4e230307d98cb9048ff0d9a85fef16c4
Transloadit: 8aaca46072fe2a4ae387c348b0343172417bd62c
TUSKit: 20493740fd099eccc529014ae0a32230b4b9a7a0

PODFILE CHECKSUM: c60cf048b94707599b80ff18938fae02da6f42d1
PODFILE CHECKSUM: 1a3d11a4b32f23ad1fa04200c3d1b012c1b2fce7

COCOAPODS: 1.2.1
4 changes: 0 additions & 4 deletions Example/Pods/Arcane/CocoaPods/appletvos/module.modulemap

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions Example/Pods/Arcane/CocoaPods/iphoneos/module.modulemap

This file was deleted.

4 changes: 0 additions & 4 deletions Example/Pods/Arcane/CocoaPods/macosx/module.modulemap

This file was deleted.

4 changes: 0 additions & 4 deletions Example/Pods/Arcane/CocoaPods/watchos/module.modulemap

This file was deleted.

4 changes: 0 additions & 4 deletions Example/Pods/Arcane/CocoaPods/watchsimulator/module.modulemap

This file was deleted.

22 changes: 0 additions & 22 deletions Example/Pods/Arcane/LICENSE.md

This file was deleted.

82 changes: 0 additions & 82 deletions Example/Pods/Arcane/README.md

This file was deleted.

72 changes: 0 additions & 72 deletions Example/Pods/Arcane/Sources/AES.swift

This file was deleted.

Loading

0 comments on commit c4e1328

Please sign in to comment.