Reorganized project structure

.travis.yml

@@ -6,25 +6,25 @@ osx_image: xcode9.2
 language: swift
 env:
   global:
-    - WORKSPACE=Example/UtiliKit.xcworkspace
-    - IOS_FRAMEWORK_SCHEME="UtiliKit-Example"
+    - WORKSPACE=UtiliKit.xcworkspace
+    - IOS_FRAMEWORK_SCHEME="UtiliKit-iOS"
   matrix:
-    - DESTINATION="platform=iOS Simulator,OS=11.2,name=iPhone X" SDK="iphonesimulator" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="YES"
+    - DESTINATION="platform=iOS Simulator,OS=11.2,name=iPhone X"                        SCHEME="$IOS_FRAMEWORK_SCHEME"      RUN_TESTS="YES" POD_LINT="YES"
+    # - DESTINATION="platform=tvOS Simulator,OS=11.2,name=Apple TV 4K"                    SCHEME="$TVOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" POD_LINT="NO"
+    #- DESTINATION="platform=watchOS Simulator,OS=4.2,name=Apple Watch Series 3 - 42mm"  SCHEME="$WATCHOS_FRAMEWORK_SCHEME"  RUN_TESTS="NO"  POD_LINT="NO"
 
 # cache: cocoapods
 # podfile: Example/Podfile
 before_install:
-  - gem install cocoapods --pre # Since Travis is not always on latest version
-  - pod install --project-directory=Example
 script:
   - set -o pipefail
 
   # Build Framework and Run Tests if specified
-  - if [ $RUN_TESTS == "YES" ]; then
-      xcodebuild test -enableCodeCoverage YES -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -sdk "$SDK" ONLY_ACTIVE_ARCH=NO | xcpretty;
-    else
-      xcodebuild build -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -sdk "$SDK" ONLY_ACTIVE_ARCH=NO | xcpretty;
-    fi
+  - if [ $RUN_TESTS == "YES" ]; then
+      xcodebuild test -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" ONLY_ACTIVE_ARCH=NO -enableCodeCoverage YES | xcpretty;
+    else
+      xcodebuild build -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" ONLY_ACTIVE_ARCH=NO | xcpretty;
+    fi
 
   # Run `pod lib lint` if specified
   - if [ $POD_LINT == "YES" ]; then

Example/UtiliKit/ContainerExampleViewController.swift → Examples/UtiliKit-iOSExample/ContainerExampleViewController.swift

@@ -1,9 +1,8 @@
 //
 //  ContainerExampleViewController.swift
-//  UtiliKit_Example
+//  UtiliKit
 //
-//  Created by Will McGinty on 1/2/18.
-//  Copyright © 2018 CocoaPods. All rights reserved.
+//  Copyright © 2018 Bottle Rocket Studios. All rights reserved.
 //
 
 import UIKit

Example/UtiliKit/ViewController/VCViewController.swift → Examples/UtiliKit-iOSExample/ViewController/VCViewController.swift

@@ -14,7 +14,7 @@ import UIKit
 class VCViewController: UIViewController {
 
     @IBAction func didSelectInitialViewController(_ sender: Any) {
-        // Instantiate a "InitialViewController" from the storyboard
+        // Instantiate an InitialViewController from the storyboard
         // Notice that the desired type of view controller that you want to instantiate must be provided.
         // The UIStoryboard extension will automatically attempt to instantiate a view controller with an identifier that matches the name of the view controller's type and then cast it into that type.
         let vc: InitialViewController = UIStoryboard(identifier: .vcTest).instantiateInitialViewController()

Example/UtiliKit/ViewControllerA.swift → Examples/UtiliKit-iOSExample/ViewControllerA.swift

@@ -1,9 +1,8 @@
 //
 //  ViewControllerA.swift
-//  Container_Example
+//  UtiliKit
 //
-//  Created by Will McGinty on 10/19/17.
-//  Copyright © 2017 CocoaPods. All rights reserved.
+//  Copyright © 2018 Bottle Rocket Studios. All rights reserved.
 //
 
 import UIKit

Example/UtiliKit/ViewControllerB.swift → Examples/UtiliKit-iOSExample/ViewControllerB.swift

@@ -1,9 +1,8 @@
 //
 //  ViewControllerB.swift
-//  Container_Example
+//  UtiliKit
 //
-//  Created by Will McGinty on 10/19/17.
-//  Copyright © 2017 CocoaPods. All rights reserved.
+//  Copyright © 2018 Bottle Rocket Studios. All rights reserved.
 //
 
 import UIKit

Example/UtiliKit/WipeTransitionAnimator.swift → Examples/UtiliKit-iOSExample/WipeTransitionAnimator.swift

@@ -1,7 +1,8 @@
 //
 //  WipeTransitionAnimator.swift
+//  UtiliKit
 //
-//  Created by Wilson Turner on 2/17/17.
+//  Copyright © 2018 Bottle Rocket Studios. All rights reserved.
 //
 
 import UIKit

Sources/Supporting Files/Info.plist

@@ -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>

Sources/Supporting Files/UtiliKit.h

@@ -0,0 +1,18 @@
+//
+//  UtiliKit.h
+//  UtiliKit
+//
+//  Copyright © 2018 Bottle Rocket Studios. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for UtiliKit.
+FOUNDATION_EXPORT double UtiliKitVersionNumber;
+
+//! Project version string for UtiliKit.
+FOUNDATION_EXPORT const unsigned char UtiliKitVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <UtiliKit/PublicHeader.h>
+
+

UtiliKit/Classes/Container/ContainerTransitionContext.swift → Sources/UtiliKit/Container/ContainerTransitionContext.swift

@@ -1,11 +1,11 @@
 //
 //  ContainerTransitionContext.swift
-//  Container
+//  UtiliKit
 //
 //  Copyright © 2018 Bottle Rocket Studios. All rights reserved.
 //
 
-import Foundation
+import UIKit
 
 class ContainerTransitionContext: NSObject {
 

UtiliKit/Classes/Container/ContainerViewController.swift → Sources/UtiliKit/Container/ContainerViewController.swift

@@ -1,6 +1,6 @@
 //
 //  ContainerViewController.swift
-//  Container
+//  UtiliKit
 //
 //  Copyright © 2018 Bottle Rocket Studios. All rights reserved.
 //

UtiliKit/Classes/Container/ContainerViewControllerDelegate.swift → Sources/UtiliKit/Container/ContainerViewControllerDelegate.swift

@@ -1,11 +1,11 @@
 //
 //  ContainerViewControllerDelegate.swift
-//  Container
+//  UtiliKit
 //
 //  Copyright © 2018 Bottle Rocket Studios. All rights reserved.
 //
 
-import Foundation
+import UIKit
 
 public protocol ContainerViewControllerDelegate: class {
 

UtiliKit/Classes/Container/ContainerViewControllerTransitionAnimator.swift → Sources/UtiliKit/Container/ContainerViewControllerTransitionAnimator.swift

@@ -1,6 +1,6 @@
 //
 //  ContainerViewControllerTransitionAnimator.swift
-//  Container
+//  UtiliKit
 //
 //  Copyright © 2018 Bottle Rocket Studios. All rights reserved.
 //

UtiliKit.podspec

@@ -25,8 +25,7 @@ s.homepage          = 'https://github.com/BottleRocketStudios/iOS-UtiliKit'
 s.license           = { :type => 'Apache 2.0', :file => 'LICENSE' }
 s.author            = { 'Bottle Rocket Studios' => 'wilson.turner@bottlerocketstudios.com' }
 s.source            = { :git => 'https://github.com/bottlerocketstudios/iOS-UtiliKit.git', :tag => s.version.to_s }
-s.source_files      = 'UtiliKit/Classes/**/*'
-s.frameworks        = 'UIKit', 'MapKit'
+s.source_files      = 'Sources/UtiliKit/**/*'
 s.ios.deployment_target = '9.0'
 s.default_subspec = 'Core'
 
@@ -36,23 +35,23 @@ core.dependency 'UtiliKit/General'
 end
 
 s.subspec 'Instantiation' do |instantiation|
-instantiation.source_files = 'UtiliKit/Classes/Instantiation/*.swift'
+instantiation.source_files = 'Sources/UtiliKit/Instantiation/*.swift'
 end
 
 s.subspec 'TimelessDate' do |timeless|
-timeless.source_files = 'UtiliKit/Classes/TimelessDate/*.swift'
+timeless.source_files = 'Sources/UtiliKit/TimelessDate/*.swift'
 end
 
 s.subspec 'General' do |general|
-general.source_files   = 'UtiliKit/Classes/General/*.swift'
+general.source_files   = 'Sources/UtiliKit/General/*.swift'
 end
 
 s.subspec 'Version' do |version|
-version.source_files   = 'UtiliKit/Classes/Version/*.swift'
+version.source_files   = 'Sources/UtiliKit/Version/*.swift'
 end
 
 s.subspec 'Container' do |container|
-container.source_files   = 'UtiliKit/Classes/Container/*.swift'
+container.source_files   = 'Sources/UtiliKit/Container/*.swift'
 end
 
 end