From 13fed74b3877559f0d52ce2bfcd8eef582679db2 Mon Sep 17 00:00:00 2001 From: MoNTE48 Date: Sun, 26 Apr 2020 19:29:34 +0200 Subject: [PATCH] iOS: update deps --- .../MultiCraft.xcodeproj/project.pbxproj | 36 ++++++++++++++++--- build/iOS/MultiCraft/MultiCraft/dummy.swift | 1 + build/iOS/Podfile | 19 +++++----- 3 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 build/iOS/MultiCraft/MultiCraft/dummy.swift diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index b3d66e46..c7020622 100755 --- a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -37,11 +37,12 @@ 4B35A9F71EEE018D00274961 /* scripting_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B35A9F51EEE018D00274961 /* scripting_server.cpp */; }; 842A808C2339174C00A89418 /* ads.mm in Sources */ = {isa = PBXBuildFile; fileRef = 842A808B2339174C00A89418 /* ads.mm */; }; 844B495F228606B200EB60EF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 844B495D228606B200EB60EF /* Main.storyboard */; }; + 844E20202454737E00CD5A35 /* dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 844E201F2454737E00CD5A35 /* dummy.swift */; }; 8465A76522A7D4500095B7CA /* libintl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8465A76422A7D4500095B7CA /* libintl.cpp */; }; 849C4F86209656D3005EB041 /* ru.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 849C4F85209656D2005EB041 /* ru.lproj */; }; 84AA10F323D20C070056F125 /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84AA10F223D20BE50056F125 /* libluajit.a */; }; 84FE40E224439C2F008E29DB /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FE40E124439C2F008E29DB /* libcurl.a */; }; - EB4367AE23CAD13A43ADF4B1 /* libPods-MultiCraft.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8758CE009FCB7E91F4C84C28 /* libPods-MultiCraft.a */; }; + 8E0FFE3234B35EC9603EC82A /* Pods_MultiCraft.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B0001862274A8FCC7614F0 /* Pods_MultiCraft.framework */; }; F856B5C31F55F7EE00FE9494 /* bg.png in Resources */ = {isa = PBXBuildFile; fileRef = F856B5C21F55F7EE00FE9494 /* bg.png */; }; F87DC8BA210887C700393B64 /* mapgen_v7p.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F87DC8B9210887C700393B64 /* mapgen_v7p.cpp */; }; F8E6C4E91DCA3B7900F64426 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F8E6C4E81DCA3B7900F64426 /* Assets.xcassets */; }; @@ -281,10 +282,12 @@ 4B35A9F31EEE017000274961 /* scripting_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scripting_client.h; path = ../../../../src/script/scripting_client.h; sourceTree = ""; }; 4B35A9F51EEE018D00274961 /* scripting_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = scripting_server.cpp; path = ../../../../src/script/scripting_server.cpp; sourceTree = ""; }; 4B35A9F61EEE018D00274961 /* scripting_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scripting_server.h; path = ../../../../src/script/scripting_server.h; sourceTree = ""; }; + 73B0001862274A8FCC7614F0 /* Pods_MultiCraft.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MultiCraft.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 840E2F9E233410F90088E7F7 /* SDVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDVersion.h; path = SDVersion/SDVersion.h; sourceTree = ""; }; 842A808A2339174B00A89418 /* ads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ads.h; path = Ads/ads.h; sourceTree = ""; }; 842A808B2339174C00A89418 /* ads.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ads.mm; path = Ads/ads.mm; sourceTree = ""; }; 844B495E228606B200EB60EF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 844E201F2454737E00CD5A35 /* dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dummy.swift; sourceTree = ""; }; 8465A76122A7D4500095B7CA /* MessageCatalog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = MessageCatalog.hpp; path = ../../../../lib/intl/MessageCatalog.hpp; sourceTree = ""; }; 8465A76222A7D4500095B7CA /* libintl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libintl.h; path = ../../../../lib/intl/libintl.h; sourceTree = ""; }; 8465A76322A7D4500095B7CA /* Util.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Util.hpp; path = ../../../../lib/intl/Util.hpp; sourceTree = ""; }; @@ -292,7 +295,6 @@ 849C4F85209656D2005EB041 /* ru.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ru.lproj; sourceTree = ""; }; 84AA10F223D20BE50056F125 /* libluajit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libluajit.a; path = ../Pods/LuaJITPod/lib/libluajit.a; sourceTree = ""; }; 84FE40E124439C2F008E29DB /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../deps/libcurl/lib/libcurl.a; sourceTree = ""; }; - 8758CE009FCB7E91F4C84C28 /* libPods-MultiCraft.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MultiCraft.a"; sourceTree = BUILT_PRODUCTS_DIR; }; F856B5C21F55F7EE00FE9494 /* bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bg.png; path = ../../../../textures/base/bg.png; sourceTree = ""; }; F87DC8B8210887C600393B64 /* mapgen_v7p.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mapgen_v7p.h; path = ../../../../src/mapgen_v7p.h; sourceTree = ""; }; F87DC8B9210887C700393B64 /* mapgen_v7p.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mapgen_v7p.cpp; path = ../../../../src/mapgen_v7p.cpp; sourceTree = ""; }; @@ -710,7 +712,7 @@ F8E6C7D51DCA476800F64426 /* libIrrlicht.a in Frameworks */, F8E6C7D71DCA477600F64426 /* libfreetype.a in Frameworks */, 84FE40E224439C2F008E29DB /* libcurl.a in Frameworks */, - EB4367AE23CAD13A43ADF4B1 /* libPods-MultiCraft.a in Frameworks */, + 8E0FFE3234B35EC9603EC82A /* Pods_MultiCraft.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -790,6 +792,7 @@ F8E6C7E01DCA4EB300F64426 /* assets.zip */, F8E6C7E21DCA511700F64426 /* worlds.zip */, F856B5C21F55F7EE00FE9494 /* bg.png */, + 844E201F2454737E00CD5A35 /* dummy.swift */, ); name = "Supporting Files"; sourceTree = ""; @@ -1327,7 +1330,7 @@ F8E6C7C81DCA430300F64426 /* OpenGLES.framework */, F8E6C7C61DCA42FA00F64426 /* UIKit.framework */, F8E6C7C41DCA42F300F64426 /* QuartzCore.framework */, - 8758CE009FCB7E91F4C84C28 /* libPods-MultiCraft.a */, + 73B0001862274A8FCC7614F0 /* Pods_MultiCraft.framework */, ); name = Frameworks; sourceTree = ""; @@ -1344,6 +1347,7 @@ F8E6C4D61DCA3B7900F64426 /* Frameworks */, F8E6C4D71DCA3B7900F64426 /* Resources */, E156912616D2E9233FC1C9F4 /* [CP] Copy Pods Resources */, + 7055146ABE25F98BDC1A6400 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -1360,11 +1364,12 @@ F8E6C4D11DCA3B7900F64426 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1140; ORGANIZATIONNAME = MultiCraft; TargetAttributes = { F8E6C4D81DCA3B7900F64426 = { CreatedOnToolsVersion = 8.0; + LastSwiftMigration = 1140; SystemCapabilities = { com.apple.BackgroundModes = { enabled = 1; @@ -1409,6 +1414,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 7055146ABE25F98BDC1A6400 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MultiCraft/Pods-MultiCraft-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MultiCraft/Pods-MultiCraft-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MultiCraft/Pods-MultiCraft-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; C73312165F97B96FC254B124 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1647,6 +1669,7 @@ F8E6C60D1DCA3F9900F64426 /* drawscene.cpp in Sources */, F8E6C71D1DCA41EF00F64426 /* s_security.cpp in Sources */, F8E6C7641DCA423C00F64426 /* event.cpp in Sources */, + 844E20202454737E00CD5A35 /* dummy.swift in Sources */, 4B35A9E51EEE00F900274961 /* l_localplayer.cpp in Sources */, F8E6C6501DCA3F9900F64426 /* serialization.cpp in Sources */, F8E6C6281DCA3F9900F64426 /* light.cpp in Sources */, @@ -1698,6 +1721,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; STRIP_PNG_TEXT = NO; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1722,6 +1746,8 @@ LLVM_LTO = YES; SDKROOT = iphoneos; STRIP_PNG_TEXT = NO; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; diff --git a/build/iOS/MultiCraft/MultiCraft/dummy.swift b/build/iOS/MultiCraft/MultiCraft/dummy.swift new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/build/iOS/MultiCraft/MultiCraft/dummy.swift @@ -0,0 +1 @@ + diff --git a/build/iOS/Podfile b/build/iOS/Podfile index d5aee603..f778100f 100755 --- a/build/iOS/Podfile +++ b/build/iOS/Podfile @@ -1,15 +1,16 @@ project 'MultiCraft/MultiCraft.xcodeproj' platform :ios, '9.0' +use_frameworks! def appodeal source 'https://github.com/appodeal/CocoaPods.git' - pod 'Appodeal/AdColonyAdapter' - pod 'Appodeal/AppodealAdExchangeAdapter' - pod 'Appodeal/AppLovinAdapter' - pod 'Appodeal/MintegralAdapter' - pod 'Appodeal/TapjoyAdapter' - pod 'Appodeal/UnityAdapter' + pod 'APDAdColonyAdapter', '2.7.1.1-Beta' + pod 'APDAppLovinAdapter', '2.7.1.1-Beta' + pod 'APDAppodealAdExchangeAdapter', '2.7.1.1-Beta' + pod 'APDMintegralAdapter', '2.7.1.1-Beta' + pod 'APDTapjoyAdapter', '2.7.1.1-Beta' + pod 'APDUnityAdapter', '2.7.1.1-Beta' pod 'PersonalizedAdConsent', :git => 'https://github.com/MoNTE48/consent-sdk-ios' end @@ -35,9 +36,9 @@ post_install do |installer| config.build_settings['LLVM_LTO'] = 'YES' config.build_settings['ENABLE_BITCODE'] = 'NO' config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0' - config.build_settings['OTHER_CFLAGS'] ||= ['-fvisibility=hidden', '-fdata-sections', '-ffunction-sections', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables'] - config.build_settings['OTHER_CPLUSPLUSFLAGS'] ||= ['$(OTHER_CFLAGS)'] - config.build_settings['OTHER_LDFLAGS'] = ['-Wl,-dead_strip'] + config.build_settings['OTHER_CFLAGS'] = ['$(inherited)', '-fvisibility-inlines-hidden', '-fdata-sections', '-ffunction-sections', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables'] + config.build_settings['OTHER_CPLUSPLUSFLAGS'] = ['$(inherited)', '$(OTHER_CFLAGS)'] + config.build_settings['OTHER_LDFLAGS'] = ['$(inherited)', '-Wl,-dead_strip'] end end end