Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for submission 2 #23

Merged
merged 8 commits into from
Jul 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .github/workflows/plugin-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ jobs:
git clone https://github.com/microsoft/vcpkg build/vcpkg
git -C build/vcpkg checkout ${{ env.VCPKG_COMMIT_HASH }}
./build/vcpkg/bootstrap-vcpkg.bat
./build/vcpkg/vcpkg install configcat[core] --triplet x64-windows
./build/vcpkg/vcpkg install configcat[core,sha] --triplet x64-windows

- uses: actions/upload-artifact@v3
with:
name: Win64
path: |
./build/vcpkg/installed/*/lib/configcat.lib
./build/vcpkg/installed/*/lib/hash-library.lib

build-android:
runs-on: windows-latest
Expand All @@ -40,13 +41,14 @@ jobs:
git clone https://github.com/microsoft/vcpkg build/vcpkg
git -C build/vcpkg checkout ${{ env.VCPKG_COMMIT_HASH }}
./build/vcpkg/bootstrap-vcpkg.bat
./build/vcpkg/vcpkg install configcat[core] --triplet arm64-android
./build/vcpkg/vcpkg install configcat[core,sha] --triplet arm64-android

- uses: actions/upload-artifact@v3
with:
name: Android
path: |
./build/vcpkg/installed/*/lib/libconfigcat.a
./build/vcpkg/installed/*/lib/libhash-library.a

build-macos:
runs-on: macos-latest
Expand All @@ -59,13 +61,14 @@ jobs:
git clone https://github.com/microsoft/vcpkg build/vcpkg
git -C build/vcpkg checkout ${{ env.VCPKG_COMMIT_HASH }}
./build/vcpkg/bootstrap-vcpkg.sh
./build/vcpkg/vcpkg install configcat[core] --triplet universal-osx-unreal --overlay-triplets "$GITHUB_WORKSPACE/Extras/triplets"
./build/vcpkg/vcpkg install configcat[core,sha] --triplet universal-osx-unreal --overlay-triplets "$GITHUB_WORKSPACE/Extras/triplets"

- uses: actions/upload-artifact@v3
with:
name: MacOS
path: |
./build/vcpkg/installed/*/lib/libconfigcat.a
./build/vcpkg/installed/*/lib/libhash-library.a

build-ios:
runs-on: macos-latest
Expand All @@ -78,13 +81,14 @@ jobs:
git clone https://github.com/microsoft/vcpkg build/vcpkg
git -C build/vcpkg checkout ${{ env.VCPKG_COMMIT_HASH }}
./build/vcpkg/bootstrap-vcpkg.sh
./build/vcpkg/vcpkg install configcat[core] --triplet arm64-ios-unreal --overlay-triplets "$GITHUB_WORKSPACE/Extras/triplets"
./build/vcpkg/vcpkg install configcat[core,sha] --triplet arm64-ios-unreal --overlay-triplets "$GITHUB_WORKSPACE/Extras/triplets"

- uses: actions/upload-artifact@v3
with:
name: iOS
path: |
./build/vcpkg/installed/*/lib/libconfigcat.a
./build/vcpkg/installed/*/lib/libhash-library.a

build-linux:
runs-on: ubuntu-latest
Expand All @@ -102,13 +106,14 @@ jobs:
export CC=clang
export CXX=clang++

./build/vcpkg/vcpkg install configcat[core] --triplet x64-linux-unreal --overlay-triplets "$GITHUB_WORKSPACE/Extras/triplets"
./build/vcpkg/vcpkg install configcat[core,sha] --triplet x64-linux-unreal --overlay-triplets "$GITHUB_WORKSPACE/Extras/triplets"

- uses: actions/upload-artifact@v3
with:
name: Linux
path: |
./build/vcpkg/installed/*/lib/libconfigcat.a
./build/vcpkg/installed/*/lib/libhash-library.a

publish-engine-plugin:
runs-on: ubuntu-latest
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@ jobs:
export CC=clang
export CXX=clang++

./build/vcpkg/vcpkg install configcat[core] --triplet x64-linux-unreal --overlay-triplets "$GITHUB_WORKSPACE/Extras/triplets"
./build/vcpkg/vcpkg install configcat[core,sha] --triplet x64-linux-unreal --overlay-triplets "$GITHUB_WORKSPACE/Extras/triplets"

- name: Copy binaries
run: |
mkdir -p ${{ github.workspace }}/Source/ThirdParty/ConfigCatCppSDK/Binaries/Linux/x64-linux-unreal/
cp ${{ github.workspace }}/build/vcpkg/installed/x64-linux-unreal/lib/libconfigcat.a ${{ github.workspace }}/Source/ThirdParty/ConfigCatCppSDK/Binaries/Linux/x64-linux-unreal/libconfigcat.a
cp ${{ github.workspace }}/build/vcpkg/installed/x64-linux-unreal/lib/libhash-library.a ${{ github.workspace }}/Source/ThirdParty/ConfigCatCppSDK/Binaries/Linux/x64-linux-unreal/libhash-library.a

rm -r ./build/*

Expand Down
4 changes: 2 additions & 2 deletions ConfigCat.uplugin
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"FileVersion": 3,
"VersionName": "2.1.0",
"EngineVersion": "5.3",
"VersionName": "2.1.3",
"EngineVersion": "5.4",
"FriendlyName": "ConfigCat",
"Description": "ConfigCat is a hosted service for feature flag and configuration management. It lets you decouple feature releases from code deployments.",
"Category": "FeatureFlags",
Expand Down
10 changes: 10 additions & 0 deletions Extras/licenses/hash-library/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
zlib License

Copyright (c) 2014,2015 Stephan Brumme

This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software.
If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ ConfigCat is a feature flag and configuration management service that lets you s
ConfigCat is a <a href="https://configcat.com" target="_blank">hosted feature flag service</a>. Manage feature toggles across frontend, backend, mobile, desktop apps. <a href="https://configcat.com" target="_blank">Alternative to LaunchDarkly</a>. Management app + feature flag SDKs.

## External Libraries
The underlying ConfigCat C++ SDK uses these wonderful libraries: [nlohmann-json](https://github.com/nlohmann/json), [z4kn4fein-semver](https://github.com/z4kn4fein/cpp-semver).
The underlying ConfigCat C++ SDK uses these wonderful libraries: [hash-library](https://create.stephan-brumme.com/hash-library), [nlohmann-json](https://github.com/nlohmann/json), [z4kn4fein-semver](https://github.com/z4kn4fein/cpp-semver).
5 changes: 1 addition & 4 deletions Source/ConfigCat/ConfigCat.Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@ public ConfigCat(ReadOnlyTargetRules Target) : base(Target)
"DeveloperSettings",
"Projects",
"Engine",
"HTTP",
"OpenSSL"
"HTTP"
});

AddEngineThirdPartyPrivateStaticDependencies(Target, "OpenSSL");

PrivateDependencyModuleNames.AddRange(new[]
{
"ConfigCatWrappers",
Expand Down
1 change: 1 addition & 0 deletions Source/ConfigCat/Private/ConfigCatNetworkAdapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <Interfaces/IHttpResponse.h>
#include <Interfaces/IPluginManager.h>
#include <Misc/ScopeExit.h>
#include <HAL/PlatformProcess.h>

#include "ConfigCatLog.h"

Expand Down
38 changes: 0 additions & 38 deletions Source/ConfigCat/Private/ConfigCatSha.cpp

This file was deleted.

1 change: 1 addition & 0 deletions Source/ConfigCat/Private/ConfigCatSubsystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <Kismet/GameplayStatics.h>
#include <Logging/LogVerbosity.h>
#include <Misc/ConfigCacheIni.h>
#include <Engine/GameInstance.h>

#include "ConfigCat.h"
#include "ConfigCatLog.h"
Expand Down
14 changes: 0 additions & 14 deletions Source/ConfigCat/Public/ConfigCatSha.h

This file was deleted.

1 change: 1 addition & 0 deletions Source/ConfigCatWrappers/Public/ConfigCatUserWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <ConfigCatCppSDK/Include/configcatuser.h>

#include <Misc/DateTime.h>
#include <memory>

#include "ConfigCatUserWrapper.generated.h"
Expand Down
Loading