Merge branch 'development'

Author: macmade

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "Submodules/xcconfig"]
 	path = Submodules/xcconfig
 	url = https://github.com/DigiDNA/xcconfig.git
-[submodule "Submodules/GitHubUpdates"]
-	path = Submodules/GitHubUpdates
-	url = https://github.com/macmade/GitHubUpdates.git

.travis.yml

@@ -0,0 +1,22 @@
+language: objective-c
+osx_image: xcode10.2
+cache:
+    directories:
+    - $HOME/.ccache
+install:
+- gem install xcpretty
+- brew install ccache
+- PATH=$PATH:/usr/local/opt/ccache/libexec
+- export PYTHONUSERBASE=~/.local
+- easy_install --user scan-build
+script:
+- set -o pipefail && xcodebuild -project "ColorSet.xcodeproj" -scheme "ColorSetKit" build test | xcpretty
+before_script:
+- ccache -s
+- ccache -z
+after_script:
+- ccache -s
+after_success:
+- bash Scripts/travis-after.sh
+notifications:
+    slack: digidna:JnibNY2kbGTqfDWH33jMdcMj

Assets/ColorSet.png

@@ -0,0 +1,2 @@
+*
+!.gitignore

Build/.gitignore

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29025.244
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorSetKit", "ColorSetKit\ColorSetKit.csproj", "{E3BF32CB-99E2-4331-AFB6-9281D79E63BC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorSetKit-Test", "ColorSetKit-Test\ColorSetKit-Test.csproj", "{56A92618-CCFE-4313-90C1-EA63DFD154A0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E3BF32CB-99E2-4331-AFB6-9281D79E63BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3BF32CB-99E2-4331-AFB6-9281D79E63BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3BF32CB-99E2-4331-AFB6-9281D79E63BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3BF32CB-99E2-4331-AFB6-9281D79E63BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56A92618-CCFE-4313-90C1-EA63DFD154A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56A92618-CCFE-4313-90C1-EA63DFD154A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56A92618-CCFE-4313-90C1-EA63DFD154A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56A92618-CCFE-4313-90C1-EA63DFD154A0}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A5BF84F5-B6D2-4A4C-ADFB-0971E4D60E2C}
+	EndGlobalSection
+EndGlobal

ColorSet.sln

@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:ColorSet.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:ColorSet.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

ColorSet.xcodeproj/project.pbxproj

@@ -27,10 +27,27 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "05CD4AB920ED7CD100DBDE99"
+            BuildableName = "ColorSetKit.framework"
+            BlueprintName = "ColorSetKit"
+            ReferencedContainer = "container:ColorSet.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "057DC44A22B1492200BA6727"
+               BuildableName = "ColorSetKit-Test.xctest"
+               BlueprintName = "ColorSetKit-Test"
+               ReferencedContainer = "container:ColorSet.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +68,6 @@
             ReferencedContainer = "container:ColorSet.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

ColorSet.xcodeproj/xcshareddata/xcschemes/ColorSet.xcscheme

@@ -23,19 +23,29 @@
  ******************************************************************************/
 
 import Cocoa
-import GitHubUpdates
+import ColorSetKit
 
 @NSApplicationMain
-
 class ApplicationDelegate: NSResponder, NSApplicationDelegate
 {
     private var controllers = [ NSWindowController ]()
     private var aboutWindowController: NSWindowController?
-    @IBOutlet private var updater: GitHubUpdater?
 
     func applicationDidFinishLaunching( _ notification: Notification )
     {
-        self.updater?.checkForUpdatesInBackground()
+        DispatchQueue.main.asyncAfter( deadline: .now() + .milliseconds( 500 ) )
+        {
+            if self.controllers.count == 0
+            {
+                self.newDocument( nil )
+            }
+        }
+        
+        NotificationCenter.default.addObserver( self, selector: #selector( windowWillClose( _: ) ), name: NSWindow.willCloseNotification, object: nil )
+        
+        #if DEBUG
+        UserDefaults.standard.register( defaults: [ "NSApplicationCrashOnExceptions" : true ] )
+        #endif
     }
 
     func applicationWillTerminate( _ notification: Notification )
@@ -120,6 +130,18 @@ class ApplicationDelegate: NSResponder, NSApplicationDelegate
             item.color   = color
             item.variant = p.value.variant
 
+            for lp in p.value.lightnesses
+            {
+                let lightness = LightnessPairItem( base: item )
+                
+                lightness.lightness1.lightness = lp.lightness1.lightness
+                lightness.lightness1.name      = lp.lightness1.name
+                lightness.lightness2.lightness = lp.lightness2.lightness
+                lightness.lightness2.name      = lp.lightness2.name
+                
+                item.lightnessPairs.append( lightness )
+            }
+            
             colors.append( item )
         }
 
@@ -133,4 +155,19 @@ class ApplicationDelegate: NSResponder, NSApplicationDelegate
 
         return true
     }
+    
+    @objc private func windowWillClose( _ notification: Notification )
+    {
+        self.controllers.removeAll
+        {
+            c in
+            
+            guard let window = notification.object as? NSWindow else
+            {
+                return false
+            }
+            
+            return c.window == window
+        }
+    }
 }