diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 926c07ca1..ed9b62290 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 }} @@ -72,7 +72,7 @@ jobs: runner: - macos-13 xcode: - - Xcode_14.3 + - Xcode_15.0 target: - template - template-angle diff --git a/platform/iphone/ratatouille.xcodeproj/project.pbxproj b/platform/iphone/ratatouille.xcodeproj/project.pbxproj index 08596a264..af1f6b564 100755 --- a/platform/iphone/ratatouille.xcodeproj/project.pbxproj +++ b/platform/iphone/ratatouille.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -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 */, @@ -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; @@ -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 */ = { diff --git a/platform/mac/AppDelegate.mm b/platform/mac/AppDelegate.mm index 4a124ff09..639f2b01d 100755 --- a/platform/mac/AppDelegate.mm +++ b/platform/mac/AppDelegate.mm @@ -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 { @@ -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. diff --git a/platform/mac/CoronaConsole/CoronaConsole/AppDelegate.m b/platform/mac/CoronaConsole/CoronaConsole/AppDelegate.m index c11f0b232..ae6779cb1 100644 --- a/platform/mac/CoronaConsole/CoronaConsole/AppDelegate.m +++ b/platform/mac/CoronaConsole/CoronaConsole/AppDelegate.m @@ -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); diff --git a/platform/mac/CoronaLiveServer/CoronaLiveServer/AppDelegate.m b/platform/mac/CoronaLiveServer/CoronaLiveServer/AppDelegate.m index 112169dba..d68e7c8ff 100644 --- a/platform/mac/CoronaLiveServer/CoronaLiveServer/AppDelegate.m +++ b/platform/mac/CoronaLiveServer/CoronaLiveServer/AppDelegate.m @@ -38,6 +38,11 @@ @interface AppDelegate () +#import @class CoronaView; @class CoronaViewController;