diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7ad4ca7b5..ca62ae563 100755 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,7 +28,7 @@ jobs: strategy: fail-fast: false matrix: - unityVersion: [2020.3.36f1, 2021.3.6f1] + unityVersion: [2020.3.42f1, 2021.3.14f1] targetPlatform: # - mac-mono # - windows-mono diff --git a/Algorand.Unity.AssetStore/Packages/packages-lock.json b/Algorand.Unity.AssetStore/Packages/packages-lock.json index 540665ea2..bb1cbc18e 100644 --- a/Algorand.Unity.AssetStore/Packages/packages-lock.json +++ b/Algorand.Unity.AssetStore/Packages/packages-lock.json @@ -35,7 +35,7 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.2.1", + "version": "1.2.6", "depth": 2, "source": "registry", "dependencies": {}, @@ -49,7 +49,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.33", + "version": "1.1.31", "depth": 1, "source": "registry", "dependencies": { diff --git a/Algorand.Unity.AssetStore/ProjectSettings/MemorySettings.asset b/Algorand.Unity.AssetStore/ProjectSettings/MemorySettings.asset new file mode 100644 index 000000000..cd6af44a4 --- /dev/null +++ b/Algorand.Unity.AssetStore/ProjectSettings/MemorySettings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e8379a461b10ae09f3f696911088c16875d63e87ed5f2d95df9e1892703f9fd +size 1192 diff --git a/Algorand.Unity.AssetStore/ProjectSettings/ProjectSettings.asset b/Algorand.Unity.AssetStore/ProjectSettings/ProjectSettings.asset index 22e61fa21..83a4b9981 100644 --- a/Algorand.Unity.AssetStore/ProjectSettings/ProjectSettings.asset +++ b/Algorand.Unity.AssetStore/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:204d493eeed3ea8f6e3d2faf13e41e9e51515f2091d77c6f5f3b03fee2879e26 -size 19706 +oid sha256:7bfc90f77e60833a39f8148c26d827ca3f723b483e4c6b90b08cea611bc869e3 +size 23639 diff --git a/Algorand.Unity.AssetStore/ProjectSettings/ProjectVersion.txt b/Algorand.Unity.AssetStore/ProjectSettings/ProjectVersion.txt index 05fd64960..6a95707ea 100644 --- a/Algorand.Unity.AssetStore/ProjectSettings/ProjectVersion.txt +++ b/Algorand.Unity.AssetStore/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.42f1 -m_EditorVersionWithRevision: 2020.3.42f1 (7ade1201f527) +m_EditorVersion: 2021.3.14f1 +m_EditorVersionWithRevision: 2021.3.14f1 (eee1884e7226) diff --git a/Algorand.Unity.AssetStore/ProjectSettings/boot.config b/Algorand.Unity.AssetStore/ProjectSettings/boot.config new file mode 100644 index 000000000..e69de29bb diff --git a/Algorand.Unity.Package/ProjectSettings/ProjectSettings.asset b/Algorand.Unity.Package/ProjectSettings/ProjectSettings.asset index 1e6fa7ea4..624f7db10 100644 --- a/Algorand.Unity.Package/ProjectSettings/ProjectSettings.asset +++ b/Algorand.Unity.Package/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5861896b45fbe3d051be5beb7608afc6672a8bd42930907455f1e35692120a1 +oid sha256:1d947654d02cd60a55d83be02891bbc408f9d2a6184f4c19d91676f1cee862e6 size 25483 diff --git a/README.md b/README.md index 0453a3d08..a7e80966d 100755 --- a/README.md +++ b/README.md @@ -51,10 +51,15 @@ and connect to any Algorand wallet supporting [WalletConnect](https://developer. This package supports the following build targets and Unity versions: -| Unity Version | Windows | Mac OS | Linux | Android | iOS | WebGL | -| :-----------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | -| 2020.3 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | -| 2021.3 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | +| Unity Version | Windows | Mac OS | Linux | Android | iOS | WebGL | +| :-----------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :------------------------: | +| 2020.3 | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :eight_pointed_black_star: | +| 2021.3 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :eight_pointed_black_star: | +| 2022.1 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :eight_pointed_black_star: | + +- :white_check_mark: All APIs are supported. +- :eight_pointed_black_star: `Algorand.*.*Api` clients are not supported. +- :x: Not supported. Use at your own risk. ## Common Usages diff --git a/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64_arm64.meta b/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/arm64.meta old mode 100755 new mode 100644 similarity index 77% rename from Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64_arm64.meta rename to Runtime/Algorand.Unity.Crypto/Plugins/MacOS/arm64.meta index 57b54e625..105a91c1f --- a/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64_arm64.meta +++ b/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/arm64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: af215f7d9abfe4a8e82a8ca7d65df136 +guid: b14df780f8ff74890991ea9337c3e49f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/arm64/sodium.dylib b/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/arm64/sodium.dylib new file mode 100755 index 000000000..9e6cca6e5 Binary files /dev/null and b/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/arm64/sodium.dylib differ diff --git a/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64_arm64/sodium.bundle.meta b/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/arm64/sodium.dylib.meta old mode 100755 new mode 100644 similarity index 93% rename from Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64_arm64/sodium.bundle.meta rename to Runtime/Algorand.Unity.Crypto/Plugins/MacOS/arm64/sodium.dylib.meta index 15f434535..58fde27a9 --- a/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64_arm64/sodium.bundle.meta +++ b/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/arm64/sodium.dylib.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 210e8964a6096434ba0f03fdd6388157 +guid: e8bde7694fdc946318905a5bfebc4b30 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -40,21 +40,21 @@ PluginImporter: second: enabled: 1 settings: - CPU: AnyCPU + CPU: ARM64 DefaultValueInitialized: true - OS: AnyOS + OS: OSX - first: Standalone: Linux64 second: enabled: 0 settings: - CPU: None + CPU: AnyCPU - first: Standalone: OSXUniversal second: enabled: 1 settings: - CPU: AnyCPU + CPU: ARM64 - first: Standalone: Win second: diff --git a/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64.meta b/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64.meta new file mode 100644 index 000000000..df2006a9c --- /dev/null +++ b/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae0074305216144689020a2182640c96 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64/sodium.dylib b/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64/sodium.dylib new file mode 100644 index 000000000..da03c8c56 Binary files /dev/null and b/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64/sodium.dylib differ diff --git a/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64/sodium.dylib.meta b/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64/sodium.dylib.meta new file mode 100644 index 000000000..dd11091d8 --- /dev/null +++ b/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64/sodium.dylib.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 42d14a160b59d422a9c6f6df6feff88b +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 0 + Exclude Linux64: 1 + Exclude OSXUniversal: 0 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: x86_64 + DefaultValueInitialized: true + OS: OSX + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: x86_64 + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: x86 + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64_arm64/sodium.bundle b/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64_arm64/sodium.bundle deleted file mode 100755 index fa23f44cd..000000000 Binary files a/Runtime/Algorand.Unity.Crypto/Plugins/MacOS/x86_64_arm64/sodium.bundle and /dev/null differ