games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-24 03:47:18 +02:00
Code Issues Releases Activity

remove entitlements and shared container usage

Browse Source 
they're no longer required since we have a single app now
This commit is contained in:
Andrey Filipenkov 2022-08-03 10:57:27 +03:00
parent 10a14bd6fd
commit bb00ec8ce2
5 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/CMakeLists.txt
View File

@ -206,15 +206,11 @@ elseif(APPLE_IOS)
"-weak_framework CoreHaptics"
)
set(ENTITLEMENTS_OUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/VCMI.entitlements)
configure_file(ios/Entitlements.in ${ENTITLEMENTS_OUT_PATH} @ONLY)
set_target_properties(vcmiclient PROPERTIES
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_LIST_DIR}/ios/Info.plist"
XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/Frameworks"
XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "$(CODE_SIGNING_ALLOWED_FOR_APPS)"
XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME AppIcon
XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${ENTITLEMENTS_OUT_PATH}
)
target_sources(vcmiclient PRIVATE ${CMAKE_SOURCE_DIR}/client/LaunchScreen.storyboard)

10
client/ios/Entitlements.in
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.application-groups</key>
<array>
<string>group.@BUNDLE_IDENTIFIER_PREFIX@.vcmi</string>
</array>
</dict>
</plist>

6
lib/CIOSUtils.h
View File

@ -22,12 +22,6 @@ extern "C" {
extern const char *ios_documentsPath();
extern const char *ios_cachesPath();
#ifdef __OBJC__
NSURL *sharedContainerURL();
NSURL *sharedGameDataURL();
#endif
extern const char *ios_sharedDataPath();
#if TARGET_OS_SIMULATOR
extern const char *ios_hostApplicationSupportPath();
#endif

15
lib/CIOSUtils.m
View File

@ -21,21 +21,6 @@ static const char *standardPath(NSSearchPathDirectory directory) { return standa
const char *ios_documentsPath() { return standardPath(NSDocumentDirectory); }
const char *ios_cachesPath() { return standardPath(NSCachesDirectory); }
NSURL *sharedContainerURL()
{
static NSURL *sharedPathURL;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
__auto_type bundleID = NSBundle.mainBundle.bundleIdentifier;
__auto_type lastDotPos = [bundleID rangeOfString:@"." options:NSBackwardsSearch].location;
__auto_type groupID = [NSString stringWithFormat:@"group.%@.vcmi", [bundleID substringToIndex:lastDotPos]];
sharedPathURL = [NSFileManager.defaultManager containerURLForSecurityApplicationGroupIdentifier:groupID];
});
return sharedPathURL;
}
NSURL *sharedGameDataURL() { return [sharedContainerURL() URLByAppendingPathComponent:@"GameData"]; }
const char *ios_sharedDataPath() { return sharedGameDataURL().fileSystemRepresentation; }
#if TARGET_OS_SIMULATOR
const char *ios_hostApplicationSupportPath()
{

2
lib/VCMIDirs.cpp
View File

@ -392,7 +392,7 @@ class VCMIDirsIOS final : public VCMIDirsApple
bfs::path binaryPath() const override;
};
bfs::path VCMIDirsIOS::userDataPath() const { return {ios_sharedDataPath() ?: ios_documentsPath()}; }
bfs::path VCMIDirsIOS::userDataPath() const { return {ios_documentsPath()}; }
bfs::path VCMIDirsIOS::userCachePath() const { return {ios_cachesPath()}; }
bfs::path VCMIDirsIOS::userLogsPath() const { return {ios_documentsPath()}; }