Bump minimum macOS version to 10.13 and fix some resulting warnings

Hammerspoon · Nov 10, 2020 · ccf6fbe · ccf6fbe
1 parent e3add56
commit ccf6fbe
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Hammerspoon.xcodeproj/project.pbxproj b/Hammerspoon.xcodeproj/project.pbxproj
@@ -41,7 +41,7 @@
 		4CD203B21C6D77750089706D /* internal.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD203A21C6D75950089706D /* internal.m */; };
 		4CD64AA91C6F15F400EB6E39 /* HSsocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD64AA81C6F15F400EB6E39 /* HSsocket.m */; };
 		4CD64AAB1C6F168700EB6E39 /* test_socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 4CD64AAA1C6F168700EB6E39 /* test_socket.lua */; };
-		4CD96BD61C73ABD2009FF648 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
+		4CD96BD61C73ABD2009FF648 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
 		4CD96BD71C73ABD2009FF648 /* LuaSkin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F9850E81B722CBF00F7E909 /* LuaSkin.framework */; };
 		4CD96BDE1C73AC1C009FF648 /* udp.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD96BDD1C73AC1C009FF648 /* udp.m */; };
 		4CE6390F1C76C7F500BB7CD2 /* socket.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CE6390E1C76C7F500BB7CD2 /* socket.h */; };
@@ -1542,7 +1542,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4CD96BD61C73ABD2009FF648 /* BuildFile in Frameworks */,
+				4CD96BD61C73ABD2009FF648 /* (null) in Frameworks */,
 				4CD96BD71C73ABD2009FF648 /* LuaSkin.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -8984,7 +8984,7 @@
 					"$(SRCROOT)/Pods/**",
 					"$(SRCROOT)/Pods/Sentry/Sources/Sentry/include/",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-undefined",
@@ -22515,7 +22515,7 @@
 					"$(SRCROOT)/Pods/**",
 					"$(SRCROOT)/Pods/Sentry/Sources/Sentry/include/",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-undefined",
@@ -22582,7 +22582,7 @@
 					"$(SRCROOT)/Pods/**",
 					"$(SRCROOT)/Pods/Sentry/Sources/Sentry/include/",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OTHER_LDFLAGS = (
 					"-undefined",
 					dynamic_lookup,

diff --git a/Hammerspoon/Hammerspoon-Info.plist b/Hammerspoon/Hammerspoon-Info.plist
@@ -192,7 +192,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5594</string>
+	<string>5611</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Podfile b/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :osx, '10.12'
+platform :osx, '10.13'
 
 inhibit_all_warnings!
 

diff --git a/extensions/dialog/internal.m b/extensions/dialog/internal.m
@@ -418,7 +418,7 @@ static int chooseFileOrFolder(lua_State *L) {
     // Counter used when multiple files can be selected:
     int count = 1;
 
-    if (clicked == NSFileHandlingPanelOKButton) {
+    if (clicked == NSModalResponseOK) {
         lua_newtable(L);
         for (NSURL *url in [panel URLs]) {
             lua_pushstring(L,[[url path] UTF8String]); lua_setfield(L, -2, [[NSString stringWithFormat:@"%i", count] UTF8String]);

diff --git a/extensions/pasteboard/internal.m b/extensions/pasteboard/internal.m
@@ -240,11 +240,11 @@ static int pasteboard_delete(lua_State* L) {
     [skin checkArgs:LS_TSTRING | LS_TNUMBER, LS_TBREAK] ; // prevents nil from being specified
     luaL_checkstring(L, 1) ; // coerce number to string
     NSString *pbName = [skin toNSObjectAtIndex:1] ;
-    if ([pbName isEqualToString:NSGeneralPboard] ||
-        [pbName isEqualToString:NSFontPboard]    ||
-        [pbName isEqualToString:NSRulerPboard]   ||
-        [pbName isEqualToString:NSFindPboard]    ||
-        [pbName isEqualToString:NSDragPboard]) return luaL_error(L, "cannot delete a system pasteboard") ;
+    if ([pbName isEqualToString:NSPasteboardNameGeneral] ||
+        [pbName isEqualToString:NSPasteboardNameFont]    ||
+        [pbName isEqualToString:NSPasteboardNameRuler]   ||
+        [pbName isEqualToString:NSPasteboardNameFind]    ||
+        [pbName isEqualToString:NSPasteboardNameDrag]) return luaL_error(L, "cannot delete a system pasteboard") ;
 
     NSPasteboard *thePasteboard = [NSPasteboard pasteboardWithName:pbName];
     [thePasteboard releaseGlobally];