Skip to content

Commit 979a051

Browse files
committed
fix: Release 3.3.3
1 parent 25dfb25 commit 979a051

File tree

11 files changed

+40
-28
lines changed

11 files changed

+40
-28
lines changed

CHANGELOG.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
55
## [3.3.3] - 2024-09-19
66

77
### Added
8-
- **Unit Testing Enhancements**:
98
- Added new unit test documentation and expanded test coverage across the project. (#914, #905, #893, #fdd07613, #0f55d1ec, #902)
10-
11-
- **Documentation Updates**:
129
- Improved documentation clarity and organization, including replacing markdown files in the root of the repository with symbolic links to the package files. (#914, #f9d3615a, #8685cd73, #f077cec1)
13-
14-
- **Tests**:
1510
- Added new unit tests and refactored existing ones to address file upload encoding issues and improve coverage. (#f0b3572e, #902, #94eb0453, #f0b3572e)
1611

1712
### Fixed
18-
- **File & Prefab Management**:
1913
- Removed unreferenced and outdated prefabs and files, updated documentation to reference the correct prefabs. (#adfb2877, #bfbec067, #f077cec1, #f9d3615a)
20-
21-
- **Test Organization and Naming**:
2214
- Renamed and reorganized unit tests to improve consistency in naming and structure. (#53bfb04a, #c8f4b821, #948babd5)
23-
24-
- **Android Build Tools**:
2515
- Updated the `GetBuildTools` function to accommodate Android Build Tool versioning in Unity 2022.3.44f1 LTS. (#8ed407cf, #bc075e7e)
26-
27-
- **Namespace and Manager Refactoring**:
2816
- Refactored managers into services, removed outdated manager references, and updated namespaces. (#2060ce08, #e83deb7f, #57b7b8b6, #561534d5)
29-
30-
- **Miscellaneous Fixes**:
3117
- Removed extraneous files like `.editorconfig` and unreferenced classes. Fixed small issues like grammar and unused code. (#116f51c7, #84b67848, #adfb2877, #e3c7262a, #c799fcc1)
3218

3319
## [3.3.2] - 2024-08-27

Editor/Configs/UnitTestConfig.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ namespace PlayEveryWare.EpicOnlineServices.Tests
2727
using System;
2828

2929
[Serializable]
30-
[ConfigGroup("EOS Automated Test Configuration")]
31-
public class UnitTestConfig : EditorConfig
30+
[ConfigGroup("EOS Unit Test Configuration")]
31+
public partial class UnitTestConfig : EditorConfig
3232
{
3333
/// <summary>
3434
/// The IP address of the machine running the EOS_DevAuthTool.

Editor/EditorWindows/EOSSettingsWindow.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424

2525
namespace PlayEveryWare.EpicOnlineServices.Editor.Windows
2626
{
27+
#if !EOS_DISABLE
2728
using Epic.OnlineServices.UI;
29+
#endif
2830
using PlayEveryWare.EpicOnlineServices.Extensions;
2931
using PlayEveryWare.EpicOnlineServices.Utility;
3032
using System;
@@ -111,7 +113,7 @@ private string GenerateEOSGeneratedFile(EOSConfig aEOSConfig)
111113
#define PLATFORM_32BITS 1
112114
#endif
113115
114-
extern ""C"" __declspec(dllexport) char* __stdcall GetConfigAsJSONString()
116+
extern ""C"" __declspec(dllexport) char* __stdcall GetConfigAsJSONString()
115117
{
116118
return ""{""
117119
""productName:"" EOS_PRODUCT_NAME "",""
@@ -351,13 +353,15 @@ private void OnDefaultGUI()
351353
ref mainEOSConfigFile.alwaysSendInputToOverlay, 190,
352354
"If true, the plugin will always send input to the overlay from the C# side to native, and handle showing the overlay. This doesn't always mean input makes it to the EOS SDK.");
353355

356+
#if !EOS_DISABLE
354357
InputStateButtonFlags toggleFriendsButtonCombinationEnum = mainEOSConfigFile.GetToggleFriendsButtonCombinationFlags();
355358
GUIEditorUtility.AssigningEnumField<InputStateButtonFlags>("Default Activate Overlay Button",
356359
ref toggleFriendsButtonCombinationEnum, 190,
357360
"Users can press the button(s) associated with this value to activate the Epic Social Overlay. Not all combinations are valid; the SDK will log an error at the start of runtime if an invalid combination is selected.");
358361
mainEOSConfigFile.toggleFriendsButtonCombination = EnumUtility<InputStateButtonFlags>.GetEnumerator(toggleFriendsButtonCombinationEnum)
359362
.Select(enumValue => enumValue.ToString())
360363
.ToList();
364+
#endif
361365
}
362366

363367
protected override void RenderWindow()

Runtime/Core/Config/EOSConfig.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ namespace PlayEveryWare.EpicOnlineServices
2929
using Epic.OnlineServices.Auth;
3030
using Epic.OnlineServices.Platform;
3131
using Epic.OnlineServices.IntegratedPlatform;
32+
using Epic.OnlineServices.UI;
3233
#endif
3334
using System;
3435
using System.Collections.Generic;
3536
using UnityEngine;
3637
using System.Text.RegularExpressions;
3738
using Extensions;
38-
using Epic.OnlineServices.UI;
39+
3940
using PlayEveryWare.EpicOnlineServices.Utility;
4041

4142
/// <summary>
@@ -344,9 +345,13 @@ protected EOSConfig() : base("EpicOnlineServicesConfig.json")
344345
/// use that value if this configuration field is null, empty, or contains
345346
/// only <see cref="InputStateButtonFlags.None"/>.
346347
/// </summary>
347-
public List<string> toggleFriendsButtonCombination = new List<string>() { InputStateButtonFlags.SpecialLeft.ToString() };
348+
public List<string> toggleFriendsButtonCombination = new List<string>() {
349+
#if !EOS_DISABLE
350+
InputStateButtonFlags.SpecialLeft.ToString()
351+
#endif
352+
};
348353

349-
#endregion
354+
#endregion
350355

351356
public static Regex InvalidEncryptionKeyRegex;
352357

Runtime/Core/EOS_SDK_Additions/EventHandlers.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
*
2222
*/
2323

24+
#if !EOS_DISABLE
25+
2426
namespace PlayEveryWare.EpicOnlineServices.Events
2527
{
2628
using Epic.OnlineServices;
@@ -32,4 +34,6 @@ namespace PlayEveryWare.EpicOnlineServices.Events
3234
/// <param name="result">Result enum (defined within the EOS SDK).</param>
3335
// ReSharper disable once InconsistentNaming
3436
public delegate void EOSResultEventHandler(Result result);
35-
}
37+
}
38+
39+
#endif

Runtime/Core/EOS_SDK_Additions/FileRequestTransferWrapper.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
*
2222
*/
2323

24+
#if !EOS_DISABLE
25+
2426
namespace PlayEveryWare.EpicOnlineServices
2527
{
2628
using Epic.OnlineServices;
@@ -157,4 +159,6 @@ protected void Dispose(bool disposing)
157159
_disposed = true;
158160
}
159161
}
160-
}
162+
}
163+
164+
#endif

Runtime/Core/EOS_SDK_Additions/IFileTransferRequest.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
*
2222
*/
2323

24+
#if !EOS_DISABLE
2425
namespace PlayEveryWare.EpicOnlineServices
2526
{
2627
using Epic.OnlineServices;
@@ -31,4 +32,5 @@ public interface IFileTransferRequest : IDisposable
3132
public Result CancelRequest();
3233
public void Release();
3334
}
34-
}
35+
}
36+
#endif

Runtime/Core/EOS_SDK_Additions/PlayerDataStorageFileTransferRequestWrapper.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@
2121
*
2222
*/
2323

24+
#if !EOS_DISABLE
25+
2426
namespace PlayEveryWare.EpicOnlineServices
2527
{
2628
using Epic.OnlineServices;
2729
using Epic.OnlineServices.PlayerDataStorage;
28-
using System;
2930

3031
/// <summary>
3132
/// Used to wrap the PlayerDataStorageFileTransferRequest class provided by
@@ -57,4 +58,6 @@ public override void Release()
5758
_instance = null;
5859
}
5960
}
60-
}
61+
}
62+
63+
#endif

Runtime/Core/EOS_SDK_Additions/TitleStorageFileTransferRequestWrapper.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
*
2222
*/
2323

24+
#if !EOS_DISABLE
25+
2426
namespace PlayEveryWare.EpicOnlineServices
2527
{
2628
using Epic.OnlineServices;
@@ -56,4 +58,6 @@ public override void Release()
5658
_instance = null;
5759
}
5860
}
59-
}
61+
}
62+
63+
#endif

Runtime/Core/Utility/FileSystemUtility.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ public static string ReadAllText(string path)
512512
public static async Task<string> ReadAllTextAsync(string path)
513513
{
514514
#if UNITY_ANDROID && !UNITY_EDITOR
515-
// On Android, use a custom helper to read the file synchronously
515+
// On Android, use a custom helper to read the file
516516
return await AndroidFileIOHelper.ReadAllText(path);
517517
#else
518518
// On other platforms, read asynchronously or synchronously as

0 commit comments

Comments
 (0)