diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll deleted file mode 100755 index 57f7a07..0000000 Binary files a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll and /dev/null differ diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179.meta b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182.meta similarity index 77% rename from DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179.meta rename to DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182.meta index ebcc71c..5237fa3 100644 --- a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179.meta +++ b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: db70aa735e7d146929ba7142f1c511e9 +guid: 9ba8c038eeb4440118242ee974343cc3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll similarity index 65% rename from DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll rename to DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll index 182b402..0b15851 100755 Binary files a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll and b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll differ diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll.meta b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll.meta similarity index 84% rename from DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll.meta rename to DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll.meta index f15c452..39bf8db 100644 --- a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll.meta +++ b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 052fc6841b304ce4801cd850704efc6b +guid: 3429646f5d4949efa347230fa86778b7 labels: - gvh -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll +- gvh_version-1.2.182 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll similarity index 92% rename from DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll rename to DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll index 123881f..d9a77eb 100755 Binary files a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll and b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll differ diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll.meta b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll.meta similarity index 84% rename from DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll.meta rename to DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll.meta index f0a6cab..68071ee 100644 --- a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll.meta +++ b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: f8c5c28ca63d4b998365d84dd183658d +guid: 5b1a2b9a8d0748609fa3195265844d21 labels: - gvh -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll +- gvh_version-1.2.182 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll similarity index 64% rename from DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll rename to DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll index c2a0c34..3c92ed5 100755 Binary files a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll and b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll differ diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll.meta b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll.meta similarity index 84% rename from DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll.meta rename to DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll.meta index 6466f74..b531847 100644 --- a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll.meta +++ b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: a22e43395e864125aec54dc456a4eda0 +guid: 4026c19ba8ec495f93f5919b5f2934ee labels: - gvh -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll +- gvh_version-1.2.182 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll new file mode 100755 index 0000000..53c60b2 Binary files /dev/null and b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll differ diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll.meta b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll.meta similarity index 84% rename from DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll.meta rename to DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll.meta index 3500fed..8001971 100644 --- a/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll.meta +++ b/DemoApp/Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 76d0a5f5ee7f4a72a3d2de688e3bd51a +guid: 025280fbe75c450fbdf7c5fc7ecc8860 labels: - gvh -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll +- gvh_version-1.2.182 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/CHANGELOG.md b/DemoApp/Assets/ExternalDependencyManager/Editor/CHANGELOG.md index f00a116..eef4da0 100755 --- a/DemoApp/Assets/ExternalDependencyManager/Editor/CHANGELOG.md +++ b/DemoApp/Assets/ExternalDependencyManager/Editor/CHANGELOG.md @@ -1,3 +1,15 @@ +# Version 1.2.182 - Aug 2, 2024 +* General - Check for gradle version instead of Unity version when determining + the template files to modify. + +# Version 1.2.181 - Jun 26, 2024 +* General - Disable `EditorMeasurement` reporting that relied on the + Measurement Protocol for Universal Analytics. + +# Version 1.2.180 - Jun 4, 2024 +* General - Fix project settings resetting on domain reload. + Fixes #524 + # Version 1.2.179 - Feb 12, 2024 * Android Resolver - Added logic to automatically turn on `mainTemplate.gradle` for new projects, and prompt users to enable it on projects that have previously diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/DemoApp/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta index a49c906..2adfcdc 100644 --- a/DemoApp/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta +++ b/DemoApp/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: a8d928a6df80469ab6cd8eca7bf6d273 +guid: b699fc553a294dbcad96ff0365038f6a labels: - gvh -- gvh_version-1.2.179 +- gvh_version-1.2.182 - gvhp_exportpath-ExternalDependencyManager/Editor/CHANGELOG.md timeCreated: 1584567712 licenseType: Pro diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/DemoApp/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll index 0703ad0..ac732a7 100755 Binary files a/DemoApp/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll and b/DemoApp/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll differ diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/DemoApp/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta index 65e1821..f007e6e 100644 --- a/DemoApp/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta +++ b/DemoApp/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: efd2c569f89a449498a0c946cd37a752 +guid: 61128ff4560e43ddb606dc203efe7799 labels: - gvh -- gvh_version-1.2.179 +- gvh_version-1.2.182 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll - gvhp_targets-editor timeCreated: 1480838400 diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/DemoApp/Assets/ExternalDependencyManager/Editor/LICENSE.meta index 87de9ec..811edab 100644 --- a/DemoApp/Assets/ExternalDependencyManager/Editor/LICENSE.meta +++ b/DemoApp/Assets/ExternalDependencyManager/Editor/LICENSE.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 9be3e4155c3148d298ad390b9db89273 +guid: b91d7551a5d9453e914e5295af46195e labels: - gvh -- gvh_version-1.2.179 +- gvh_version-1.2.182 - gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE timeCreated: 1584567712 licenseType: Pro diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/README.md.meta b/DemoApp/Assets/ExternalDependencyManager/Editor/README.md.meta index 6b68c44..1246827 100644 --- a/DemoApp/Assets/ExternalDependencyManager/Editor/README.md.meta +++ b/DemoApp/Assets/ExternalDependencyManager/Editor/README.md.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: b8f8f1a310f5441f9598e2c40ac77058 +guid: ee2d63ed1abf409b893e36120a404f03 labels: - gvh -- gvh_version-1.2.179 +- gvh_version-1.2.182 - gvhp_exportpath-ExternalDependencyManager/Editor/README.md timeCreated: 1584567712 licenseType: Pro diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_manifest.txt b/DemoApp/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_manifest.txt deleted file mode 100755 index e2fe394..0000000 --- a/DemoApp/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_manifest.txt +++ /dev/null @@ -1,13 +0,0 @@ -Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll -Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.pdb -Assets/ExternalDependencyManager/Editor/CHANGELOG.md -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb -Assets/ExternalDependencyManager/Editor/LICENSE -Assets/ExternalDependencyManager/Editor/README.md diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt b/DemoApp/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt new file mode 100755 index 0000000..d1496bc --- /dev/null +++ b/DemoApp/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt @@ -0,0 +1,13 @@ +Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.pdb +Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.pdb +Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.pdb +Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll +Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.pdb +Assets/ExternalDependencyManager/Editor/CHANGELOG.md +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb +Assets/ExternalDependencyManager/Editor/LICENSE +Assets/ExternalDependencyManager/Editor/README.md diff --git a/DemoApp/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_manifest.txt.meta b/DemoApp/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt.meta similarity index 75% rename from DemoApp/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_manifest.txt.meta rename to DemoApp/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt.meta index 0d78ace..caa5f7c 100644 --- a/DemoApp/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_manifest.txt.meta +++ b/DemoApp/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: 53a0906dfc3143ba8bf0193c245ad230 +guid: d602686ba68d4bfea020d161c28431a9 labels: - gvh - gvh_manifest -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_manifest.txt +- gvh_version-1.2.182 +- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt - gvhp_manifestname-0External Dependency Manager - gvhp_manifestname-play-services-resolver timeCreated: 1474401009 diff --git a/DemoApp/Assets/MaxSdk/AppLovin.meta b/DemoApp/Assets/MaxSdk/AppLovin.meta index 0bf781b..686002f 100644 --- a/DemoApp/Assets/MaxSdk/AppLovin.meta +++ b/DemoApp/Assets/MaxSdk/AppLovin.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f4c20985b26094f70b0bc44cd95eb1ba +guid: cd9b995f7caaa4410a65b920514dfce5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/DemoApp/Assets/MaxSdk/AppLovin/Editor.meta b/DemoApp/Assets/MaxSdk/AppLovin/Editor.meta index 2b930dc..e0148e3 100644 --- a/DemoApp/Assets/MaxSdk/AppLovin/Editor.meta +++ b/DemoApp/Assets/MaxSdk/AppLovin/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ce14de298f23c4bb198d6f1bded11d72 +guid: df642f1a7c8244139bcf3aec8ca65a6d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/DemoApp/Assets/MaxSdk/AppLovin/Plugins.meta b/DemoApp/Assets/MaxSdk/AppLovin/Plugins.meta index 172ac9d..7806f81 100644 --- a/DemoApp/Assets/MaxSdk/AppLovin/Plugins.meta +++ b/DemoApp/Assets/MaxSdk/AppLovin/Plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 44d1cbc50e8ee4a5598c77229b695fdf +guid: f0c7eaf48f9db4897bc245a4368c1058 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/DemoApp/Assets/MaxSdk/AppLovin/Plugins/Android.meta b/DemoApp/Assets/MaxSdk/AppLovin/Plugins/Android.meta index 1c1fa28..48d144c 100644 --- a/DemoApp/Assets/MaxSdk/AppLovin/Plugins/Android.meta +++ b/DemoApp/Assets/MaxSdk/AppLovin/Plugins/Android.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e99b4053620214bb792c53550c79838a +guid: ad123b7ce69ec4785b51c3c8dd8daae7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/DemoApp/Assets/MaxSdk/AppLovin/Plugins/Android/applovin-max-unity-plugin.aar b/DemoApp/Assets/MaxSdk/AppLovin/Plugins/Android/applovin-max-unity-plugin.aar index 1755940..7cf0427 100644 Binary files a/DemoApp/Assets/MaxSdk/AppLovin/Plugins/Android/applovin-max-unity-plugin.aar and b/DemoApp/Assets/MaxSdk/AppLovin/Plugins/Android/applovin-max-unity-plugin.aar differ diff --git a/DemoApp/Assets/MaxSdk/AppLovin/Plugins/iOS.meta b/DemoApp/Assets/MaxSdk/AppLovin/Plugins/iOS.meta index 7922667..9889ac4 100644 --- a/DemoApp/Assets/MaxSdk/AppLovin/Plugins/iOS.meta +++ b/DemoApp/Assets/MaxSdk/AppLovin/Plugins/iOS.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 125fa3d9de30e4a089c720e502224457 +guid: a4c695e798b714620b8b4dee0e33e7b5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/DemoApp/Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm b/DemoApp/Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm index 2b34f07..d617cbb 100644 --- a/DemoApp/Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm +++ b/DemoApp/Assets/MaxSdk/AppLovin/Plugins/iOS/MAUnityPlugin.mm @@ -8,7 +8,7 @@ #import "MAUnityAdManager.h" -#define VERSION @"6.6.1" +#define VERSION @"6.6.2" #define NSSTRING(_X) ( (_X != NULL) ? [NSString stringWithCString: _X encoding: NSStringEncodingConversionAllowLossy].al_stringByTrimmingWhitespace : nil) @interface NSString (ALUtils) @@ -28,7 +28,6 @@ - (void)setSdkKey:(NSString *)sdkKey; static NSString *const KeySdkKey = @"SdkKey"; UIView* UnityGetGLView(); - NSString *getSdkKeyFromAppLovinSettingsPlist(); static ALSdkInitializationConfigurationBuilder *_initConfigurationBuilder; static ALSdk *_sdk; @@ -42,16 +41,6 @@ - (void)setSdkKey:(NSString *)sdkKey; // Helper method to log errors void logUninitializedAccessError(const char *callingMethod); - ALSdkInitializationConfigurationBuilder *getInitConfigurationBuilder() - { - if ( !_initConfigurationBuilder ) - { - _initConfigurationBuilder = [ALSdkInitializationConfiguration builderWithSdkKey: getSdkKeyFromAppLovinSettingsPlist()]; - } - - return _initConfigurationBuilder; - } - ALSdk *getSdk() { if ( !_sdk ) @@ -72,6 +61,17 @@ - (void)setSdkKey:(NSString *)sdkKey; return _adManager; } + ALSdkInitializationConfigurationBuilder *getInitConfigurationBuilder() + { + if ( !_initConfigurationBuilder ) + { + NSString *sdkKey = [getSdk().settings.extraParameters al_stringForKey: KeySdkKey]; + _initConfigurationBuilder = [ALSdkInitializationConfiguration builderWithSdkKey: sdkKey]; + } + + return _initConfigurationBuilder; + } + int getConsentStatusValue(NSNumber *consentStatus) { if ( consentStatus ) @@ -117,14 +117,6 @@ id getLocalExtraParameterValue(const char *json) return array; } - NSString *getSdkKeyFromAppLovinSettingsPlist() - { - NSString *settingsPlistResourceURL = [NSBundle.mainBundle pathForResource: @"AppLovin-Settings" ofType: @"plist"]; - NSDictionary *sdkSettingsFromPlist = settingsPlistResourceURL ? [[NSDictionary alloc] initWithContentsOfFile: settingsPlistResourceURL] : @{}; - - return [sdkSettingsFromPlist al_stringForKey: KeySdkKey]; - } - MASegmentCollection *getSegmentCollection(const char *collectionJson) { MASegmentCollectionBuilder *segmentCollectionBuilder = [MASegmentCollection builder]; diff --git a/DemoApp/Assets/MaxSdk/Prefabs.meta b/DemoApp/Assets/MaxSdk/Prefabs.meta index 81f39ca..d0a8276 100644 --- a/DemoApp/Assets/MaxSdk/Prefabs.meta +++ b/DemoApp/Assets/MaxSdk/Prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c5c56269cce4b41f2ad38fce6fa492c2 +guid: 3f5608ac310f84512a36d155913929ab folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/DemoApp/Assets/MaxSdk/Resources.meta b/DemoApp/Assets/MaxSdk/Resources.meta index f634664..8346ba1 100644 --- a/DemoApp/Assets/MaxSdk/Resources.meta +++ b/DemoApp/Assets/MaxSdk/Resources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3dcc66076f7f149d0b7cec600661f368 +guid: 1de2857e3daad4fee80abf49fba35d73 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/DemoApp/Assets/MaxSdk/Resources/Images.meta b/DemoApp/Assets/MaxSdk/Resources/Images.meta index bb4301d..9765004 100644 --- a/DemoApp/Assets/MaxSdk/Resources/Images.meta +++ b/DemoApp/Assets/MaxSdk/Resources/Images.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f910dbfcaedf94ec98c031489a7f6797 +guid: 4011ce02801084beca39d7aee99846e0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/DemoApp/Assets/MaxSdk/Scripts.meta b/DemoApp/Assets/MaxSdk/Scripts.meta index e5f77ce..5be2ddb 100644 --- a/DemoApp/Assets/MaxSdk/Scripts.meta +++ b/DemoApp/Assets/MaxSdk/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a983cd3d5fdeb444d98b53c332a04b5e +guid: 687bbe215cbea4487b9dc7ffbefb0097 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs b/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs index d32a735..533a4f3 100644 --- a/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs +++ b/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroid.cs @@ -56,6 +56,8 @@ public class AppLovinPostProcessAndroid : IPostGenerateGradleAndroidProject private const string KeyConsentFlowPrivacyPolicy = "consent_flow_privacy_policy"; private const string KeyConsentFlowDebugUserGeography = "consent_flow_debug_user_geography"; + private const string KeyRenderOutsideSafeArea = "render_outside_safe_area"; + #if UNITY_2022_3_OR_NEWER // To match "'com.android.library' version '7.3.1'" line in build.gradle private static readonly Regex TokenGradleVersionLibrary = new Regex(".*id ['\"]com\\.android\\.library['\"] version"); @@ -354,6 +356,7 @@ private static void AddSdkSettings(string path) // Add the SDK key to the SDK settings. appLovinSdkSettings[KeySdkKey] = AppLovinSettings.Instance.SdkKey; + appLovinSdkSettings[KeyRenderOutsideSafeArea] = PlayerSettings.Android.renderOutsideSafeArea; // Add the Consent/Terms flow settings if needed. if (AppLovinInternalSettings.Instance.ConsentFlowEnabled) diff --git a/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs b/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs index 5e094fd..e3a0d2e 100644 --- a/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs +++ b/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessAndroidGradle.cs @@ -10,7 +10,6 @@ using System.IO; using UnityEditor.Android; -using UnityEngine; namespace AppLovinMax.Scripts.IntegrationManager.Editor { @@ -27,15 +26,21 @@ public void OnPostGenerateGradleAndroidProject(string path) // On Unity 2019.3+, the path returned is the path to the unityLibrary's module. // The AppLovin Quality Service buildscript closure related lines need to be added to the root build.gradle file. var rootGradleBuildFilePath = Path.Combine(path, "../build.gradle"); -#if UNITY_2022_2_OR_NEWER - if (!AddPluginToRootGradleBuildFile(rootGradleBuildFilePath)) return; - var rootSettingsGradleFilePath = Path.Combine(path, "../settings.gradle"); - if (!AddAppLovinRepository(rootSettingsGradleFilePath)) return; -#else + + // For 2022.2 and newer and 2021.3.41+ + var qualityServiceAdded = AddPluginToRootGradleBuildFile(rootGradleBuildFilePath); + var appLovinRepositoryAdded = AddAppLovinRepository(rootSettingsGradleFilePath); + + // For 2021.3.40 and older and 2022.0 - 2022.1.x var buildScriptChangesAdded = AddQualityServiceBuildScriptLines(rootGradleBuildFilePath); - if (!buildScriptChangesAdded) return; -#endif + + var failedToAddPlugin = !buildScriptChangesAdded && !(qualityServiceAdded && appLovinRepositoryAdded); + if (failedToAddPlugin) + { + MaxSdkLogger.UserWarning("Failed to add AppLovin Quality Service plugin to the gradle project."); + return; + } // The plugin needs to be added to the application module (named launcher) var applicationGradleBuildFilePath = Path.Combine(path, "../launcher/build.gradle"); diff --git a/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs b/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs index 179a696..e0fcbd1 100644 --- a/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs +++ b/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinPostProcessiOS.cs @@ -39,6 +39,8 @@ public class AppLovinPostProcessiOS #if !UNITY_2019_3_OR_NEWER private const string UnityMainTargetName = "Unity-iPhone"; #endif + // Use a priority of 90 to have AppLovin embed frameworks after Pods are installed (EDM finishes installing Pods at priority 60) and before Firebase Crashlytics runs their scripts (at priority 100). + private const int AppLovinEmbedFrameworksPriority = 90; private const string TargetUnityIphonePodfileLine = "target 'Unity-iPhone' do"; private const string UseFrameworksPodfileLine = "use_frameworks!"; @@ -146,7 +148,7 @@ public static void OnPostProcessBuild(BuildTarget buildTarget, string buildPath) } } - [PostProcessBuild(int.MaxValue)] + [PostProcessBuild(AppLovinEmbedFrameworksPriority)] public static void MaxPostProcessPbxProject(BuildTarget buildTarget, string buildPath) { var projectPath = PBXProject.GetPBXProjectPath(buildPath); diff --git a/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs b/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs index 87152a9..166524c 100644 --- a/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs +++ b/DemoApp/Assets/MaxSdk/Scripts/IntegrationManager/Editor/AppLovinProcessGradleBuildFile.cs @@ -37,11 +37,9 @@ public abstract class AppLovinProcessGradleBuildFile : AppLovinPreProcess private static readonly Regex TokenApiKey = new Regex(".*apiKey.*"); private static readonly Regex TokenAppLovinPlugin = new Regex(".*apply plugin:.+?(?=applovin-quality-service).*"); -#if UNITY_2022_2_OR_NEWER private const string PluginsMatcher = "plugins"; private const string PluginManagementMatcher = "pluginManagement"; private const string QualityServicePluginRoot = " id 'com.applovin.quality' version '+' apply false // NOTE: Requires version 4.8.3+ for Gradle version 7.2+"; -#endif private const string BuildScriptMatcher = "buildscript"; private const string QualityServiceMavenRepo = "maven { url 'https://artifacts.applovin.com/android'; content { includeGroupByRegex 'com.applovin.*' } }"; @@ -108,9 +106,19 @@ protected static void AddAppLovinQualityServicePlugin(string applicationGradleBu Console.WriteLine(exception); } } -#if UNITY_2022_2_OR_NEWER + /// - /// Adds AppLovin Quality Service plugin DSL element to the project's root build.gradle file. + /// Adds AppLovin Quality Service plugin DSL element to the project's root build.gradle file. + /// Sample build.gradle file after adding quality service: + /// plugins { + /// id 'com.android.application' version '7.4.2' apply false + /// id 'com.android.library' version '7.4.2' apply false + /// id 'com.applovin.quality' version '+' apply false + /// } + /// tasks.register('clean', Delete) { + /// delete rootProject.layout.buildDirectory + /// } + /// /// /// The path to project's root build.gradle file. /// true when the plugin was added successfully. @@ -141,11 +149,7 @@ protected bool AddPluginToRootGradleBuildFile(string rootGradleBuildFile) outputLines.Add(line); } - if (!pluginAdded) - { - MaxSdkLogger.UserError("Failed to add AppLovin Quality Service plugin to root gradle file."); - return false; - } + if (!pluginAdded) return false; try { @@ -163,6 +167,18 @@ protected bool AddPluginToRootGradleBuildFile(string rootGradleBuildFile) /// /// Adds the AppLovin maven repository to the project's settings.gradle file. + /// Sample settings.gradle file after adding AppLovin Repository: + /// pluginManagement { + /// repositories { + /// maven { url 'https://artifacts.applovin.com/android'; content { includeGroupByRegex 'com.applovin.*' } } + /// + /// gradlePluginPortal() + /// google() + /// mavenCentral() + /// } + /// } + /// ... + /// /// /// The path to the project's settings.gradle file. /// true if the repository was added successfully. @@ -212,11 +228,7 @@ protected bool AddAppLovinRepository(string settingsGradleFile) } } - if (!mavenRepoAdded) - { - MaxSdkLogger.UserError("Failed to add AppLovin Quality Service plugin maven repo to settings gradle file."); - return false; - } + if (!mavenRepoAdded) return false; try { @@ -231,11 +243,25 @@ protected bool AddAppLovinRepository(string settingsGradleFile) return true; } -#endif #if UNITY_2019_3_OR_NEWER /// /// Adds the necessary AppLovin Quality Service dependency and maven repo lines to the provided root build.gradle file. + /// Sample build.gradle file after adding quality service: + /// allprojects { + /// buildscript { + /// repositories { + /// maven { url 'https://artifacts.applovin.com/android'; content { includeGroupByRegex 'com.applovin.*' } } + /// google() + /// jcenter() + /// } + /// + /// dependencies { + /// classpath 'com.android.tools.build:gradle:4.0.1' + /// classpath 'com.applovin.quality:AppLovinQualityServiceGradlePlugin:+' + /// } + /// ... + /// /// /// The root build.gradle file path /// true if the build script lines were applied correctly. @@ -536,7 +562,6 @@ private static List GenerateUpdatedBuildFileLines(List lines, st if ((addBuildScriptLines && (!qualityServiceRepositoryAdded || !qualityServiceDependencyClassPathAdded)) || (addPlugin && !qualityServicePluginAdded)) { - MaxSdkLogger.UserError("Failed to add AppLovin Quality Service plugin. Quality Service Plugin Added?: " + qualityServicePluginAdded + ", Quality Service Repo added?: " + qualityServiceRepositoryAdded + ", Quality Service dependency added?: " + qualityServiceDependencyClassPathAdded); return null; } } diff --git a/DemoApp/Assets/MaxSdk/Scripts/MaxSdk.cs b/DemoApp/Assets/MaxSdk/Scripts/MaxSdk.cs index f2fbd58..f832073 100644 --- a/DemoApp/Assets/MaxSdk/Scripts/MaxSdk.cs +++ b/DemoApp/Assets/MaxSdk/Scripts/MaxSdk.cs @@ -18,7 +18,7 @@ public class MaxSdk : MaxSdkUnityEditor #endif { - private const string _version = "6.6.1"; + private const string _version = "6.6.2"; /// /// Returns the current plugin version.