Merge pull request #7 from brightdigit/develop

Merging Develop Branch (v2.0.0) to Master

.gitignore

@@ -72,7 +72,7 @@ xcuserdata
 DerivedData
 *.hmap
 *.ipa
-*.xcuserstate 
+*.xcuserstate
 
 # CocoaPods
 #
@@ -102,4 +102,7 @@ fastlane/screenshots
 fastlane/test_output
 __PROJECT_NAME__.framework.zip
 
-VCS.swift
+VCS.swift
+
+Products
+.tmp

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "markdown"]
+	path = markdown
+	url = https://github.com/brightdigit/jazzy-markdown.git

.jazzy.yml

@@ -0,0 +1,136 @@
+# exclude:
+#   - "**/bridge/*.swift"
+
+author: BrightDigit
+author_url: http://www.brightdigit.com
+disable_search: true
+module: "SwiftVer"
+theme: markdown
+#
+# custom_categories:
+#   - name: Preferences
+#     children:
+#     - KeyCodeTransformer
+#     - KeyTransformer
+#     - KeyCombo
+#
+#   - name: Notifications
+#     children:
+#     - NSUserNotification
+#     - UserNotificationFactory
+#     - UserNotificationFactoryProtocol
+#     - UserNotificationHandler
+#     - UserNotificationHandlerProtocol
+#     - UserNotificationManager
+#     - UserNotificationManagerFactory
+#     - UserNotificationManagerFactoryProtocol
+#     - UserNotificationManagerProtocol
+#     - UserNotificationType
+#
+#   - name: Events
+#     children:
+#     - ApplicationConfiguration
+#     - ApplicationConfigurationProtocol
+#     - ConferencesApp
+#     - ConferencesBundles
+#     - ConferencesKeys
+#     - ConferencesNotificationNames
+#     - PollWindowManager
+#     - PollWindowManagerProtocol
+#     - PresentationChangeEventHandlerFactory
+#     - PresentationChangeEventHandler
+#     - PresentationChangeEventHandlerDelegate
+#     - PresentationChangeEventHandlerFactoryProtocol
+#     - PresentationChangeEventHandlerProtocol
+#
+#   - name: UI
+#     children:
+#     - AboutMenuItem
+#     - AboutViewController
+#     - ActiveMenuItemViewController
+#     - CheckForUpdateMenuItem
+#     - ConferencesWindow
+#     - ConferencesWindowPresentationActionDelegate
+#     - DisableMenuItem
+#     - HelpDocumentationMenuItem
+#     - LearnMoreMenuItem
+#     - MenuItem
+#     - PreferencesMenuItem
+#     - QuitMenuItem
+#     - StatusMenuController
+#     - StatusMenuProtocol
+#     - URLMenuItem
+#     - VersionMenuItem
+#     - WebViewController
+#
+#   - name: Polls
+#     children:
+#     - ManualTriggerExtension
+#     - ManualTriggerExtensionParser
+#     - ManualTriggerJavaScriptCode
+#     - NSScreen
+#     - PollSpecifications
+#     - PollSpecificationsExtensionParserProtocol
+#     - PollSpecificationsExtensionProtocol
+#     - PollSpecificationsParser
+#     - PollSpecificationsParserProtocol
+#     - PollSpecificationsProtocol
+#     - PresentationSlideDetails
+#     - PresentationSlideSpecifications
+#     - PresentationSlideSpecificationsParser
+#     - QueryParameterParserProtocol
+#     - SpecsParserFactory
+#     - SpecsParserFactoryProtocol
+#     - PresentationSlideSpecificationsParserProtocol
+#     - PresentationSlideSpecificationsProtocol
+#     - SlideDetails
+#     - SlideDetailsProtocol
+#     - SlideSourceId
+#     - String
+#     - CGRect
+#
+#   - name: Updates
+#     children:
+#     - FeedURLProvider
+#     - SemVer
+#     - SemVerSequence
+#     - SparkleUpdateManager
+#     - SparkleUpdateManagerFactory
+#     - Stage
+#     - StageBuildDictionaryProtocol
+#     - UpdateConfiguration
+#     - UpdateConfigurationProtocol
+#     - UpdateConfigurationRequest
+#     - UpdateConfigurationRequestProtocol
+#     - UpdateManagerDelegate
+#     - UpdateManagerFactoryProtocol
+#     - UpdateManagerProtocol
+#     - UpdateRepositoryProtocol
+#     - Version
+#     - VersionControlInfo
+#
+#   - name: Presentations
+#     children:
+#     - ActiveApplicationProtocol
+#     - NSRunningApplication
+#     - ApplicationPresentationSource
+#     - ApplicationRepository
+#     - ApplicationRepositoryProtocol
+#     - ApplicationSourceProtocol
+#     - ApplicationWindow
+#     - ApplicationWindowCollectionIdentifier
+#     - ApplicationWindowCollectionIdentifierProtocol
+#     - ApplicationWindowFactory
+#     - ApplicationWindowFactoryProtocol
+#     - ApplicationWindowProtocol
+#     - ConferencesWindowFactory
+#     - ConferencesWindowFactoryProtocol
+#     - KeynoteSource
+#     - PowerPointNotesCompiler
+#     - PowerPointNotesCompilerProtocol
+#     - PowerPointShapeParser
+#     - PowerPointShapeParserProtocol
+#     - PowerPointSource
+#     - PresentationAction
+#     - PresentationSource
+#     - PresentationSourceId

.ruby-version

@@ -0,0 +1 @@
+2.1.0

.swift-version

@@ -1 +1 @@
-3.0
+3.2

.swiftlint.yml

@@ -0,0 +1,9 @@
+excluded: # paths to ignore during linting. Takes precedence over `included`.
+  - Pods
+  - Tests/SwiftVerTests/testVCS.swift
+  - Examples/Source/VCS.swift
+
+included: # paths to include during linting. `--path` is ignored if present.
+  - Source
+  - Tests
+  - Examples

.travis.yml

@@ -1,38 +1,21 @@
 language: objective-c
-osx_image: xcode8.1
-env:
-  global:
-  - LC_CTYPE=en_US.UTF-8
-  - LANG=en_US.UTF-8
-  - WORKSPACE="SwiftVer.xcworkspace"
-  - IOS_FRAMEWORK_SCHEME="SwiftVer iOS"
-  - IOS_SDK=iphonesimulator10.0
-  - EXAMPLE_SCHEME="iOS Example"
-  - POD_LINT="YES"
-  matrix:
-    - DESTINATION="OS=10.0,name=iPhone 7 Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     POD_LINT="NO"
+os: osx
+osx_image: xcode9
 script:
-  - set -o pipefail
-  - xcodebuild -version
-  - xcodebuild -showsdks
-  - xcodebuild -list
+  - gem install xcpretty-travis-formatter cocoapods
+  - npm install -g doctoc
+  - brew update
+  - brew tap Homebrew/bundle
+  - brew bundle
   - ./build.sh
-  #- xcodebuild -workspace "$WORKSPACE" -list
-
-  # Build and test Framework in Debug
-  #- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty
-
-  # Build Framework in ReleaseTest
-  #- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration ReleaseTest ONLY_ACTIVE_ARCH=NO build | xcpretty
-
-  # Build Example in Debug if specified
-  #- xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty
 
   # Run `pod lib lint` if specified
-  - if [ $POD_LINT == "YES" ]; then
-      pod lib lint;
-    fi
+  - pod lib lint
 
-  #- ruby ./Tests/CheckCocoaPodsQualityIndexes.rb SwiftVer
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
+  - xcodebuild -project SwiftVer.xcodeproj -scheme "SwiftVer macOS" -destination 'platform=OS X,arch=x86_64' -enableCodeCoverage YES test
+  - bash <(curl -s https://codecov.io/bash) -cF macOS -X xcodeplist -g Tests
+  - xcodebuild -project SwiftVer.xcodeproj -scheme "SwiftVer iOS" -destination "platform=iOS Simulator,name=iPhone 7 Plus,OS=11.0" -enableCodeCoverage YES test
+  - bash <(curl -s https://codecov.io/bash) -cF iOS -X xcodeplist -g Tests
+  - xcodebuild -project SwiftVer.xcodeproj -scheme "SwiftVer tvOS" -destination "platform=tvOS Simulator,name=Apple TV 1080p,OS=11.0" -enableCodeCoverage YES test
+  - bash <(curl -s https://codecov.io/bash) -cF tvOS -X xcodeplist -g Tests
+  - ruby ./Tests/CheckCocoaPodsQualityIndexes.rb SwiftVer

Brewfile

@@ -0,0 +1,3 @@
+brew "swiftformat"
+brew "swiftlint"
+brew "jq"

Examples/Shared/Version.Array.swift

@@ -1,40 +1,46 @@
-//
-//  Version.Array.swift
-//  iOS Example
-//
-//  Created by Leo Dion on 9/21/16.
-//  Copyright © 2016 BrightDigit, LLC. All rights reserved.
-//
-
 import Foundation
 import SwiftVer
 
-let _exampleVersion = Version(bundle: Bundle.main, versionControl: VersionControlInfo(TYPE: VCS_TYPE, BASENAME: VCS_BASENAME, UUID: VCS_UUID, NUM: VCS_NUM, DATE: VCS_DATE, BRANCH: VCS_BRANCH, TAG: VCS_TAG, TICK: VCS_TICK, EXTRA: VCS_EXTRA, FULL_HASH: VCS_FULL_HASH, SHORT_HASH: VCS_SHORT_HASH, WC_MODIFIED: VCS_WC_MODIFIED))
+let exampleVersion = Version(
+  bundle: Bundle.main,
+  versionControl: VersionControlInfo(
+    TYPE: VCS_TYPE,
+    BASENAME: VCS_BASENAME,
+    UUID: VCS_UUID,
+    NUM: VCS_NUM,
+    DATE: VCS_DATE,
+    BRANCH: VCS_BRANCH,
+    TAG: VCS_TAG,
+    TICK: VCS_TICK,
+    EXTRA: VCS_EXTRA,
+    FULL_HASH: VCS_FULL_HASH,
+    SHORT_HASH: VCS_SHORT_HASH,
+    WC_MODIFIED: VCS_WC_MODIFIED))
 
 extension Version {
-  var values : [(label: String, value: String?)] {
+  var values: [(label: String, value: String?)] {
     var values = [(label: String, value: String?)]()
-    values.append((label: "semverDescription", value: self.semver.description))
-    values.append((label: "semverMajor", value: self.semver.major.description))
-    values.append((label: "semverMinor", value: self.semver.minor.description))
-    values.append((label: "semverPatch", value: self.semver.patch?.description))
-    values.append((label: "build", value: self.build.description))
-    values.append((label: "vcsBasename", value: self.versionControl!.BASENAME))
-    values.append((label: "vcsBranch", value: self.versionControl!.BRANCH))
-    values.append((label: "vcsDate", value: self.versionControl!.DATE?.description))
-    values.append((label: "vcsExtra", value: self.versionControl!.EXTRA))
-    values.append((label: "vcsFull_hash", value: self.versionControl!.FULL_HASH))
-    values.append((label: "vcsNum", value: self.versionControl!.NUM.description))
-    values.append((label: "vcsShortHash", value: self.versionControl!.SHORT_HASH))
-    values.append((label: "vcsTag", value: self.versionControl!.TAG))
-    values.append((label: "vcsTick", value: self.versionControl!.TICK?.description))
-    values.append((label: "vcsType", value: self.versionControl!.TYPE.description))
-    values.append((label: "vcsUuid", value: self.versionControl!.UUID))
-    values.append((label: "vcsWc_modified", value: self.versionControl!.WC_MODIFIED.description))
+    values.append((label: "semverDescription", value: semver.description))
+    values.append((label: "semverMajor", value: semver.major.description))
+    values.append((label: "semverMinor", value: semver.minor.description))
+    values.append((label: "semverPatch", value: semver.patch?.description))
+    values.append((label: "build", value: build.description))
+    values.append((label: "vcsBasename", value: versionControl!.BASENAME))
+    values.append((label: "vcsBranch", value: versionControl!.BRANCH))
+    values.append((label: "vcsDate", value: versionControl!.DATE?.description))
+    values.append((label: "vcsExtra", value: versionControl!.EXTRA))
+    values.append((label: "vcsFull_hash", value: versionControl!.FULL_HASH))
+    values.append((label: "vcsNum", value: versionControl!.NUM.description))
+    values.append((label: "vcsShortHash", value: versionControl!.SHORT_HASH))
+    values.append((label: "vcsTag", value: versionControl!.TAG))
+    values.append((label: "vcsTick", value: versionControl!.TICK?.description))
+    values.append((label: "vcsType", value: versionControl!.TYPE.description))
+    values.append((label: "vcsUuid", value: versionControl!.UUID))
+    values.append((label: "vcsWc_modified", value: versionControl!.WC_MODIFIED.description))
     return values
   }
-  
-  static var example : Version! {
+
+  static var example: Version! {
     return _exampleVersion
   }
 }

Examples/Source/AppDelegate.swift

@@ -1,44 +1,12 @@
-//
-//  AppDelegate.swift
-//  iOS Example
-//
-//  Created by Leo G Dion on September 20, 2016.
-//  Copyright © 2016 BrightDigit, LLC. All rights reserved.
-//
-
 import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-  
+
   var window: UIWindow?
-  
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+
+  func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
     // Override point for customization after application launch.
     return true
   }
-
-  func applicationWillResignActive(_ application: UIApplication) {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
-  }
-
-  func applicationDidEnterBackground(_ application: UIApplication) {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-  }
-
-  func applicationWillEnterForeground(_ application: UIApplication) {
-    // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
-  }
-
-  func applicationDidBecomeActive(_ application: UIApplication) {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-  }
-
-  func applicationWillTerminate(_ application: UIApplication) {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-  }
-
-
 }