Skip to content

Commit

Permalink
Apple: Xcode 15 (#624)
Browse files Browse the repository at this point in the history
  • Loading branch information
Shchvova committed Oct 2, 2023
1 parent 215a366 commit 685b98d
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Expand Up @@ -18,7 +18,7 @@ on:

env:
WORKSPACE: ${{ github.workspace }}
DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
BUILD_NUMBER: ${{ github.event.inputs.buildNumber }}
YEAR: ${{ github.event.inputs.buildYear }}

Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
runner:
- macos-13
xcode:
- Xcode_14.3
- Xcode_15.0
target:
- template
- template-angle
Expand Down
16 changes: 13 additions & 3 deletions platform/iphone/ratatouille.xcodeproj/project.pbxproj
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXAggregateTarget section */
Expand Down Expand Up @@ -2969,8 +2969,8 @@
F50E7EB724FA923B009F165B /* Sources */,
F50E7EB924FA923B009F165B /* Frameworks */,
F50E7EBC24FA923B009F165B /* Script: CopyResources and resource.corona-archive */,
F50E7EBD24FA923B009F165B /* Script: build.settings to Info.plist */,
F5C36AF524FA93A700775C6E /* Embed Frameworks */,
F50E7EBD24FA923B009F165B /* Script: build.settings to Info.plist */,
);
buildRules = (
F50E7EBE24FA923B009F165B /* PBXBuildRule */,
Expand Down Expand Up @@ -3949,9 +3949,13 @@
files = (
);
inputPaths = (
"$(SRCROOT)/../test/assets2/build.settings",
$BUILT_PRODUCTS_DIR/$EXECUTABLE_FOLDER_PATH/Info.plist,
);
name = "Script: build.settings to Info.plist";
outputPaths = (
"$(DERIVED_FILE_DIR)/info.created",
$BUILT_PRODUCTS_DIR/$EXECUTABLE_FOLDER_PATH/Info.plist,
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -4020,14 +4024,20 @@
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"$(SRCROOT)/../test/assets2/build.settings",
$BUILT_PRODUCTS_DIR/$EXECUTABLE_FOLDER_PATH/Info.plist,
);
name = "Script: build.settings to Info.plist";
outputPaths = (
"$(DERIVED_FILE_DIR)/info.created",
$BUILT_PRODUCTS_DIR/$EXECUTABLE_FOLDER_PATH/Info.plist,
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "TOOLCHAIN_DIR=\"$PROJECT_DIR/../../bin/mac\"\nLUA=\"$TOOLCHAIN_DIR/lua\"\n\nASSETS_DIR=\"$PROJECT_DIR\"/../test/assets\nif [ -d \"$PROJECT_DIR\"/../test/assets2 ]\nthen\n ASSETS_DIR=\"$PROJECT_DIR\"/../test/assets2\nfi\n\necho Running \"$LUA\" \"$PROJECT_DIR\"/../../bin/mac/buildSettingsToPlist.lua $ASSETS_DIR \"$BUILT_PRODUCTS_DIR/$EXECUTABLE_FOLDER_PATH/\"\nLUA_PATH=\"$PROJECT_DIR/../../platform/resources/?.lua\" export LUA_PATH\n\"$LUA\" \"$PROJECT_DIR\"/../../bin/mac/buildSettingsToPlist.lua $ASSETS_DIR \"$BUILT_PRODUCTS_DIR/$EXECUTABLE_FOLDER_PATH/\"\n";
shellScript = "TOOLCHAIN_DIR=\"$PROJECT_DIR/../../bin/mac\"\nLUA=\"$TOOLCHAIN_DIR/lua\"\n\nASSETS_DIR=\"$PROJECT_DIR\"/../test/assets\nif [ -d \"$PROJECT_DIR\"/../test/assets2 ]\nthen\n ASSETS_DIR=\"$PROJECT_DIR\"/../test/assets2\nfi\n\necho Running \"$LUA\" \"$PROJECT_DIR\"/../../bin/mac/buildSettingsToPlist.lua $ASSETS_DIR \"$BUILT_PRODUCTS_DIR/$EXECUTABLE_FOLDER_PATH/\"\nLUA_PATH=\"$PROJECT_DIR/../../platform/resources/?.lua\" export LUA_PATH\n\"$LUA\" \"$PROJECT_DIR\"/../../bin/mac/buildSettingsToPlist.lua $ASSETS_DIR \"$BUILT_PRODUCTS_DIR/$EXECUTABLE_FOLDER_PATH/\"\n\ntouch \"$DERIVED_FILE_DIR/info.created\"\n";
showEnvVarsInLog = 0;
};
F576AD392A99C5A000B85312 /* ShellScript */ = {
Expand Down
7 changes: 6 additions & 1 deletion platform/mac/AppDelegate.mm
Expand Up @@ -254,7 +254,7 @@ static void SigPIPEHandler(int signal)

NSString *kosVersionMinimum = @"10.9"; // we refuse to run on OSes older than this
NSString *kosVersionPrevious = @"10.12"; // should be updated as Apple releases new OSes
NSString *kosVersionCurrent = @"13.99"; // should be updated as Apple releases new OSes; we will run on this one and the previous one
NSString *kosVersionCurrent = @"14.99"; // should be updated as Apple releases new OSes; we will run on this one and the previous one

// These tags are defined on the various DeviceBuild dialogs in Interface Builder
enum {
Expand Down Expand Up @@ -659,6 +659,11 @@ -(id)init
return self;
}

- (BOOL)applicationSupportsSecureRestorableState:(NSApplication *)app
{
return NO;
}

- (void) checkOpenGLRequirements
{
// Force the OpenGL context to be created now and make current and query OpenGL for extensions.
Expand Down
5 changes: 5 additions & 0 deletions platform/mac/CoronaConsole/CoronaConsole/AppDelegate.m
Expand Up @@ -32,6 +32,11 @@ static void NotificationCallback(CFNotificationCenterRef center, void *observer,

@implementation AppDelegate

- (BOOL)applicationSupportsSecureRestorableState:(NSApplication *)app
{
return NO;
}

- (void)applicationWillFinishLaunching:(NSNotification *)aNotification
{
CFNotificationCenterAddObserver(CFNotificationCenterGetDistributedCenter(), (__bridge const void *)(self), NotificationCallback, CFSTR("CoronaConsole.clearConsole"), NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
Expand Down
5 changes: 5 additions & 0 deletions platform/mac/CoronaLiveServer/CoronaLiveServer/AppDelegate.m
Expand Up @@ -38,6 +38,11 @@ @interface AppDelegate () <NSTableViewDataSource, NSTableViewDelegate, NSDraggin

@implementation AppDelegate

- (BOOL)applicationSupportsSecureRestorableState:(NSApplication *)app
{
return NO;
}

-(BOOL)addHTML5Project:(NSString*)project reportErrorToUser:(BOOL)guiError
{
if(self.httpServerController == nil) {
Expand Down
5 changes: 5 additions & 0 deletions platform/mac/CoronaShell/CoronaShell/AppDelegate.m
Expand Up @@ -41,6 +41,11 @@ @implementation AppDelegate
@synthesize suspendWhenMinimized = _suspendWhenMinimized;
@synthesize lastSentWindowStateForeground;

- (BOOL)applicationSupportsSecureRestorableState:(NSApplication *)app
{
return NO;
}

- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
{
#ifdef USE_HOCKEYSDK
Expand Down
1 change: 1 addition & 0 deletions platform/tvos/CoronaCards/CoronaMainViewController.h
Expand Up @@ -6,6 +6,7 @@
//

#import <GameController/GCController.h>
#import <GameController/GCEventViewController.h>

@class CoronaView;
@class CoronaViewController;
Expand Down

0 comments on commit 685b98d

Please sign in to comment.