Xcode 10 compatibility, Dark mode support

hholtmann · Aug 11, 2018 · de39884 · de39884
1 parent 6d6a6e8
commit de39884
Show file tree

Hide file tree

Showing 16 changed files with 4,356 additions and 19,262 deletions.
diff --git a/Classes/FanControl.h b/Classes/FanControl.h
@@ -23,11 +23,11 @@
 
 #import <Cocoa/Cocoa.h>
 #import "NSFileManager+DirectoryLocations.h"
-#import <smc.h>
-#import <smcWrapper.h>
-#import <MachineDefaults.h>
+#import "smc.h"
+#import "smcWrapper.h"
+#import "MachineDefaults.h"
 
-#import <Power.h>
+#import "Power.h"
 #include <mach/mach_port.h>
 #include <mach/mach_interface.h>
 #include <mach/mach_init.h>

diff --git a/Classes/MachineDefaults.h b/Classes/MachineDefaults.h
@@ -20,7 +20,7 @@
  *	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #import <Cocoa/Cocoa.h>
-#import <smcWrapper.h>
+#import "smcWrapper.h"
 
 
 @interface MachineDefaults : NSObject {

diff --git a/Classes/smcWrapper.h b/Classes/smcWrapper.h
@@ -22,8 +22,8 @@
  */
 
 #import <Cocoa/Cocoa.h>
-#import <smc.h>
-#import <MachineDefaults.h>
+#import "smc.h"
+#import "MachineDefaults.h"
 #import "Constants.h"
 
 @interface smcWrapper : NSObject {

diff --git a/Classes/smcWrapper.m b/Classes/smcWrapper.m
@@ -23,7 +23,7 @@
 
 #import "smcWrapper.h"
 #import <CommonCrypto/CommonDigest.h>
-NSString * const smc_checksum=@"c1c93f148c80e7ab466f83dabe011a6e";
+NSString * const smc_checksum=@"4fc00a0979970ee8b55f078a0c793c4d";
 
 NSArray *allSensors;
 

diff --git a/Ressources/Dutch.lproj/MainMenu.nib/designable.nib b/Ressources/Dutch.lproj/MainMenu.nib/designable.nib
diff --git a/Ressources/Dutch.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/Dutch.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/Ressources/French.lproj/MainMenu.nib/designable.nib b/Ressources/French.lproj/MainMenu.nib/designable.nib
diff --git a/Ressources/French.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/French.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/Ressources/German.lproj/MainMenu.nib/designable.nib b/Ressources/German.lproj/MainMenu.nib/designable.nib
diff --git a/Ressources/German.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/German.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/Ressources/Spanish.lproj/MainMenu.nib/designable.nib b/Ressources/Spanish.lproj/MainMenu.nib/designable.nib
diff --git a/Ressources/Spanish.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/Spanish.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/smcFanControl.xcodeproj/project.pbxproj b/smcFanControl.xcodeproj/project.pbxproj
@@ -305,7 +305,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 1000;
 				TargetAttributes = {
 					8924ECED15AC96E70031730C = {
 						DevelopmentTeam = H4G85G26BP;
@@ -443,7 +443,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_IDENTITY = "Mac Developer";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
 				COPY_PHASE_STRIP = NO;
 				DEVELOPMENT_TEAM = H4G85G26BP;
@@ -472,7 +472,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_IDENTITY = "Mac Developer";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -558,12 +558,14 @@
 					"\"$(SDKROOT)/usr/lib/system\"",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OBJROOT = "$(HOME)/builds";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				PRODUCT_BUNDLE_IDENTIFIER = com.eidac.smcFanControl2;
 				PRODUCT_NAME = smcFanControl;
 				PROVISIONING_PROFILE = "";
 				SDKROOT = macosx;
+				SYMROOT = "$(HOME)/builds";
 				VALID_ARCHS = "i386 x86_64";
 				WRAPPER_EXTENSION = app;
 			};
@@ -573,7 +575,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CODE_SIGN_IDENTITY = "Developer ID Application: Hendrik Holtmann";
+				CODE_SIGN_IDENTITY = "Mac Developer";
 				ENABLE_TESTABILITY = YES;
 				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -591,7 +593,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CODE_SIGN_IDENTITY = "Developer ID Application: Hendrik Holtmann";
+				CODE_SIGN_IDENTITY = "Mac Developer";
 				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;

diff --git a/...deproj/project.xcworkspace/xcuserdata/hendrikh.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/hendrikh.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/smcFanControl.xcodeproj/xcuserdata/hendrikh.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/smcFanControl.xcodeproj/xcuserdata/hendrikh.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -44,12 +44,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Classes/smcWrapper.m"
-            timestampString = "555718380.442687"
+            timestampString = "555720499.446066"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "237"
-            endingLineNumber = "237"
-            landmarkName = "+createCheckSum:"
+            startingLineNumber = "60"
+            endingLineNumber = "60"
+            landmarkName = "+convertToNumber:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

diff --git a/smcFanControl.xcodeproj/xcuserdata/hendrikh.xcuserdatad/xcschemes/smcFanControl.xcscheme b/smcFanControl.xcodeproj/xcuserdata/hendrikh.xcuserdatad/xcschemes/smcFanControl.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -42,7 +42,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       language = "en"