diff --git a/PoingGodotAdMob/Podfile b/PoingGodotAdMob/Podfile index 867f2ba..9ef86de 100644 --- a/PoingGodotAdMob/Podfile +++ b/PoingGodotAdMob/Podfile @@ -21,4 +21,3 @@ add_pods_to_target('ads') add_pods_to_target('core') add_pods_to_target('meta', 'src/mediation/meta/config/libs/meta-pods.txt') add_pods_to_target('vungle', 'src/mediation/vungle/config/libs/vungle-pods.txt') -add_pods_to_target('adcolony', 'src/mediation/adcolony/config/libs/adcolony-pods.txt') diff --git a/PoingGodotAdMob/Podfile.lock b/PoingGodotAdMob/Podfile.lock index 03f20f8..ef22372 100644 --- a/PoingGodotAdMob/Podfile.lock +++ b/PoingGodotAdMob/Podfile.lock @@ -1,99 +1,38 @@ PODS: - - AdColony (4.9.0) - - FBAudienceNetwork (6.12.0) - - Google-Mobile-Ads-SDK (10.13.0): - - GoogleAppMeasurement (< 11.0, >= 7.0) + - FBAudienceNetwork (6.15.0) + - Google-Mobile-Ads-SDK (11.3.0): - GoogleUserMessagingPlatform (>= 1.1) - - GoogleAppMeasurement (10.17.0): - - GoogleAppMeasurement/AdIdSupport (= 10.17.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - - GoogleUtilities/MethodSwizzler (~> 7.11) - - GoogleUtilities/Network (~> 7.11) - - "GoogleUtilities/NSData+zlib (~> 7.11)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (10.17.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 10.17.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - - GoogleUtilities/MethodSwizzler (~> 7.11) - - GoogleUtilities/Network (~> 7.11) - - "GoogleUtilities/NSData+zlib (~> 7.11)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (10.17.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - - GoogleUtilities/MethodSwizzler (~> 7.11) - - GoogleUtilities/Network (~> 7.11) - - "GoogleUtilities/NSData+zlib (~> 7.11)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleMobileAdsMediationAdColony (4.9.0.2): - - AdColony (= 4.9.0) - - Google-Mobile-Ads-SDK (~> 10.0) - - GoogleMobileAdsMediationFacebook (6.12.0.1): - - FBAudienceNetwork (= 6.12.0) - - Google-Mobile-Ads-SDK (~> 10.0) - - GoogleMobileAdsMediationVungle (6.12.3.0): - - Google-Mobile-Ads-SDK (~> 10.0) - - VungleSDK-iOS (= 6.12.3) - - GoogleUserMessagingPlatform (2.1.0) - - GoogleUtilities/AppDelegateSwizzler (7.12.0): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Environment (7.12.0): - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.12.0): - - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.12.0): - - GoogleUtilities/Logger - - GoogleUtilities/Network (7.12.0): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.12.0)" - - GoogleUtilities/Reachability (7.12.0): - - GoogleUtilities/Logger - - nanopb (2.30909.1): - - nanopb/decode (= 2.30909.1) - - nanopb/encode (= 2.30909.1) - - nanopb/decode (2.30909.1) - - nanopb/encode (2.30909.1) - - PromisesObjC (2.3.1) - - VungleSDK-iOS (6.12.3) + - GoogleMobileAdsMediationFacebook (6.15.0.0): + - FBAudienceNetwork (= 6.15.0) + - Google-Mobile-Ads-SDK (~> 11.0) + - GoogleMobileAdsMediationVungle (7.3.0.0): + - Google-Mobile-Ads-SDK (~> 11.0) + - VungleAds (= 7.3.0) + - GoogleUserMessagingPlatform (2.4.0) + - VungleAds (7.3.0) DEPENDENCIES: - - Google-Mobile-Ads-SDK (= 10.13.0) - - GoogleMobileAdsMediationAdColony (= 4.9.0.2) - - GoogleMobileAdsMediationFacebook (= 6.12.0.1) - - GoogleMobileAdsMediationVungle (= 6.12.3.0) + - Google-Mobile-Ads-SDK (= 11.3.0) + - GoogleMobileAdsMediationFacebook (= 6.15.0.0) + - GoogleMobileAdsMediationVungle (= 7.3) SPEC REPOS: trunk: - - AdColony - FBAudienceNetwork - Google-Mobile-Ads-SDK - - GoogleAppMeasurement - - GoogleMobileAdsMediationAdColony - GoogleMobileAdsMediationFacebook - GoogleMobileAdsMediationVungle - GoogleUserMessagingPlatform - - GoogleUtilities - - nanopb - - PromisesObjC - - VungleSDK-iOS + - VungleAds SPEC CHECKSUMS: - AdColony: 4f3738dc633d7aaa8ec60729df973076cc8e97ed - FBAudienceNetwork: e0fcc9091fced34910ed0b6da06f129db46ac9e6 - Google-Mobile-Ads-SDK: 517003a1a2430005da3e85df4d061cd7de107a5a - GoogleAppMeasurement: 4dcddfc7f102825c1c4e6422cb35567b101881a7 - GoogleMobileAdsMediationAdColony: 739e508a44288b54d59d4deb211340008d46d8f5 - GoogleMobileAdsMediationFacebook: d0dfe773d6009ddd2ee0dfded681a7a2c56a315b - GoogleMobileAdsMediationVungle: 967c32401bc395dc66fd4f2f177c594165c3802f - GoogleUserMessagingPlatform: dce302b8f1b84d6e945812ee7a15c3f65a102cbf - GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34 - nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 - PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 - VungleSDK-iOS: 27725029a42dfb9e39c67956637233fde1ee1797 + FBAudienceNetwork: 6c560e4c68823ec5da1e84868544a8a246e0e201 + Google-Mobile-Ads-SDK: 301a16c461c331ba34ff4dab40a22ab7c147af61 + GoogleMobileAdsMediationFacebook: 26dec5611c04af55eba3dd16c564bafa8ebd7131 + GoogleMobileAdsMediationVungle: 75f3f80a9f2c3bae806fc46d70ad3cff23f37c25 + GoogleUserMessagingPlatform: f131fa7978d2ba88d7426702b057c2cc318e6595 + VungleAds: c7bf642b4a4581177b5c76042423a21d8c32ef1e -PODFILE CHECKSUM: 08e093284dd78b67e7b6a7ad030dbe948d8bd016 +PODFILE CHECKSUM: ca5b0479f0367a3b1108b25256362fdc4e74f022 -COCOAPODS: 1.12.1 +COCOAPODS: 1.15.2 diff --git a/PoingGodotAdMob/PoingGodotAdMob.xcodeproj/project.pbxproj b/PoingGodotAdMob/PoingGodotAdMob.xcodeproj/project.pbxproj index 96ad541..3ced339 100644 --- a/PoingGodotAdMob/PoingGodotAdMob.xcodeproj/project.pbxproj +++ b/PoingGodotAdMob/PoingGodotAdMob.xcodeproj/project.pbxproj @@ -10,12 +10,9 @@ 3DF454CB5A80D6C4313AC810 /* Pods_ads.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61C7338744733ACDF9608C0F /* Pods_ads.framework */; }; 46C7E77DD2ECA925F3952036 /* Pods_vungle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4ED341537F1C46ECD8226C4 /* Pods_vungle.framework */; }; 5E027D892A74A770001551B6 /* PoingGodotAdMobInterstitialAd.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5E027D882A74A770001551B6 /* PoingGodotAdMobInterstitialAd.mm */; }; - 5E08983D2A4B91E30066A53A /* PoingGodotAdMobAdColonyAppOptions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5E08983C2A4B91E30066A53A /* PoingGodotAdMobAdColonyAppOptions.mm */; }; 5E38B5DB2A7546EF00E35218 /* InterstitialAd.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5E38B5DA2A7546EF00E35218 /* InterstitialAd.mm */; }; 5E4BF4A62B2F361A00E6C2AA /* StaticVariablesHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5E4BF4A52B2F361A00E6C2AA /* StaticVariablesHelper.mm */; }; 5E5BDE182A4632770071BE86 /* PoingGodotAdMobModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5E5BDE172A4632770071BE86 /* PoingGodotAdMobModule.mm */; }; - 5E5BDE3E2A4686B20071BE86 /* PoingGodotAdMobAdColonyModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5E5BDE3D2A4686B20071BE86 /* PoingGodotAdMobAdColonyModule.mm */; }; - 5E5BDE3F2A4686B20071BE86 /* PoingGodotAdMobAdColonyModule.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5E5BDE3C2A4686B20071BE86 /* PoingGodotAdMobAdColonyModule.h */; }; 5E63D64F2A64636100BDC600 /* ObjectToGodotDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5E63D64E2A64636100BDC600 /* ObjectToGodotDictionary.mm */; }; 5E80AAD52A44A50C001C750F /* PoingGodotAdMob.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5E80AAD42A44A50C001C750F /* PoingGodotAdMob.mm */; }; 5E80AAD62A44A50C001C750F /* PoingGodotAdMob.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5E80AAD32A44A50C001C750F /* PoingGodotAdMob.h */; }; @@ -41,23 +38,11 @@ 5EB13DF42A773CA000054CFC /* PoingGodotAdMobConsentForm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5EB13DF32A773CA000054CFC /* PoingGodotAdMobConsentForm.mm */; }; 5EB63E4E2A65DF0700699D72 /* PoingGodotAdMobAdSize.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5EB63E4D2A65DF0700699D72 /* PoingGodotAdMobAdSize.mm */; }; 5EB759202A68860400523E88 /* DeviceOrientationHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5EB7591F2A68860400523E88 /* DeviceOrientationHelper.mm */; }; - 5EE75CB62A4C50080028DBB2 /* AdColonyExtrasBuilder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5EE75CB52A4C50080028DBB2 /* AdColonyExtrasBuilder.mm */; }; D9C6EBA1B0831032019D81C7 /* Pods_core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A8B8A51BD2C38CF1E7585C67 /* Pods_core.framework */; }; F6F2893BCD20C5B28234938B /* Pods_meta.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D987DFBE4578E324D2F2E98E /* Pods_meta.framework */; }; - FD5CD28B654F484A801214C2 /* Pods_adcolony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 306A95510670715B1760AA7A /* Pods_adcolony.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ - 5E5BDE382A4686B20071BE86 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - 5E5BDE3F2A4686B20071BE86 /* PoingGodotAdMobAdColonyModule.h in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 5E80AACE2A44A50C001C750F /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -103,23 +88,16 @@ /* Begin PBXFileReference section */ 001FDF7CA428980BF8E6E60F /* Pods-meta.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-meta.release.xcconfig"; path = "Target Support Files/Pods-meta/Pods-meta.release.xcconfig"; sourceTree = ""; }; 0D0C9E5FF32E0DDCEDE2E41C /* Pods-ads.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ads.release.xcconfig"; path = "Target Support Files/Pods-ads/Pods-ads.release.xcconfig"; sourceTree = ""; }; - 306A95510670715B1760AA7A /* Pods_adcolony.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_adcolony.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 423FD0383D3ACB01587A333D /* Pods-meta.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-meta.debug.xcconfig"; path = "Target Support Files/Pods-meta/Pods-meta.debug.xcconfig"; sourceTree = ""; }; 5E01263E2AE8A13100E487EC /* PluginConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginConfiguration.h; sourceTree = ""; }; 5E027D872A74A75C001551B6 /* PoingGodotAdMobInterstitialAd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PoingGodotAdMobInterstitialAd.h; sourceTree = ""; }; 5E027D882A74A770001551B6 /* PoingGodotAdMobInterstitialAd.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PoingGodotAdMobInterstitialAd.mm; sourceTree = ""; }; - 5E08983B2A4B91C80066A53A /* PoingGodotAdMobAdColonyAppOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PoingGodotAdMobAdColonyAppOptions.h; sourceTree = ""; }; - 5E08983C2A4B91E30066A53A /* PoingGodotAdMobAdColonyAppOptions.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PoingGodotAdMobAdColonyAppOptions.mm; sourceTree = ""; }; - 5E08983F2A4B95B50066A53A /* poing-godot-admob-adcolony.gdip */ = {isa = PBXFileReference; lastKnownFileType = text; path = "poing-godot-admob-adcolony.gdip"; sourceTree = ""; }; 5E38B5D92A7546D100E35218 /* InterstitialAd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InterstitialAd.h; sourceTree = ""; }; 5E38B5DA2A7546EF00E35218 /* InterstitialAd.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = InterstitialAd.mm; sourceTree = ""; }; 5E4BF4A42B2F360900E6C2AA /* StaticVariablesHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StaticVariablesHelper.h; sourceTree = ""; }; 5E4BF4A52B2F361A00E6C2AA /* StaticVariablesHelper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = StaticVariablesHelper.mm; sourceTree = ""; }; 5E5BDE162A4632300071BE86 /* PoingGodotAdMobModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PoingGodotAdMobModule.h; sourceTree = ""; }; 5E5BDE172A4632770071BE86 /* PoingGodotAdMobModule.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PoingGodotAdMobModule.mm; sourceTree = ""; }; - 5E5BDE3A2A4686B20071BE86 /* poing-godot-admob-adcolony.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "poing-godot-admob-adcolony.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5E5BDE3C2A4686B20071BE86 /* PoingGodotAdMobAdColonyModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PoingGodotAdMobAdColonyModule.h; sourceTree = ""; }; - 5E5BDE3D2A4686B20071BE86 /* PoingGodotAdMobAdColonyModule.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PoingGodotAdMobAdColonyModule.mm; sourceTree = ""; }; 5E63D64D2A64632D00BDC600 /* ObjectToGodotDictionary.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ObjectToGodotDictionary.h; sourceTree = ""; }; 5E63D64E2A64636100BDC600 /* ObjectToGodotDictionary.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ObjectToGodotDictionary.mm; sourceTree = ""; }; 5E80AAD02A44A50C001C750F /* poing-godot-admob-ads.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "poing-godot-admob-ads.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -138,7 +116,6 @@ 5E9F24162A8320B900148BB2 /* ads-pods.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "ads-pods.txt"; sourceTree = ""; }; 5E9F24172A8323C200148BB2 /* meta-pods.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "meta-pods.txt"; sourceTree = ""; }; 5E9F24182A8323D300148BB2 /* vungle-pods.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "vungle-pods.txt"; sourceTree = ""; }; - 5E9F24192A8323E400148BB2 /* adcolony-pods.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "adcolony-pods.txt"; sourceTree = ""; }; 5EA276112A66FC5C00D5CF1E /* PoingGodotAdMobAdView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PoingGodotAdMobAdView.h; sourceTree = ""; }; 5EA276122A66FC6A00D5CF1E /* PoingGodotAdMobAdView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PoingGodotAdMobAdView.mm; sourceTree = ""; }; 5EA276152A67396200D5CF1E /* BannerAd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BannerAd.h; sourceTree = ""; }; @@ -177,11 +154,7 @@ 5EB63E4F2A65DF1B00699D72 /* PoingGodotAdMobAdSize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PoingGodotAdMobAdSize.h; sourceTree = ""; }; 5EB7591F2A68860400523E88 /* DeviceOrientationHelper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DeviceOrientationHelper.mm; sourceTree = ""; }; 5EB759212A68865600523E88 /* DeviceOrientationHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeviceOrientationHelper.h; sourceTree = ""; }; - 5EE75CB42A4C4FD40028DBB2 /* AdColonyExtrasBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AdColonyExtrasBuilder.h; sourceTree = ""; }; - 5EE75CB52A4C50080028DBB2 /* AdColonyExtrasBuilder.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AdColonyExtrasBuilder.mm; sourceTree = ""; }; 61C7338744733ACDF9608C0F /* Pods_ads.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ads.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 742AFBC1FC03495C7FB2232F /* Pods-adcolony.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-adcolony.release.xcconfig"; path = "Target Support Files/Pods-adcolony/Pods-adcolony.release.xcconfig"; sourceTree = ""; }; - 77E97A6160B9BA5A252D0C9F /* Pods-adcolony.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-adcolony.debug.xcconfig"; path = "Target Support Files/Pods-adcolony/Pods-adcolony.debug.xcconfig"; sourceTree = ""; }; 89172A20427D79238AD2E0B7 /* Pods-vungle.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-vungle.debug.xcconfig"; path = "Target Support Files/Pods-vungle/Pods-vungle.debug.xcconfig"; sourceTree = ""; }; A8B8A51BD2C38CF1E7585C67 /* Pods_core.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_core.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C4ED341537F1C46ECD8226C4 /* Pods_vungle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_vungle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -193,14 +166,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 5E5BDE372A4686B20071BE86 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - FD5CD28B654F484A801214C2 /* Pods_adcolony.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 5E80AACD2A44A50C001C750F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -239,7 +204,6 @@ 548AE72BDC782EBFF5BA57B2 /* Frameworks */ = { isa = PBXGroup; children = ( - 306A95510670715B1760AA7A /* Pods_adcolony.framework */, 61C7338744733ACDF9608C0F /* Pods_ads.framework */, A8B8A51BD2C38CF1E7585C67 /* Pods_core.framework */, D987DFBE4578E324D2F2E98E /* Pods_meta.framework */, @@ -251,8 +215,6 @@ 5BA9F87E99131221E0FE542B /* Pods */ = { isa = PBXGroup; children = ( - 77E97A6160B9BA5A252D0C9F /* Pods-adcolony.debug.xcconfig */, - 742AFBC1FC03495C7FB2232F /* Pods-adcolony.release.xcconfig */, CC51F69A18027C45E6DD8B0F /* Pods-ads.debug.xcconfig */, 0D0C9E5FF32E0DDCEDE2E41C /* Pods-ads.release.xcconfig */, F92044ABF829B272A03BAD3E /* Pods-core.debug.xcconfig */, @@ -265,29 +227,6 @@ path = Pods; sourceTree = ""; }; - 5E08983E2A4B959D0066A53A /* config */ = { - isa = PBXGroup; - children = ( - 5EAB712C2A847E1C008CEBB8 /* libs */, - 5E08983F2A4B95B50066A53A /* poing-godot-admob-adcolony.gdip */, - ); - path = config; - sourceTree = ""; - }; - 5E5BDE3B2A4686B20071BE86 /* adcolony */ = { - isa = PBXGroup; - children = ( - 5E08983E2A4B959D0066A53A /* config */, - 5E5BDE3C2A4686B20071BE86 /* PoingGodotAdMobAdColonyModule.h */, - 5E5BDE3D2A4686B20071BE86 /* PoingGodotAdMobAdColonyModule.mm */, - 5E08983B2A4B91C80066A53A /* PoingGodotAdMobAdColonyAppOptions.h */, - 5E08983C2A4B91E30066A53A /* PoingGodotAdMobAdColonyAppOptions.mm */, - 5EE75CB42A4C4FD40028DBB2 /* AdColonyExtrasBuilder.h */, - 5EE75CB52A4C50080028DBB2 /* AdColonyExtrasBuilder.mm */, - ); - path = adcolony; - sourceTree = ""; - }; 5E63D64C2A6461B300BDC600 /* converters */ = { isa = PBXGroup; children = ( @@ -316,7 +255,6 @@ 5E80AAE02A44A74A001C750F /* poing-godot-admob-core.a */, 5E80AAED2A44A82E001C750F /* poing-godot-admob-meta.a */, 5E80AAFC2A44AA77001C750F /* poing-godot-admob-vungle.a */, - 5E5BDE3A2A4686B20071BE86 /* poing-godot-admob-adcolony.a */, ); name = Products; sourceTree = ""; @@ -376,7 +314,6 @@ 5E80AAF62A44A835001C750F /* mediation */ = { isa = PBXGroup; children = ( - 5E5BDE3B2A4686B20071BE86 /* adcolony */, 5E80AAFD2A44AA77001C750F /* vungle */, 5E80AAEE2A44A82F001C750F /* meta */, ); @@ -467,14 +404,6 @@ path = libs; sourceTree = ""; }; - 5EAB712C2A847E1C008CEBB8 /* libs */ = { - isa = PBXGroup; - children = ( - 5E9F24192A8323E400148BB2 /* adcolony-pods.txt */, - ); - path = libs; - sourceTree = ""; - }; 5EAF248D2A7EBAF20050C77A /* config */ = { isa = PBXGroup; children = ( @@ -518,24 +447,6 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 5E5BDE392A4686B20071BE86 /* adcolony */ = { - isa = PBXNativeTarget; - buildConfigurationList = 5E5BDE402A4686B20071BE86 /* Build configuration list for PBXNativeTarget "adcolony" */; - buildPhases = ( - 77305D60533466AC1D3C291C /* [CP] Check Pods Manifest.lock */, - 5E5BDE362A4686B20071BE86 /* Sources */, - 5E5BDE372A4686B20071BE86 /* Frameworks */, - 5E5BDE382A4686B20071BE86 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = adcolony; - productName = AdColony; - productReference = 5E5BDE3A2A4686B20071BE86 /* poing-godot-admob-adcolony.a */; - productType = "com.apple.product-type.library.static"; - }; 5E80AACF2A44A50C001C750F /* ads */ = { isa = PBXNativeTarget; buildConfigurationList = 5E80AAD92A44A50C001C750F /* Build configuration list for PBXNativeTarget "ads" */; @@ -617,9 +528,6 @@ BuildIndependentTargetsInParallel = 1; LastUpgradeCheck = 1420; TargetAttributes = { - 5E5BDE392A4686B20071BE86 = { - CreatedOnToolsVersion = 14.2; - }; 5E80AACF2A44A50C001C750F = { CreatedOnToolsVersion = 14.2; }; @@ -651,7 +559,6 @@ 5E80AADF2A44A74A001C750F /* core */, 5E80AAEC2A44A82E001C750F /* meta */, 5E80AAFB2A44AA77001C750F /* vungle */, - 5E5BDE392A4686B20071BE86 /* adcolony */, ); }; /* End PBXProject section */ @@ -701,28 +608,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 77305D60533466AC1D3C291C /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-adcolony-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; C342CDA54250E29C2D660CA3 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -770,16 +655,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 5E5BDE362A4686B20071BE86 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 5E5BDE3E2A4686B20071BE86 /* PoingGodotAdMobAdColonyModule.mm in Sources */, - 5EE75CB62A4C50080028DBB2 /* AdColonyExtrasBuilder.mm in Sources */, - 5E08983D2A4B91E30066A53A /* PoingGodotAdMobAdColonyAppOptions.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 5E80AACC2A44A50C001C750F /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -836,59 +711,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - 5E5BDE412A4686B20071BE86 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 77E97A6160B9BA5A252D0C9F /* Pods-adcolony.debug.xcconfig */; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - CODE_SIGN_STYLE = Automatic; - EXECUTABLE_PREFIX = "poing-godot-admob-"; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../godot/platform/ios", - "$(SRCROOT)/../godot", - ); - OTHER_CFLAGS = ( - "-fcxx-modules", - "-g", - "-DDEBUG", - "-DDEBUG_ENABLED", - "-DDEBUG_MEMORY_ALLOC", - "-DDISABLE_FORCED_INLINE", - "-DTYPED_METHOD_BIND", - "-fmodules", - "-DIPHONE_ENABLED", - "-DUNIX_ENABLED", - "-DCOREAUDIO_ENABLED", - ); - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 5E5BDE422A4686B20071BE86 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 742AFBC1FC03495C7FB2232F /* Pods-adcolony.release.xcconfig */; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - CODE_SIGN_STYLE = Automatic; - EXECUTABLE_PREFIX = "poing-godot-admob-"; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../godot/platform/ios", - "$(SRCROOT)/../godot", - ); - OTHER_CFLAGS = ( - "-fcxx-modules", - "-fmodules", - ); - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; 5E80AAD72A44A50C001C750F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1253,15 +1075,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 5E5BDE402A4686B20071BE86 /* Build configuration list for PBXNativeTarget "adcolony" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 5E5BDE412A4686B20071BE86 /* Debug */, - 5E5BDE422A4686B20071BE86 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 5E80AACB2A44A50C001C750F /* Build configuration list for PBXProject "PoingGodotAdMob" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/PoingGodotAdMob/PoingGodotAdMob.xcodeproj/xcshareddata/xcschemes/ads.xcscheme b/PoingGodotAdMob/PoingGodotAdMob.xcodeproj/xcshareddata/xcschemes/ads.xcscheme new file mode 100644 index 0000000..d067cb6 --- /dev/null +++ b/PoingGodotAdMob/PoingGodotAdMob.xcodeproj/xcshareddata/xcschemes/ads.xcscheme @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PoingGodotAdMob/src/ads/config/libs/ads-pods.txt b/PoingGodotAdMob/src/ads/config/libs/ads-pods.txt index e31a506..0422846 100644 --- a/PoingGodotAdMob/src/ads/config/libs/ads-pods.txt +++ b/PoingGodotAdMob/src/ads/config/libs/ads-pods.txt @@ -1 +1 @@ -pod 'Google-Mobile-Ads-SDK', '10.13.0' +pod 'Google-Mobile-Ads-SDK', '11.3.0' diff --git a/PoingGodotAdMob/src/ads/converters/ObjectToGodotDictionary.mm b/PoingGodotAdMob/src/ads/converters/ObjectToGodotDictionary.mm index 0165207..2de6c54 100644 --- a/PoingGodotAdMob/src/ads/converters/ObjectToGodotDictionary.mm +++ b/PoingGodotAdMob/src/ads/converters/ObjectToGodotDictionary.mm @@ -81,7 +81,7 @@ + (Dictionary)convertResponseInfoToDictionary:(GADResponseInfo *)responseInfo{ dictionary["loaded_adapter_response_info"] = [ObjectToGodotDictionary convertLoadedAdapterResponseInfoToDictionary:responseInfo.loadedAdNetworkResponseInfo]; dictionary["adapter_responses"] = [ObjectToGodotDictionary convertAdapterResponsesToDictionary:responseInfo.adNetworkInfoArray]; dictionary["response_extras"] = [ObjectToGodotDictionary convertBundleNSDictionaryToDictionary:responseInfo.extrasDictionary]; - dictionary["mediation_adapter_class_name"] = responseInfo.adNetworkClassName ? [responseInfo.adNetworkClassName UTF8String] : ""; + dictionary["mediation_adapter_class_name"] = responseInfo.loadedAdNetworkResponseInfo.adNetworkClassName.UTF8String ? [responseInfo.loadedAdNetworkResponseInfo.adNetworkClassName UTF8String] : ""; dictionary["response_id"] = responseInfo.responseIdentifier ? [responseInfo.responseIdentifier UTF8String] : ""; return dictionary; diff --git a/PoingGodotAdMob/src/ads/helpers/PluginConfiguration.h b/PoingGodotAdMob/src/ads/helpers/PluginConfiguration.h index fdc3e24..c5a132e 100644 --- a/PoingGodotAdMob/src/ads/helpers/PluginConfiguration.h +++ b/PoingGodotAdMob/src/ads/helpers/PluginConfiguration.h @@ -23,6 +23,6 @@ #ifndef PluginConfiguration_h #define PluginConfiguration_h -static NSString *const PLUGIN_VERSION = @"3.1.0"; +static NSString *const PLUGIN_VERSION = @"3.1.1"; #endif /* PluginConfiguration_h */ diff --git a/PoingGodotAdMob/src/mediation/adcolony/AdColonyExtrasBuilder.h b/PoingGodotAdMob/src/mediation/adcolony/AdColonyExtrasBuilder.h deleted file mode 100644 index 16d9646..0000000 --- a/PoingGodotAdMob/src/mediation/adcolony/AdColonyExtrasBuilder.h +++ /dev/null @@ -1,35 +0,0 @@ -// MIT License -// -// Copyright (c) 2023-present Poing Studios -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#ifndef AdColonyExtrasBuilder_h -#define AdColonyExtrasBuilder_h - -#import - -#import "../../core/AdNetworkExtras.h" - -@interface AdColonyExtrasBuilder : NSObject - -@end - - -#endif /* AdColonyExtrasBuilder_h */ diff --git a/PoingGodotAdMob/src/mediation/adcolony/AdColonyExtrasBuilder.mm b/PoingGodotAdMob/src/mediation/adcolony/AdColonyExtrasBuilder.mm deleted file mode 100644 index 3d781b8..0000000 --- a/PoingGodotAdMob/src/mediation/adcolony/AdColonyExtrasBuilder.mm +++ /dev/null @@ -1,49 +0,0 @@ -// MIT License -// -// Copyright (c) 2023-present Poing Studios -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#import "AdColonyExtrasBuilder.h" -#import - -@implementation AdColonyExtrasBuilder - -String const SHOW_PRE_POPUP_KEY = "SHOW_PRE_POPUP_KEY"; -String const SHOW_POST_POPUP_KEY = "SHOW_POST_POPUP_KEY"; - -- (id)buildExtras:(Dictionary) extras { - NSLog(@"ON AD COLONY BUILD EXTRAS"); - GADMAdapterAdColonyExtras *adColonyExtras = [[GADMAdapterAdColonyExtras alloc] init]; - - if (extras.has("SHOW_PRE_POPUP_KEY")) { - NSLog(@"showPrePopup"); - adColonyExtras.showPrePopup = extras[SHOW_PRE_POPUP_KEY]; - } - - if (extras.has("SHOW_POST_POPUP_KEY")) { - NSLog(@"showPostPopup"); - adColonyExtras.showPostPopup = extras[SHOW_POST_POPUP_KEY]; - } - NSLog(@"RETURN ADCOLONY EXTRAS"); - - return adColonyExtras; -} - -@end diff --git a/PoingGodotAdMob/src/mediation/adcolony/PoingGodotAdMobAdColonyAppOptions.h b/PoingGodotAdMob/src/mediation/adcolony/PoingGodotAdMobAdColonyAppOptions.h deleted file mode 100644 index e272250..0000000 --- a/PoingGodotAdMob/src/mediation/adcolony/PoingGodotAdMobAdColonyAppOptions.h +++ /dev/null @@ -1,58 +0,0 @@ -// MIT License -// -// Copyright (c) 2023-present Poing Studios -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#ifndef PoingGodotAdMobAdColonyAppOptions_h -#define PoingGodotAdMobAdColonyAppOptions_h -#import -#include "core/object/class_db.h" -#include "core/version.h" - -class PoingGodotAdMobAdColonyAppOptions : public Object { - - GDCLASS(PoingGodotAdMobAdColonyAppOptions, Object); - - static PoingGodotAdMobAdColonyAppOptions *instance; - static void _bind_methods(); - -public: - void set_privacy_framework_required(const String &type, bool required); - bool get_privacy_framework_required(const String &type); - - void set_privacy_consent_string(const String &type, const String &consent_string); - String get_privacy_consent_string(const String &type); - - void set_user_id(const String &user_id); - String get_user_id(); - - void set_test_mode(bool enabled); - bool get_test_mode(); - - static PoingGodotAdMobAdColonyAppOptions *get_singleton(); - - PoingGodotAdMobAdColonyAppOptions(); - ~PoingGodotAdMobAdColonyAppOptions(); -private: - static AdColonyAppOptions *options; -}; - - -#endif /* PoingGodotAdMobAdColonyAppOptions_h */ diff --git a/PoingGodotAdMob/src/mediation/adcolony/PoingGodotAdMobAdColonyAppOptions.mm b/PoingGodotAdMob/src/mediation/adcolony/PoingGodotAdMobAdColonyAppOptions.mm deleted file mode 100644 index ecffddd..0000000 --- a/PoingGodotAdMob/src/mediation/adcolony/PoingGodotAdMobAdColonyAppOptions.mm +++ /dev/null @@ -1,103 +0,0 @@ -// MIT License -// -// Copyright (c) 2023-present Poing Studios -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#import "PoingGodotAdMobAdColonyAppOptions.h" -#import - -PoingGodotAdMobAdColonyAppOptions *PoingGodotAdMobAdColonyAppOptions::instance = NULL; -AdColonyAppOptions *PoingGodotAdMobAdColonyAppOptions::options = NULL; - -PoingGodotAdMobAdColonyAppOptions::PoingGodotAdMobAdColonyAppOptions() { - ERR_FAIL_COND(instance != NULL); - - instance = this; - options = GADMediationAdapterAdColony.appOptions; -} - -PoingGodotAdMobAdColonyAppOptions::~PoingGodotAdMobAdColonyAppOptions() { - if (instance == this) { - instance = NULL; - options = NULL; - } -} - -PoingGodotAdMobAdColonyAppOptions *PoingGodotAdMobAdColonyAppOptions::get_singleton() { - return instance; -}; - -static NSString *GetType(const String &type){ - if (type == "CCPA") - return ADC_CCPA; - if (type == "GDPR") - return ADC_GDPR; - return @""; -} - -void PoingGodotAdMobAdColonyAppOptions::set_privacy_framework_required(const String &type, bool required) { - [options setPrivacyFrameworkOfType:GetType(type) isRequired:required]; -} - -bool PoingGodotAdMobAdColonyAppOptions::get_privacy_framework_required(const String &type) { - return [options getPrivacyFrameworkRequiredForType:GetType(type)]; -} - -void PoingGodotAdMobAdColonyAppOptions::set_privacy_consent_string(const String &type, const String &consent_string) { - NSString *ns_consent_string = [NSString stringWithCString:consent_string.utf8().get_data() encoding: NSUTF8StringEncoding]; - - [options setPrivacyConsentString:ns_consent_string forType:GetType(type)]; -} - -String PoingGodotAdMobAdColonyAppOptions::get_privacy_consent_string(const String &type) { - return [[options getPrivacyConsentStringForType:GetType(type)] UTF8String]; -} - -void PoingGodotAdMobAdColonyAppOptions::set_user_id(const String &user_id) { - NSString *ns_user_id_string = [NSString stringWithCString:user_id.utf8().get_data() encoding: NSUTF8StringEncoding]; - - [options setUserID:ns_user_id_string]; -} - -String PoingGodotAdMobAdColonyAppOptions::get_user_id() { - return [[options userID] UTF8String]; -} - -void PoingGodotAdMobAdColonyAppOptions::set_test_mode(bool enabled) { - [options setTestMode:enabled]; -} - -bool PoingGodotAdMobAdColonyAppOptions::get_test_mode() { - return [options testMode]; -} - -void PoingGodotAdMobAdColonyAppOptions::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_privacy_framework_required"), &PoingGodotAdMobAdColonyAppOptions::set_privacy_framework_required); - ClassDB::bind_method(D_METHOD("get_privacy_framework_required"), &PoingGodotAdMobAdColonyAppOptions::get_privacy_framework_required); - - ClassDB::bind_method(D_METHOD("set_privacy_consent_string"), &PoingGodotAdMobAdColonyAppOptions::set_privacy_consent_string); - ClassDB::bind_method(D_METHOD("get_privacy_consent_string"), &PoingGodotAdMobAdColonyAppOptions::get_privacy_consent_string); - - ClassDB::bind_method(D_METHOD("set_user_id"), &PoingGodotAdMobAdColonyAppOptions::set_user_id); - ClassDB::bind_method(D_METHOD("get_user_id"), &PoingGodotAdMobAdColonyAppOptions::get_user_id); - - ClassDB::bind_method(D_METHOD("set_test_mode"), &PoingGodotAdMobAdColonyAppOptions::set_test_mode); - ClassDB::bind_method(D_METHOD("get_test_mode"), &PoingGodotAdMobAdColonyAppOptions::get_test_mode); -}; diff --git a/PoingGodotAdMob/src/mediation/adcolony/PoingGodotAdMobAdColonyModule.h b/PoingGodotAdMob/src/mediation/adcolony/PoingGodotAdMobAdColonyModule.h deleted file mode 100644 index 829f83f..0000000 --- a/PoingGodotAdMob/src/mediation/adcolony/PoingGodotAdMobAdColonyModule.h +++ /dev/null @@ -1,29 +0,0 @@ -// MIT License -// -// Copyright (c) 2023-present Poing Studios -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#ifndef PoingGodotAdColonyModule_h -#define PoingGodotAdColonyModule_h - -void register_poing_godot_admob_adcolony_types(); -void unregister_poing_godot_admob_adcolony_types(); - -#endif /* PoingGodotAdMobModule_h */ diff --git a/PoingGodotAdMob/src/mediation/adcolony/PoingGodotAdMobAdColonyModule.mm b/PoingGodotAdMob/src/mediation/adcolony/PoingGodotAdMobAdColonyModule.mm deleted file mode 100644 index 87281f4..0000000 --- a/PoingGodotAdMob/src/mediation/adcolony/PoingGodotAdMobAdColonyModule.mm +++ /dev/null @@ -1,41 +0,0 @@ -// MIT License -// -// Copyright (c) 2023-present Poing Studios -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#import "PoingGodotAdMobAdColonyModule.h" -#include "PoingGodotAdMobAdColonyAppOptions.h" - -#import -#include "core/config/engine.h" -#include "core/version.h" - -PoingGodotAdMobAdColonyAppOptions *poing_godot_admob_adcolony_app_options; - -void register_poing_godot_admob_adcolony_types() { - poing_godot_admob_adcolony_app_options = memnew(PoingGodotAdMobAdColonyAppOptions); - Engine::get_singleton()->add_singleton(Engine::Singleton("PoingGodotAdMobAdColonyAppOptions", poing_godot_admob_adcolony_app_options)); -} - -void unregister_poing_godot_admob_adcolony_types() { - if (poing_godot_admob_adcolony_app_options) { - memdelete(poing_godot_admob_adcolony_app_options); - } -} diff --git a/PoingGodotAdMob/src/mediation/adcolony/config/libs/adcolony-pods.txt b/PoingGodotAdMob/src/mediation/adcolony/config/libs/adcolony-pods.txt deleted file mode 100644 index 7069fc0..0000000 --- a/PoingGodotAdMob/src/mediation/adcolony/config/libs/adcolony-pods.txt +++ /dev/null @@ -1 +0,0 @@ -pod 'GoogleMobileAdsMediationAdColony', '4.9.0.2' diff --git a/PoingGodotAdMob/src/mediation/adcolony/config/poing-godot-admob-adcolony.gdip b/PoingGodotAdMob/src/mediation/adcolony/config/poing-godot-admob-adcolony.gdip deleted file mode 100644 index 6a6c785..0000000 --- a/PoingGodotAdMob/src/mediation/adcolony/config/poing-godot-admob-adcolony.gdip +++ /dev/null @@ -1,16 +0,0 @@ -[config] -name="AdMob AdColony" -binary="poing-godot-admob/bin/poing-godot-admob-adcolony.a" - -initialization="register_poing_godot_admob_adcolony_types" -deinitialization="unregister_poing_godot_admob_adcolony_types" - -[dependencies] -linked=[] -embedded=[] -system=[] -capabilities=[] -files=["poing-godot-admob/libs/adcolony-pods.txt"] -linker_flags=[] - -[plist] diff --git a/PoingGodotAdMob/src/mediation/meta/config/libs/meta-pods.txt b/PoingGodotAdMob/src/mediation/meta/config/libs/meta-pods.txt index 4201da0..04a10e9 100644 --- a/PoingGodotAdMob/src/mediation/meta/config/libs/meta-pods.txt +++ b/PoingGodotAdMob/src/mediation/meta/config/libs/meta-pods.txt @@ -1 +1 @@ -pod 'GoogleMobileAdsMediationFacebook', '6.12.0.1' +pod 'GoogleMobileAdsMediationFacebook', '6.15.0.0' diff --git a/PoingGodotAdMob/src/mediation/vungle/PoingGodotAdMobVungle.h b/PoingGodotAdMob/src/mediation/vungle/PoingGodotAdMobVungle.h index 3aa37ad..60a9ecf 100644 --- a/PoingGodotAdMob/src/mediation/vungle/PoingGodotAdMobVungle.h +++ b/PoingGodotAdMob/src/mediation/vungle/PoingGodotAdMobVungle.h @@ -26,7 +26,7 @@ #import #include "core/object/class_db.h" #include "core/version.h" -#import +#import class PoingGodotAdMobVungle : public Object { diff --git a/PoingGodotAdMob/src/mediation/vungle/PoingGodotAdMobVungle.mm b/PoingGodotAdMob/src/mediation/vungle/PoingGodotAdMobVungle.mm index 8008f00..7df9a41 100644 --- a/PoingGodotAdMob/src/mediation/vungle/PoingGodotAdMobVungle.mm +++ b/PoingGodotAdMob/src/mediation/vungle/PoingGodotAdMobVungle.mm @@ -42,36 +42,20 @@ void PoingGodotAdMobVungle::update_consent_status(int status, String consent_message_version) { NSString* consentMessageVersionNS = [NSString stringWithCString:consent_message_version.utf8().get_data() encoding: NSUTF8StringEncoding]; - - switch (status) { - case 0: - [[VungleSDK sharedSDK] updateConsentStatus:VungleConsentAccepted consentMessageVersion:consentMessageVersionNS]; - break; - case 1: - [[VungleSDK sharedSDK] updateConsentStatus:VungleConsentDenied consentMessageVersion:consentMessageVersionNS]; - break; - default: - NSLog(@"status for Vungle update_consent_status not available"); - } + + [VunglePrivacySettings setGDPRStatus:status]; + [VunglePrivacySettings setGDPRMessageVersion:consentMessageVersionNS]; + NSLog(@"set vungle consent status, message: %@ status: %i", consentMessageVersionNS, status); } void PoingGodotAdMobVungle::update_ccpa_status(int status) { - switch (status) { - case 0: - [[VungleSDK sharedSDK] updateCCPAStatus:VungleCCPAAccepted]; - break; - case 1: - [[VungleSDK sharedSDK] updateCCPAStatus:VungleCCPADenied]; - break; - default: - NSLog(@"status for Vungle update_ccpa_status not available"); - } + [VunglePrivacySettings setCCPAStatus:status]; + NSLog(@"set vungle ccpa status status: %i", status); } - void PoingGodotAdMobVungle::_bind_methods() { ClassDB::bind_method(D_METHOD("update_consent_status"), &PoingGodotAdMobVungle::update_consent_status); ClassDB::bind_method(D_METHOD("update_ccpa_status"), &PoingGodotAdMobVungle::update_ccpa_status); diff --git a/PoingGodotAdMob/src/mediation/vungle/VunglePoingExtrasBuilder.mm b/PoingGodotAdMob/src/mediation/vungle/VunglePoingExtrasBuilder.mm index 257e774..b35a999 100644 --- a/PoingGodotAdMob/src/mediation/vungle/VunglePoingExtrasBuilder.mm +++ b/PoingGodotAdMob/src/mediation/vungle/VunglePoingExtrasBuilder.mm @@ -21,7 +21,7 @@ // SOFTWARE. #import "VunglePoingExtrasBuilder.h" -#import +#import @implementation VunglePoingExtrasBuilder @@ -32,24 +32,6 @@ @implementation VunglePoingExtrasBuilder - (id)buildExtras:(Dictionary) extras { VungleAdNetworkExtras *vungleExtras = [[VungleAdNetworkExtras alloc] init]; - if (extras.has(ALL_PLACEMENTS_KEY)){ - NSLog(@"has ALL_PLACEMENTS_KEY"); - String placementsString = extras[ALL_PLACEMENTS_KEY]; - - NSString *placements = [NSString stringWithUTF8String:placementsString.utf8().get_data()]; - - NSCharacterSet *charactersToRemove = [NSCharacterSet characterSetWithCharactersInString:@"\"'[] "]; - placements = [[placements componentsSeparatedByCharactersInSet:charactersToRemove] componentsJoinedByString:@""]; - NSArray *placementsArray = [placements componentsSeparatedByString:@","]; - vungleExtras.allPlacements = placementsArray; - } - - if (extras.has(SOUND_ENABLED_KEY)){ - bool soundEnabled = extras[SOUND_ENABLED_KEY]; - NSLog(@"Sound Enabled: %d", soundEnabled); - vungleExtras.muted = !soundEnabled; - } - if (extras.has(USER_ID_KEY)){ String userId = extras[USER_ID_KEY]; if (!userId.is_empty()) { diff --git a/PoingGodotAdMob/src/mediation/vungle/config/libs/vungle-pods.txt b/PoingGodotAdMob/src/mediation/vungle/config/libs/vungle-pods.txt index 80802f1..86c4884 100644 --- a/PoingGodotAdMob/src/mediation/vungle/config/libs/vungle-pods.txt +++ b/PoingGodotAdMob/src/mediation/vungle/config/libs/vungle-pods.txt @@ -1 +1 @@ -pod 'GoogleMobileAdsMediationVungle', '6.12.3.0' +pod 'GoogleMobileAdsMediationVungle', '7.3' diff --git a/README.md b/README.md index 04f5139..960fc1d 100755 --- a/README.md +++ b/README.md @@ -10,24 +10,24 @@

A Godot's plugin for iOS of AdMob.

- - + + - - + + - - + + - - + +

About • How to use • Docs • - Downloads + Downloads

## ❓ About @@ -38,7 +38,7 @@ This repository is for a _Godot Engine Plugin_ that allows showing the ads offered by **AdMob** in an **easy** way, without worrying about the building or version, **just download and use**. -The **purpose** of this plugin is to always keep **up to date with Godot**, supporting **ALMOST ALL** versions from v4.1+, and also make the code **compatible** on **[Android](https://github.com/Poing-Studios/godot-admob-android) and iOS**, so each advertisement will work **identically on both systems**. +The **purpose** of this plugin is to always keep **up to date with Godot**, supporting **ALMOST ALL** versions from v4.1+, and also make the code **compatible** on **[Android](https://github.com/PoingStudios/godot-admob-android) and iOS**, so each advertisement will work **identically on both systems**. ### 🔑 Key features @@ -47,28 +47,28 @@ The **purpose** of this plugin is to always keep **up to date with Godot**, supp - Supports nearly all Ad Formats: **Banner**, **Interstitial**, **Rewarded**, **Rewarded Interstitial**. 📺 - GDPR Compliance with UMP Support. ✉️ - Targeting Capabilities. 🎯 -- Seamless integration with Mediation partners: **AdColony**, **Meta**, **Vungle**. 💰 +- Seamless integration with Mediation partners: **Meta**, **Vungle**. 💰 - CI/CD for streamlined development and deployment. 🔄🚀 -- Features a dedicated [Godot Plugin](https://github.com/Poing-Studios/godot-admob-plugin), reducing the need for extensive coding. 🔌 -- There is also an [Android Plugin](https://github.com/Poing-Studios/godot-admob-android) available, which has the same behavior. 🤖 +- Features a dedicated [Godot Plugin](https://github.com/PoingStudios/godot-admob-plugin), reducing the need for extensive coding. 🔌 +- There is also an [Android Plugin](https://github.com/PoingStudios/godot-admob-android) available, which has the same behavior. 🤖 ## 🙋‍♂️How to use -- We recommend you to use the [AdMob Plugin](https://github.com/Poing-Studios/godot-admob-plugin), you can download direcly from [Godot Assets](https://godotengine.org/asset-library/asset/2063). -- After download, we recommend you to read the [README.md](https://github.com/Poing-Studios/godot-admob-plugin/blob/master/README.md) of the Plugin to know how to use. +- We recommend you to use the [AdMob Plugin](https://github.com/PoingStudios/godot-admob-plugin), you can download direcly from [Godot Assets](https://godotengine.org/asset-library/asset/2063). +- After download, we recommend you to read the [README.md](https://github.com/PoingStudios/godot-admob-plugin/blob/master/README.md) of the Plugin to know how to use. ## 📦Installing: ### 📥Download -- To get started, download the `poing-godot-admob-ios-v{{ your_godot_version }}.zip` file from the [releases tab](https://github.com/Poing-Studios/godot-admob-ios/releases). We recommend checking the [supported Godot version](https://github.com/Poing-Studios/godot-admob-versions/blob/master/versions.json) before proceeding. You can also use the [AdMob Plugin](https://github.com/Poing-Studios/godot-admob-plugin) for this step by navigating to `Tools -> AdMob Download Manager -> iOS -> LatestVersion`. +- To get started, download the `poing-godot-admob-ios-v{{ your_godot_version }}.zip` file from the [releases tab](https://github.com/PoingStudios/godot-admob-ios/releases). We recommend checking the [supported Godot version](https://github.com/PoingStudios/godot-admob-versions/blob/master/versions.json) before proceeding. You can also use the [AdMob Plugin](https://github.com/PoingStudios/godot-admob-plugin) for this step by navigating to `Tools -> AdMob Download Manager -> iOS -> LatestVersion`. ### 🧑‍💻Usage - Video tutorial: https://youtu.be/WpVGn7ZasKM. -- Inside `poing-godot-admob-ios-v{{ your_godot_version }}.zip` you downloaded, you will face some folders like `'ads'`, `'adcolony'`, `'meta'`, `'vungle'`. To AdMob works only `'ads'` is required, but if you want [Mediation](https://support.google.com/admob/answer/13420272?hl=en), you need the other folders. +- Inside `poing-godot-admob-ios-v{{ your_godot_version }}.zip` you downloaded, you will face some folders like `'ads'`, `'meta'`, `'vungle'`. To AdMob works only `'ads'` is required, but if you want [Mediation](https://support.google.com/admob/answer/13420272?hl=en), you need the other folders. - Move the content inside the folder which you need into ```res://ios/plugins``` directory on your Godot project. - Update the configuration in ```res://ios/plugins/poing-godot-admob-ads.gdip```. The `GADApplicationIdentifier` is required to change when release your game. - If you are using Mediation: On `SKAdNetworkItems` in `.gdip` file, you can remove the comments of the [Mediations Networks](https://developers.google.com/admob/ios/choose-networks) which you are using. -- Export the project enabling the `Ad Mob`, if you have Mediation, also mark `Ad Mob Meta`, `Ad Mob AdColony` etc... +- Export the project enabling the `Ad Mob`, if you have Mediation, also mark `Ad Mob Meta`, etc... ### 💻Xcode preparation - Go to `{{ ios_xcode_export_folder }}/{{your_project_name}}/ios/plugins/poing-godot-admob/scripts/` folder and open the terminal (must be inside this folder). @@ -84,12 +84,12 @@ chmod +x update_and_install.sh ## 📎Useful links: -- 🦾 Godot Plugin: https://github.com/Poing-Studios/godot-admob-plugin -- 🤖 Android: https://github.com/Poing-Studios/godot-admob-android -- ⏳ Plugin for Godot below v4.1: https://github.com/Poing-Studios/godot-admob-ios/tree/v2 +- 🦾 Godot Plugin: https://github.com/PoingStudios/godot-admob-plugin +- 🤖 Android: https://github.com/PoingStudios/godot-admob-android +- ⏳ Plugin for Godot below v4.1: https://github.com/PoingStudios/godot-admob-ios/tree/v2 ## 📄Documentation -For a complete documentation of this Plugin: [check here](https://poing-studios.github.io/godot-admob-plugin/). +For a complete documentation of this Plugin: [check here](https://poingstudios.github.io/godot-admob-plugin/). Alternatively, you can check the docs of AdMob itself of [iOS](https://developers.google.com/admob/ios/quick-start). @@ -106,11 +106,11 @@ Your support helps us continue to improve and maintain this plugin. Thank you fo ## 🆘Getting help -[![DISCUSSIONS](https://img.shields.io/badge/Discussions-green?style=for-the-badge)](https://github.com/Poing-Studios/godot-admob-ios/discussions) +[![DISCUSSIONS](https://img.shields.io/badge/Discussions-green?style=for-the-badge)](https://github.com/PoingStudios/godot-admob-ios/discussions) [![DISCORD](https://img.shields.io/badge/Discord-7289DA?style=for-the-badge)](https://discord.com/invite/YEPvYjSSMk) ## ⭐ Star History If you appreciate our work, don't forget to give us a star on GitHub! ⭐ -![Star History Chart](https://api.star-history.com/svg?repos=Poing-studios/godot-admob-ios&type=Date) +![Star History Chart](https://api.star-history.com/svg?repos=Poingstudios/godot-admob-ios&type=Date) diff --git a/SConstruct b/SConstruct index 1a905df..57d799e 100755 --- a/SConstruct +++ b/SConstruct @@ -24,7 +24,7 @@ opts.Add(EnumVariable('arch', "Compilation Architecture", '', ['', 'arm64', 'arm opts.Add(BoolVariable('simulator', "Compilation platform", 'no')) opts.Add(BoolVariable('use_llvm', "Use the LLVM / Clang compiler", 'no')) opts.Add(PathVariable('target_path', 'The path where the lib is installed.', 'bin/static_libraries/')) -opts.Add(EnumVariable('plugin', 'Plugin to build', '', ['', 'ads', 'adcolony', 'meta', 'vungle'])) +opts.Add(EnumVariable('plugin', 'Plugin to build', '', ['', 'ads', 'meta', 'vungle'])) # Updates the environment with the option variables. opts.Update(env) @@ -70,41 +70,12 @@ env.Append(FRAMEWORKPATH=['#PoingGodotAdMob/Pods/Google-Mobile-Ads-SDK/Framework if env['plugin'] == 'ads': env.Append(FRAMEWORKPATH=['#PoingGodotAdMob/Pods/GoogleUserMessagingPlatform/Frameworks/Release/UserMessagingPlatform.xcframework/' + xcframework_directory]) -elif env['plugin'] == 'adcolony': - if env['simulator']: - xcframework_directory_adcolony = 'ios-arm64_i386_x86_64-simulator' - xcframework_directory_adcolony_adapter = 'ios-arm64_x86_64-simulator' - else: - xcframework_directory_adcolony = 'ios-arm64_armv7' - xcframework_directory_adcolony_adapter = 'ios-arm64_armv7' - - env.Append(FRAMEWORKPATH=['#PoingGodotAdMob/Pods/AdColony/AdColony.xcframework/' + xcframework_directory_adcolony]) - env.Append(FRAMEWORKPATH=['#PoingGodotAdMob/Pods/GoogleMobileAdsMediationAdColony/AdColonyAdapter-4.9.0.2/AdColonyAdapter.xcframework/' + xcframework_directory_adcolony_adapter]) - elif env['plugin'] == 'meta': - if env['simulator']: - xcframework_directory_meta = 'ios-arm64_x86_64-simulator' - xcframework_directory_meta_adapter = 'ios-arm64_x86_64-simulator' - else: - xcframework_directory_meta = 'ios-arm64_armv7' - xcframework_directory_meta_adapter = 'ios-arm64_armv7' - - env.Append(FRAMEWORKPATH=['#PoingGodotAdMob/Pods/FBAudienceNetwork/Static/FBAudienceNetwork.xcframework/' + xcframework_directory_meta]) - env.Append(FRAMEWORKPATH=['#PoingGodotAdMob/Pods/GoogleMobileAdsMediationFacebook/MetaAdapter-6.12.0.1/MetaAdapter.xcframework/' + xcframework_directory_meta_adapter]) + env.Append(FRAMEWORKPATH=['#PoingGodotAdMob/Pods/FBAudienceNetwork/Static/FBAudienceNetwork.xcframework/' + xcframework_directory]) + env.Append(FRAMEWORKPATH=['#PoingGodotAdMob/Pods/GoogleMobileAdsMediationFacebook/MetaAdapter-6.15.0.0/MetaAdapter.xcframework/' + xcframework_directory]) elif env['plugin'] == 'vungle': - if env['simulator']: - xcframework_directory_adcolony = 'ios-arm64_i386_x86_64-simulator' - xcframework_directory_adcolony_adapter = 'ios-x86_64-simulator' - else: - xcframework_directory_adcolony = 'ios-arm64_armv7' - xcframework_directory_adcolony_adapter = 'ios-arm64_armv7' - - env.Append(FRAMEWORKPATH=['#PoingGodotAdMob/Pods/VungleSDK-iOS/VungleSDK.xcframework/' + xcframework_directory_adcolony]) - env.Append(FRAMEWORKPATH=['#PoingGodotAdMob/Pods/GoogleMobileAdsMediationVungle/VungleAdapter-6.12.3.0/VungleAdapter.xcframework/' + xcframework_directory_adcolony_adapter]) - - - - + env.Append(FRAMEWORKPATH=['#PoingGodotAdMob/Pods/VungleAds/static/VungleAdsSDK.xcframework/' + xcframework_directory]) + env.Append(FRAMEWORKPATH=['#PoingGodotAdMob/Pods/GoogleMobileAdsMediationVungle/LiftoffMonetizeAdapter-7.3.0.0/LiftoffMonetizeAdapter.xcframework/' + xcframework_directory]) try: sdk_path = decode_utf8(subprocess.check_output(['xcrun', '--sdk', sdk_name, '--show-sdk-path']).strip()) diff --git a/scripts/generate_static_library.sh b/scripts/generate_static_library.sh index b412d48..18ec198 100755 --- a/scripts/generate_static_library.sh +++ b/scripts/generate_static_library.sh @@ -5,8 +5,6 @@ set -e # ARM64 Device scons target=$2 arch=arm64 plugin=$1 -# ARM7 Device -scons target=$2 arch=armv7 plugin=$1 # x86_64 Simulator scons target=$2 arch=x86_64 simulator=yes plugin=$1 @@ -14,6 +12,5 @@ scons target=$2 arch=x86_64 simulator=yes plugin=$1 # lib.-..a lipo -create "./bin/static_libraries/$1/libpoing-godot-admob-$1.x86_64-simulator.$2.a" \ - "./bin/static_libraries/$1/libpoing-godot-admob-$1.armv7-ios.$2.a" \ "./bin/static_libraries/$1/libpoing-godot-admob-$1.arm64-ios.$2.a" \ -output "./bin/static_libraries/$1/poing-godot-admob-$1.$2.a" \ No newline at end of file diff --git a/scripts/release_static_library.sh b/scripts/release_static_library.sh index 86787df..e0c2b81 100755 --- a/scripts/release_static_library.sh +++ b/scripts/release_static_library.sh @@ -14,7 +14,7 @@ function run_pod_install() { run_pod_install -PLUGINS=("ads" "adcolony" "meta" "vungle") +PLUGINS=("ads" "meta" "vungle") dest_folder="./bin/release"