Problem: multiple library for mac (fix #332)

leejw51crypto · leejw51crypto · commit 754d1f1d37e1 · 2023-07-27T00:08:21.000+09:00
update lib, header

only one build for mac

changelog

change location

fix

remove 5_0

remove
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,8 +24,9 @@ jobs:
 
       - name: Prepare PlayCppSdk
         run: |
-          mv ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs
+          mv ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs          
           TARGET=4.27 make
+          rm -Rf ./Source/ThirdParty/PlayCppSdkLibrary/Lib/Mac/arm64
           python change_version.py 4.27.0
           
 
@@ -49,41 +50,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  Unreal_Release_5_0:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          submodules: recursive
-
-      - name: Prepare PlayCppSdk
-        run: |
-          mv ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs
-          TARGET=5.0 make
-          python change_version.py 5.0.0
-          
-
-      - name: Package For Windows,Mac
-        run: |
-          FILENAME="CronosPlayForUnrealEngine5.0.zip"
-          zip -r ${FILENAME} Source Resources CronosPlayUnreal.uplugin
-          sha256sum ${FILENAME} > "checksums.txt"
-          echo "release_file=${FILENAME}" >> $GITHUB_ENV
-          echo "checksum_file=checksums.txt" >> $GITHUB_ENV
-
-
-      - name: Upload binaries and bindings to Release
-        uses: softprops/action-gh-release@v1
-        if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
-        with:
-          draft: true
-          files: |
-            ${{ env.release_file }}
-            ${{ env.checksum_file }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
   Unreal_Release_5_1:
     runs-on: ubuntu-latest
     steps:
@@ -94,8 +60,9 @@ jobs:
 
       - name: Prepare PlayCppSdk
         run: |
-          mv ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs
+          mv ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs          
           TARGET=5.1 make
+          rm -Rf ./Source/ThirdParty/PlayCppSdkLibrary/Lib/Mac/arm64
           python change_version.py 5.1.0
           
 
@@ -129,8 +96,9 @@ jobs:
 
       - name: Prepare PlayCppSdk
         run: |
-          rm ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy
+          rm ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy          
           TARGET=5.2 make
+          rm -Rf ./Source/ThirdParty/PlayCppSdkLibrary/Lib/Mac/x86_64
           python change_version.py 5.2.0
           
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [v0.0.14-alpha] - 2023-7-26
+- only one build for mac
+- fix Array bug in abi json
+
 ## [v0.0.13-alpha] - 2023-6-15
 - Support apple arm64
 - Support Unreal Engine 5.2.0
diff --git a/CronosPlayUnreal.uplugin b/CronosPlayUnreal.uplugin
@@ -2,7 +2,7 @@
 	"FileVersion": 3,
 	"FriendlyName": "Cronos Play for Unreal Engine",
 	"Version": 1,
-	"VersionName": "v0.0.13-alpha",
+	"VersionName": "v0.0.14-alpha",
 	"EngineVersion": "5.2.0",
 	"Description": "Cronos labs",
 	"Category": "Programming",
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ UNAME := $(shell uname)
 PWD = $(shell pwd)
 
 # Set the play cpp sdk version
-PLAYCPPSDK=v0.0.21-alpha
+PLAYCPPSDK=v0.0.22-alpha
 # Set the play-cpp-sdk cache path
 PLAYCPPSDK_CACHE_DIR=./install/$(PLAYCPPSDK)
 # Set the play-cpp-sdk target path
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/contract.rs.cc b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/contract.rs.cc
@@ -325,7 +325,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/contract.rs.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/contract.rs.h
@@ -325,7 +325,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/core.cc b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/core.cc
@@ -369,7 +369,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/ethereum.rs.cc b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/ethereum.rs.cc
@@ -369,7 +369,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/ethereum.rs.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/ethereum.rs.h
@@ -369,7 +369,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/lib.rs.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/lib.rs.h
@@ -369,7 +369,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/nft.rs.cc b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/nft.rs.cc
@@ -323,7 +323,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/nft.rs.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/nft.rs.h
@@ -323,7 +323,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/uint.rs.cc b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/uint.rs.cc
@@ -323,7 +323,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/uint.rs.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/uint.rs.h
@@ -323,7 +323,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/extra-cpp-bindings/src/lib.rs.cc b/Source/ThirdParty/PlayCppSdkLibrary/Include/extra-cpp-bindings/src/lib.rs.cc
@@ -372,7 +372,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/extra-cpp-bindings/src/lib.rs.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/extra-cpp-bindings/src/lib.rs.h
@@ -372,7 +372,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/rust/cxx.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/rust/cxx.h
@@ -629,7 +629,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>
diff --git a/Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs b/Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs
@@ -40,15 +40,8 @@ public PlayCppSdkLibrary(ReadOnlyTargetRules Target) : base(Target) {
             PublicAdditionalLibraries.Add("ws2_32.lib");
 
         } else if (Target.Platform == UnrealTargetPlatform.Mac) {
-            if (Target.Architecture == UnrealArch.X64)
-                PublicAdditionalLibraries.Add(Path.Combine(
-                    LibrariesPath, "Mac/x86_64", "libplay_cpp_sdk.a"));
-            else if (Target.Architecture == UnrealArch.Arm64)
-                PublicAdditionalLibraries.Add(Path.Combine(
-                    LibrariesPath, "Mac/arm64", "libplay_cpp_sdk.a"));
-            else {
-                throw new System.Exception("Unsupported architecture");
-            }
+            PublicAdditionalLibraries.Add(
+                Path.Combine(LibrariesPath, "Mac/arm64", "libplay_cpp_sdk.a"));
         } else if (Target.Platform == UnrealTargetPlatform.Linux) {
             PublicAdditionalLibraries.Add(
                 Path.Combine(LibrariesPath, "Linux", "libplay_cpp_sdk.a"));

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,8 @@ typename Slice<T>::iterator::difference_type`
`325`	`325`	`Slice<T>::iterator::operator-(const iterator &other) const noexcept {`
`326`	`326`	`auto diff = std::distance(static_cast<char *>(other.pos),`
`327`	`327`	`static_cast<char *>(this->pos));`
`328`		`- return diff / this->stride;`
	`328`	`+ return diff / static_cast<typename Slice<T>::iterator::difference_type>(`
	`329`	`+ this->stride);`
`329`	`330`	`}`
`330`	`331`
`331`	`332`	`template <typename T>`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,8 @@ typename Slice<T>::iterator::difference_type`
`369`	`369`	`Slice<T>::iterator::operator-(const iterator &other) const noexcept {`
`370`	`370`	`auto diff = std::distance(static_cast<char *>(other.pos),`
`371`	`371`	`static_cast<char *>(this->pos));`
`372`		`- return diff / this->stride;`
	`372`	`+ return diff / static_cast<typename Slice<T>::iterator::difference_type>(`
	`373`	`+ this->stride);`
`373`	`374`	`}`
`374`	`375`
`375`	`376`	`template <typename T>`