From 6b8129a519ab231b91b2a56f4ee466ac54f0a5df Mon Sep 17 00:00:00 2001 From: AGulev Date: Mon, 3 Jun 2024 10:25:20 +0200 Subject: [PATCH] ios update preparation --- extension-ironsource/ext.manifest | 1 + extension-ironsource/ext.properties | 10 +++- extension-ironsource/manifests/ios/Podfile | 55 +++++++++++++--------- game.project | 4 +- updater/ios.py | 12 +++-- 5 files changed, 51 insertions(+), 31 deletions(-) diff --git a/extension-ironsource/ext.manifest b/extension-ironsource/ext.manifest index 4be90a3..a6b1aea 100644 --- a/extension-ironsource/ext.manifest +++ b/extension-ironsource/ext.manifest @@ -6,6 +6,7 @@ platforms: excludeJars: ["(.*)/androidx-multidex.jar"] ios: context: + flags: ["-std=c++11"] frameworks: ["UIKit", "AppTrackingTransparency", "AVFoundation"] linkFlags: ["-ObjC", "-Wl,-rpath,/usr/lib/swift", "-Wl,-rpath,@executable_path/Frameworks"] libs: ["swiftCompatibility50", "swiftCompatibility51"] diff --git a/extension-ironsource/ext.properties b/extension-ironsource/ext.properties index 6e9bb6f..4ebc29e 100644 --- a/extension-ironsource/ext.properties +++ b/extension-ironsource/ext.properties @@ -69,8 +69,8 @@ applovin_ios.type = bool charboost_ios.private = 1 charboost_ios.type = bool -fyber_ios.private = 1 -fyber_ios.type = bool +dt_exchange_ios.private = 1 +dt_exchange_ios.type = bool admob_ios.private = 1 admob_ios.type = bool @@ -96,6 +96,9 @@ facebook_ios.type = bool mintegral_ios.private = 1 mintegral_ios.type = bool +moloco_ios.private = 1 +moloco_ios.type = bool + mytarget_ios.private = 1 mytarget_ios.type = bool @@ -108,5 +111,8 @@ tencent_ios.type = bool unityads_ios.private = 1 unityads_ios.type = bool +yandex_ads_ios.private = 1 +yandex_ads_ios.type = bool + yahoo_ios.private = 1 yahoo_ios.type = bool diff --git a/extension-ironsource/manifests/ios/Podfile b/extension-ironsource/manifests/ios/Podfile index a4556d6..a6f020e 100644 --- a/extension-ironsource/manifests/ios/Podfile +++ b/extension-ironsource/manifests/ios/Podfile @@ -1,80 +1,89 @@ platform :ios, '13.0' -pod 'IronSourceSDK','7.7.0.0' -pod 'IronSourceAdQualitySDK','7.20.0' +pod 'IronSourceSDK','8.1.0.0' +pod 'IronSourceAdQualitySDK','7.20.0' + {{#iron_source.applovin_ios}} -pod 'IronSourceAppLovinAdapter','4.3.42.1' +pod 'IronSourceAppLovinAdapter','4.3.46.1' {{/iron_source.applovin_ios}} {{#iron_source.aps_ios}} -pod 'IronSourceAPSAdapter','4.3.9.2' +pod 'IronSourceAPSAdapter','4.3.13.3' {{/iron_source.aps_ios}} {{#iron_source.bidmachine_ios}} -pod 'IronSourceBidMachineAdapter','4.3.3.2' +pod 'IronSourceBidMachineAdapter','4.3.9.1' {{/iron_source.bidmachine_ios}} {{#iron_source.charboost_ios}} -pod 'IronSourceChartboostAdapter','4.3.16.2' +pod 'IronSourceChartboostAdapter','4.3.18.3' {{/iron_source.charboost_ios}} {{#iron_source.csj_ios}} -pod 'IronSourceCSJAdapter', '4.3.2.6' +pod 'IronSourceCSJAdapter', '4.3.3.1' {{/iron_source.csj_ios}} -{{#iron_source.fyber_ios}} -pod 'IronSourceFyberAdapter','4.3.31.4' -{{/iron_source.fyber_ios}} +{{#iron_source.dt_exchange_ios}} +pod 'IronSourceFyberAdapter','4.3.34.3' +{{/iron_source.dt_exchange_ios}} {{#iron_source.facebook_ios}} -pod 'IronSourceFacebookAdapter','4.3.43.3' +pod 'IronSourceFacebookAdapter','4.3.44.3' {{/iron_source.facebook_ios}} {{#iron_source.admob_ios}} -pod 'IronSourceAdMobAdapter','4.3.51.0' +pod 'IronSourceAdMobAdapter','4.3.54.1' {{/iron_source.admob_ios}} {{#iron_source.hyprmx_ios}} -pod 'IronSourceHyprMXAdapter','4.3.3.5' +pod 'IronSourceHyprMXAdapter','4.3.5.2' {{/iron_source.hyprmx_ios}} {{#iron_source.inmobi_ios}} -pod 'IronSourceInMobiAdapter','4.3.20.2' +pod 'IronSourceInMobiAdapter','4.3.23.3' {{/iron_source.inmobi_ios}} {{#iron_source.liftoff_ios}} -pod 'IronSourceVungleAdapter','4.3.30.1' +pod 'IronSourceVungleAdapter','4.3.35.1' {{/iron_source.liftoff_ios}} {{#iron_source.maio_ios}} -pod 'IronSourceMaioAdapter','4.1.11.6' +pod 'IronSourceMaioAdapter','4.1.11.11' {{/iron_source.maio_ios}} {{#iron_source.mintegral_ios}} -pod 'IronSourceMintegralAdapter', '4.3.19.1' +pod 'IronSourceMintegralAdapter', '4.3.23.3' {{/iron_source.mintegral_ios}} +{{#iron_source.moloco_ios}} +pod 'IronSourceMolocoAdapter','4.3.1.1' +{{/iron_source.moloco_ios}} + {{#iron_source.mytarget_ios}} -pod 'IronSourceMyTargetAdapter','4.1.18.2' +pod 'IronSourceMyTargetAdapter','4.1.21.3' {{/iron_source.mytarget_ios}} {{#iron_source.pangle_ios}} -pod 'IronSourcePangleAdapter','4.3.25.1' +pod 'IronSourcePangleAdapter','4.3.28.3' {{/iron_source.pangle_ios}} {{#iron_source.smaato_ios}} -pod 'IronSourceSmaatoAdapter','4.3.10.6' +pod 'IronSourceSmaatoAdapter','4.3.13.3' {{/iron_source.smaato_ios}} {{#iron_source.superawesome_ios}} -pod 'IronSourceSuperAwesomeAdapter','4.1.7.5' +pod 'IronSourceSuperAwesomeAdapter','4.1.11.3' {{/iron_source.superawesome_ios}} {{#iron_source.tencent_ios}} -pod 'IronSourceTencentAdapter','4.3.5.6' +pod 'IronSourceTencentAdapter','4.3.6.3' {{/iron_source.tencent_ios}} {{#iron_source.unityads_ios}} -pod 'IronSourceUnityAdsAdapter','4.3.34.2' +pod 'IronSourceUnityAdsAdapter','4.3.40.1' {{/iron_source.unityads_ios}} +{{#iron_source.yandex_ads_ios}} +pod 'IronSourceYandexAdapter', '4.3.1.1' +{{/iron_source.yandex_ads_ios}} + diff --git a/game.project b/game.project index 94387cb..c3d18ba 100755 --- a/game.project +++ b/game.project @@ -47,15 +47,17 @@ admob_ios = 1 admob_ios_appid = ca-app-pub-3940256099942544~1458002511 applovin_ios = 1 charboost_ios = 1 -fyber_ios = 1 +dt_exchange_ios = 1 facebook_ios = 1 hyprmx_ios = 1 inmobi_ios = 1 liftoff_ios = 1 maio_ios = 1 mintegral_ios = 1 +moloco_ios = 1 mytarget_ios = 1 unityads_ios = 1 +yandex_ads_ios = 1 [ios] bundle_identifier = com.defold.ironsource diff --git a/updater/ios.py b/updater/ios.py index c785477..9d4c560 100644 --- a/updater/ios.py +++ b/updater/ios.py @@ -80,7 +80,7 @@ def parse_js_table(url, var_name): 'BidMachine': 'bidmachine', 'Chartboost': 'charboost', 'CSJ': 'csj', - 'Digital Turbine': 'fyber', + 'DT Exchange': 'dt_exchange', 'Facebook': 'facebook', 'Google': 'admob', 'HyprMX': 'hyprmx', @@ -88,13 +88,14 @@ def parse_js_table(url, var_name): 'Liftoff Monetize': 'liftoff', 'Maio': 'maio', 'Mintegral': 'mintegral', + 'Moloco': 'moloco', 'myTarget': 'mytarget', 'Pangle': 'pangle', 'Smaato': 'smaato', 'SuperAwesome': 'superawesome', - # 'Tapjoy': 'tapjoy', 'Tencent': 'tencent', 'UnityAds': 'unityads', + 'Yandex Ads': 'yandex_ads' } result = "" @@ -109,17 +110,18 @@ def parse_js_table(url, var_name): del site_values['sdk_maven'] del site_values['sdk_cocoapods'] -for key, value in site_values.items(): +stripped_site_values = {key.strip(): value for key, value in site_values.items()} +for key, value in stripped_site_values.items(): if mapping.get(key) is None: exit(f"Adapter `{key}` was added. Please change `mappings` in this script and add adapter to `game.project` and `ext.properties`") for key, value in mapping.items(): - if site_values.get(key) is None: + if stripped_site_values.get(key) is None: exit(f"Adapter `{key}` was removed. Please change `mappings` in this script and remove adapter from `game.project` and `ext.properties`") for key, value in mapping.items(): result += f"{{{{#iron_source.{value}_ios}}}}\n" - result += remove_spaces_and_newlines(site_values[key]['code']) + result += remove_spaces_and_newlines(stripped_site_values[key]['code']) result += f"\n{{{{/iron_source.{value}_ios}}}}\n\n" result = repositories + result