From 0e5c9dbbc133fad46410ec0a558b7849bae79bdf Mon Sep 17 00:00:00 2001 From: Julian Kahnert Date: Tue, 6 Nov 2018 18:11:18 +0100 Subject: [PATCH] add macOS 10.12 support --- PDFArchiver.xcodeproj/project.pbxproj | 4 ++-- .../OnboardingViewController.swift | 7 ++++++- PDFArchiver/Controllers/ViewController.swift | 4 +++- PDFArchiver/Views/HelperBackgroundViews.swift | 20 ++++++++++++++++--- scripts/build_openssl.sh | 2 +- 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/PDFArchiver.xcodeproj/project.pbxproj b/PDFArchiver.xcodeproj/project.pbxproj index 51f91f53..5b2c067d 100644 --- a/PDFArchiver.xcodeproj/project.pbxproj +++ b/PDFArchiver.xcodeproj/project.pbxproj @@ -865,7 +865,7 @@ INFOPLIST_FILE = "$(SRCROOT)/PDFArchiver/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/PDFArchiver/External/OpenSSL/lib"; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.12; OTHER_SWIFT_FLAGS = "-DDEBUG"; PRODUCT_BUNDLE_IDENTIFIER = de.JulianKahnert.PDFArchiver; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -891,7 +891,7 @@ INFOPLIST_FILE = "$(SRCROOT)/PDFArchiver/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/PDFArchiver/External/OpenSSL/lib"; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.12; OTHER_SWIFT_FLAGS = "-DRELEASE"; PRODUCT_BUNDLE_IDENTIFIER = de.JulianKahnert.PDFArchiver; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/PDFArchiver/Controllers/OnboardingViewController.swift b/PDFArchiver/Controllers/OnboardingViewController.swift index 24d0c147..3b4ce512 100644 --- a/PDFArchiver/Controllers/OnboardingViewController.swift +++ b/PDFArchiver/Controllers/OnboardingViewController.swift @@ -80,7 +80,12 @@ class OnboardingViewController: NSViewController { override func viewWillAppear() { let cornerRadius = CGFloat(3) - let customViewColor = NSColor(named: "CustomViewBackground")?.withAlphaComponent(0.05).cgColor + let customViewColor: CGColor? + if #available(OSX 10.13, *) { + customViewColor = NSColor(named: "CustomViewBackground")?.withAlphaComponent(0.05).cgColor + } else { + customViewColor = NSColor(calibratedRed: 0.131, green: 0.172, blue: 0.231, alpha: 0.05).cgColor + } // set background color // TODO: do we really need this? diff --git a/PDFArchiver/Controllers/ViewController.swift b/PDFArchiver/Controllers/ViewController.swift index 610314f0..9de6d2c6 100644 --- a/PDFArchiver/Controllers/ViewController.swift +++ b/PDFArchiver/Controllers/ViewController.swift @@ -139,7 +139,9 @@ class ViewController: NSViewController, Logging { // set some PDF View settings self.pdfContentView.displayMode = PDFDisplayMode.singlePage self.pdfContentView.autoScales = true - self.pdfContentView.acceptsDraggedFiles = false + if #available(OSX 10.13, *) { + self.pdfContentView.acceptsDraggedFiles = false + } self.pdfContentView.interpolationQuality = PDFInterpolationQuality.low // update the view after all the settigns diff --git a/PDFArchiver/Views/HelperBackgroundViews.swift b/PDFArchiver/Views/HelperBackgroundViews.swift index fb9acd55..a0c31f4d 100644 --- a/PDFArchiver/Views/HelperBackgroundViews.swift +++ b/PDFArchiver/Views/HelperBackgroundViews.swift @@ -19,9 +19,17 @@ class BackgroundView: NSView { self.wantsLayer = Constants.Layout.wantsLayer self.layer?.cornerRadius = Constants.Layout.cornerRadius if self.identifier?.rawValue == "MainViewBackground" || self.identifier?.rawValue == "OnboardingBackgroundView" { - self.layer?.backgroundColor = NSColor(named: "MainViewBackground")?.cgColor + if #available(OSX 10.13, *) { + self.layer?.backgroundColor = NSColor(named: "MainViewBackground")?.cgColor + } else { + self.layer?.backgroundColor = NSColor(calibratedRed: 0.980, green: 0.980, blue: 0.980, alpha: 1).cgColor + } } else if self.identifier?.rawValue == "CustomViewBackground" { - self.layer?.backgroundColor = NSColor(named: "CustomViewBackground")?.withAlphaComponent(0.1).cgColor + if #available(OSX 10.13, *) { + self.layer?.backgroundColor = NSColor(named: "CustomViewBackground")?.withAlphaComponent(0.1).cgColor + } else { + self.layer?.backgroundColor = NSColor(calibratedRed: 0.131, green: 0.172, blue: 0.231, alpha: 1).cgColor + } } } } @@ -32,7 +40,13 @@ class PDFContentView: PDFView { super.layout() // set background color of the view - guard let pdfContentViewBackgroundColor = NSColor(named: "PDFContentViewBackground") else { fatalError("PDFContentViewBackground color not found!") } + let tmpPdfContentViewBackgroundColor: NSColor? + if #available(OSX 10.13, *) { + tmpPdfContentViewBackgroundColor = NSColor(named: "PDFContentViewBackground") + } else { + tmpPdfContentViewBackgroundColor = NSColor(calibratedRed: 0.213, green: 0.242, blue: 0.286, alpha: 0.05) + } + guard let pdfContentViewBackgroundColor = tmpPdfContentViewBackgroundColor else { fatalError("PDFContentViewBackground color not found!") } self.backgroundColor = pdfContentViewBackgroundColor self.layer?.cornerRadius = Constants.Layout.cornerRadius } diff --git a/scripts/build_openssl.sh b/scripts/build_openssl.sh index 00210b83..437b5aa7 100755 --- a/scripts/build_openssl.sh +++ b/scripts/build_openssl.sh @@ -21,7 +21,7 @@ cd "$OPENSSL_FOLDER/src" make clean ./Configure darwin64-x86_64-cc echo "Building x86 64 static library..." -make >> /dev/null 2>&1 +make CXXFLAGS="-mmacosx-version-min=10.12" >> /dev/null 2>&1 make install >> /dev/null 2>&1 cp "LICENSE" "$OPENSSL_FOLDER"