From cb18156c476f7a1bf7fff0bdd944a4d4e6c093d2 Mon Sep 17 00:00:00 2001 From: Luke Gehorsam Date: Wed, 28 Jun 2023 08:10:17 -0700 Subject: [PATCH] Update to nakama-cpp 2.8.0 (#26) --- .github/workflows/build_all.yml | 8 ++++---- CHANGELOG.md | 5 ++++- triplets/arm-neon-android-release.cmake | 8 +++++++- triplets/arm64-android-release.cmake | 8 +++++++- triplets/arm64-ios-release.cmake | 7 ++++++- triplets/arm64-osx-release.cmake | 6 +++++- triplets/x64-android-release.cmake | 8 +++++++- triplets/x64-iphonesimulator-release.cmake | 2 +- triplets/x64-linux-release.cmake | 7 ++++++- triplets/x64-osx-release.cmake | 6 +++++- triplets/x86-windows-release.cmake | 7 ++++++- vcpkg-configuration.json | 2 +- vcpkg.json | 24 ++++++---------------- 13 files changed, 65 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 914bb92..4de48d9 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -5,9 +5,9 @@ jobs: uses: ./.github/workflows/build_android.yml build_ios: uses: ./.github/workflows/build_ios.yml -# TODO investigate failures: build_linux: -# TODO investigate failures: uses: ./.github/workflows/build_linux.yml +# TODO FIX build_linux: +# uses: ./.github/workflows/build_linux.yml build_osx: uses: ./.github/workflows/build_osx.yml -# TODO investigate failures build_windows: -# TODO investigate failures uses: ./.github/workflows/build_windows.yml +# TODO FIX build_windows: +# uses: ./.github/workflows/build_windows.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index afd85b2..c2adfe3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,11 @@ All notable changes to this project are documented below. The format is based on [keep a changelog](http://keepachangelog.com/) and this project uses [semantic versioning](http://semver.org/). -## [2.6.0] - [2023-02-24] +## [2.7.0] - [2023-06-27] +### Changed +- Updated to Nakama 2.8.0 +## [2.6.0] - [2023-02-24] ### Changed - Updated to use nakama-cpp 2.7.1. - Remove buggy Cocos adapters. The new adapters are now native to nakama-cpp. diff --git a/triplets/arm-neon-android-release.cmake b/triplets/arm-neon-android-release.cmake index 5449a1b..272c3d1 100644 --- a/triplets/arm-neon-android-release.cmake +++ b/triplets/arm-neon-android-release.cmake @@ -1,6 +1,12 @@ set(VCPKG_TARGET_ARCHITECTURE arm) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) + +if (${PORT} MATCHES "nakama-sdk") + set(VCPKG_LIBRARY_LINKAGE dynamic) +else() + set(VCPKG_LIBRARY_LINKAGE static) +endif() + set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_BUILD_TYPE release) set(ANDROID_ARM_NEON ON) \ No newline at end of file diff --git a/triplets/arm64-android-release.cmake b/triplets/arm64-android-release.cmake index 4c7738a..20b4a07 100644 --- a/triplets/arm64-android-release.cmake +++ b/triplets/arm64-android-release.cmake @@ -1,6 +1,12 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) + +if (${PORT} MATCHES "nakama-sdk") + set(VCPKG_LIBRARY_LINKAGE dynamic) +else() + set(VCPKG_LIBRARY_LINKAGE static) +endif() + set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_BUILD_TYPE release) diff --git a/triplets/arm64-ios-release.cmake b/triplets/arm64-ios-release.cmake index b1a2ef5..987e4b3 100644 --- a/triplets/arm64-ios-release.cmake +++ b/triplets/arm64-ios-release.cmake @@ -1,7 +1,12 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) +if (${PORT} MATCHES "nakama-sdk") + set(VCPKG_LIBRARY_LINKAGE dynamic) +else() + set(VCPKG_LIBRARY_LINKAGE static) +endif() + set(VCPKG_CMAKE_SYSTEM_NAME iOS) # HeroicLabs additions to standard triplets: diff --git a/triplets/arm64-osx-release.cmake b/triplets/arm64-osx-release.cmake index f4f5075..5cefd3b 100644 --- a/triplets/arm64-osx-release.cmake +++ b/triplets/arm64-osx-release.cmake @@ -1,7 +1,11 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) +if (${PORT} MATCHES "nakama-sdk") + set(VCPKG_LIBRARY_LINKAGE dynamic) +else() + set(VCPKG_LIBRARY_LINKAGE static) +endif() set(VCPKG_BUILD_TYPE release) diff --git a/triplets/x64-android-release.cmake b/triplets/x64-android-release.cmake index 2a6ab18..57e85e5 100644 --- a/triplets/x64-android-release.cmake +++ b/triplets/x64-android-release.cmake @@ -1,6 +1,12 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) + +if (${PORT} MATCHES "nakama-sdk") + set(VCPKG_LIBRARY_LINKAGE dynamic) +else() + set(VCPKG_LIBRARY_LINKAGE static) +endif() + set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_BUILD_TYPE release) diff --git a/triplets/x64-iphonesimulator-release.cmake b/triplets/x64-iphonesimulator-release.cmake index 2d2691d..9716540 100644 --- a/triplets/x64-iphonesimulator-release.cmake +++ b/triplets/x64-iphonesimulator-release.cmake @@ -2,7 +2,7 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) if (${PORT} MATCHES "nakama-sdk") - set(VCPKG_LIBRARY_LINKAGE dynamic) ## nakama can only be built as a shared library + set(VCPKG_LIBRARY_LINKAGE dynamic) else() set(VCPKG_LIBRARY_LINKAGE static) endif() diff --git a/triplets/x64-linux-release.cmake b/triplets/x64-linux-release.cmake index d7f3e2b..2f932a5 100644 --- a/triplets/x64-linux-release.cmake +++ b/triplets/x64-linux-release.cmake @@ -1,6 +1,11 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) + +if (${PORT} MATCHES "nakama-sdk") + set(VCPKG_LIBRARY_LINKAGE dynamic) +else() + set(VCPKG_LIBRARY_LINKAGE static) +endif() set(VCPKG_CMAKE_SYSTEM_NAME Linux) set(VCPKG_BUILD_TYPE release) diff --git a/triplets/x64-osx-release.cmake b/triplets/x64-osx-release.cmake index 270f19b..0f57f82 100644 --- a/triplets/x64-osx-release.cmake +++ b/triplets/x64-osx-release.cmake @@ -3,7 +3,11 @@ set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_BUILD_TYPE release) +if (${PORT} MATCHES "nakama-sdk") + set(VCPKG_LIBRARY_LINKAGE dynamic) +else() + set(VCPKG_LIBRARY_LINKAGE static) +endif() set(VCPKG_CMAKE_SYSTEM_NAME Darwin) set(VCPKG_OSX_ARCHITECTURES x86_64) diff --git a/triplets/x86-windows-release.cmake b/triplets/x86-windows-release.cmake index 186f58f..b0d95de 100644 --- a/triplets/x86-windows-release.cmake +++ b/triplets/x86-windows-release.cmake @@ -1,7 +1,12 @@ set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) +if (${PORT} MATCHES "nakama-sdk") + set(VCPKG_LIBRARY_LINKAGE dynamic) +else() + set(VCPKG_LIBRARY_LINKAGE static) +endif() + set(VCPKG_BUILD_TYPE release) set(CMAKE_GENERATOR Visual Studio 17 2022) diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 819f217..2e96458 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -9,7 +9,7 @@ { "kind": "git", "repository": "https://github.com/heroiclabs/nakama-vcpkg-registry", - "baseline": "b51679d57d32502089c43f4b957995baf8355546", + "baseline": "8a2ffdb6efaa54399ad1124092f5318fa8cc8ad6", "reference": "master", "packages": ["nakama-sdk", "wslay"] } diff --git a/vcpkg.json b/vcpkg.json index 235261f..1be9a03 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,28 +1,16 @@ { "name": "nakama-sdk-cocos2d-x", - "version": "2.6.0", + "version": "2.7.0", "dependencies": [ { "name": "nakama-sdk", - "version>=": "2.7.1", - "platform": "ios | osx | linux", - "features": ["libhttpclient-http", "wslay", "curl-io"] - }, - { - "name": "nakama-sdk", - "version>=": "2.7.1", - "platform": "windows", - "features": ["libhttpclient-ws", "libhttpclient-http"] - }, - { - "name": "nakama-sdk", - "version>=": "2.7.1", - "platform": "android", + "version>=": "2.8.0#6", "features": ["curl-io", "curl-http", "wslay", "logs"] } ], - "overrides": [ - ], "default-features": [], - "builtin-baseline": "62d01b70df227850b728f5050418b917ad6d2b32" + "builtin-baseline": "62d01b70df227850b728f5050418b917ad6d2b32", + "overrides": [ + { "name": "curl", "version": "8.0.1" } + ] }