diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a11eae..18a9caa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,15 +50,33 @@ jobs: echo "version=$VERSION" >> $GITHUB_OUTPUT echo "VERSION=$VERSION" >> $GITHUB_ENV + - name: Update package.json version + run: | + VERSION="${{ steps.validate-version.outputs.version }}" + # Update version in UPM package manifest so it matches the release tag + if [ -f Packages/gg.stash.unity/package.json ]; then + sed -i.bak "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" Packages/gg.stash.unity/package.json + rm -f Packages/gg.stash.unity/package.json.bak + cat Packages/gg.stash.unity/package.json | grep '"version"' + fi + - name: Configure Git run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" - - name: Create git tag + - name: Commit package version and create tag run: | - git tag -a "v${{ steps.validate-version.outputs.version }}" -m "Release v${{ steps.validate-version.outputs.version }}" - git push origin "v${{ steps.validate-version.outputs.version }}" + VERSION="${{ steps.validate-version.outputs.version }}" + if git diff --quiet Packages/gg.stash.unity/package.json 2>/dev/null; then + echo "No package.json change (version already $VERSION)" + else + git add Packages/gg.stash.unity/package.json + git commit -m "chore: set package version to $VERSION" + git push origin HEAD + fi + git tag -a "v$VERSION" -m "Release v$VERSION" + git push origin "v$VERSION" - name: Format release body id: format-body diff --git a/.gitignore b/.gitignore index ed69e0d..2ae7881 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -# This .gitignore file should be placed at the root of your Unity project directory -# -# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore -# +# This .gitignore ensures only source, config, and package assets are committed. +# Unity: https://github.com/github/gitignore/blob/main/Unity.gitignore + +# Unity generated / cache (never commit) /[Ll]ibrary/ /[Tt]emp/ /[Oo]bj/ @@ -9,32 +9,22 @@ /[Bb]uilds/ /[Ll]ogs/ /[Uu]ser[Ss]ettings/ - -# MemoryCaptures can get excessive in size. -# They also could contain extremely sensitive data /[Mm]emoryCaptures/ - -# Recordings can get excessive in size /[Rr]ecordings/ -# Uncomment this line if you wish to ignore the asset store tools plugin -# /[Aa]ssets/AssetStoreTools* - # Autogenerated Jetbrains Rider plugin /[Aa]ssets/Plugins/Editor/JetBrains* -# Visual Studio cache directory +# IDEs and editors (local only) .vscode/ +.idea/ +.consulo/ -# Gradle cache directory +# Gradle .gradle/ -# Idea IDE -.idea/ - -# Autogenerated VS/MD/Consulo solution and project files +# Autogenerated solution/project files (Unity regenerates these) ExportedObj/ -.consulo/ *.csproj *.unityproj *.sln @@ -50,30 +40,39 @@ ExportedObj/ *.opendb *.VC.db -# Unity3D generated meta files +# Unity generated meta for build artifacts *.pidb.meta *.pdb.meta *.mdb.meta -# Unity3D generated file on crash reports +# Crash reports sysinfo.txt -# Builds +# Build outputs (do not commit) *.apk *.aab *.unitypackage *.app +# OS junk *.DS_Store .DS_Store +Thumbs.db +ehthumbs.db -# Crashlytics generated file +# Crashlytics crashlytics-build.properties -# Packed Addressables +# Addressables /[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin* -# Temporary auto-generated Android Assets +# StreamingAssets auto-generated /[Aa]ssets/[Ss]treamingAssets/aa.meta /[Aa]ssets/[Ss]treamingAssets/aa/* /ios_build + +# Backup and temp files (keep repo clean) +*.bak +*.orig +*.swp +*~ diff --git a/Assets/Resources.meta b/Assets/Resources.meta deleted file mode 100644 index d0a0437..0000000 --- a/Assets/Resources.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a863d922d95a84a1586f80b3ca7d3e59 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/BillingMode.json b/Assets/Resources/BillingMode.json deleted file mode 100644 index 6f4bfb7..0000000 --- a/Assets/Resources/BillingMode.json +++ /dev/null @@ -1 +0,0 @@ -{"androidStore":"GooglePlay"} \ No newline at end of file diff --git a/Assets/Resources/BillingMode.json.meta b/Assets/Resources/BillingMode.json.meta deleted file mode 100644 index 2fa8f29..0000000 --- a/Assets/Resources/BillingMode.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a10dd91a4b3214c7899903e35374ffdb -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Stash.Native.meta b/Assets/Stash.Native.meta deleted file mode 100644 index 78b0aa4..0000000 --- a/Assets/Stash.Native.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 09368ed22b0f1427b9633e3e715d953f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin.meta b/Assets/Stash.Native/Editor/StashEditorPlugin.meta deleted file mode 100644 index 81f06b6..0000000 --- a/Assets/Stash.Native/Editor/StashEditorPlugin.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 290b78efab7ed447fb5caf2d70f2eb06 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebView2SDK.meta b/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebView2SDK.meta deleted file mode 100644 index 11810e2..0000000 --- a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebView2SDK.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5ee4a7846da3a8e47952f32249082a63 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.cpp.meta b/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.cpp.meta deleted file mode 100644 index 01f8df9..0000000 --- a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.cpp.meta +++ /dev/null @@ -1,27 +0,0 @@ -fileFormatVersion: 2 -guid: 6bab577689d7fdb41b32c08a688f65f5 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.dll.meta b/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.dll.meta deleted file mode 100644 index 5c71fde..0000000 --- a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.dll.meta +++ /dev/null @@ -1,27 +0,0 @@ -fileFormatVersion: 2 -guid: 8e093f4f047405347bd87eadea2dddd2 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.h.meta b/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.h.meta deleted file mode 100644 index e1c0ee2..0000000 --- a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.h.meta +++ /dev/null @@ -1,27 +0,0 @@ -fileFormatVersion: 2 -guid: 5d24103fd6c67884e8f06d41ce35c288 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.bundle.meta b/Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.bundle.meta deleted file mode 100644 index c786bd6..0000000 --- a/Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.bundle.meta +++ /dev/null @@ -1,27 +0,0 @@ -fileFormatVersion: 2 -guid: bc5b232b532634b4289f10a88369a3db -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.mm.meta b/Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.mm.meta deleted file mode 100644 index d0ea515..0000000 --- a/Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.mm.meta +++ /dev/null @@ -1,27 +0,0 @@ -fileFormatVersion: 2 -guid: 1183d2074acb14017b472c9326507ccd -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Stash.Native/Sample/Scripts.meta b/Assets/Stash.Native/Sample/Scripts.meta deleted file mode 100644 index 6bb946c..0000000 --- a/Assets/Stash.Native/Sample/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8b2aef48d508f4d0b8f08bdd076ab12e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Stash.Native/Scripts.meta b/Assets/Stash.Native/Scripts.meta deleted file mode 100644 index 746494b..0000000 --- a/Assets/Stash.Native/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f23b561124c9948c0b2707b9bb0bc994 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/gg.stash.unity/CHANGELOG.md b/Packages/gg.stash.unity/CHANGELOG.md new file mode 100644 index 0000000..a8f26fe --- /dev/null +++ b/Packages/gg.stash.unity/CHANGELOG.md @@ -0,0 +1,18 @@ +# Changelog + +All notable changes to this package will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). + +## [2.0.0] - 2025-03-16 + +### Changed + +- **UPM (Unity Package Manager) support**: Package restructured for full UPM compatibility. Content moved from `Assets/Stash.Native/` to `Packages/gg.stash.unity/` with standard layout: `Runtime/`, `Editor/`, `Plugins/`, `Samples~/`. +- Added assembly definitions (`Stash.Unity`, `Stash.Unity.Editor`) for compilation isolation. +- Samples are now importable via Package Manager (Window > Package Manager > Stash for Unity > Samples). + +### Installation + +- **Git URL**: Add package from git URL: `https://github.com/stashgg/stash-unity.git?path=Packages/gg.stash.unity` +- **manifest.json**: Add `"gg.stash.unity": "https://github.com/stashgg/stash-unity.git?path=Packages/gg.stash.unity"` to dependencies. diff --git a/Packages/gg.stash.unity/CHANGELOG.md.meta b/Packages/gg.stash.unity/CHANGELOG.md.meta new file mode 100644 index 0000000..5b397ff --- /dev/null +++ b/Packages/gg.stash.unity/CHANGELOG.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ec766d8740ce945468ac9b2b6d0bfcf3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Stash.Native/Editor.meta b/Packages/gg.stash.unity/Editor.meta similarity index 77% rename from Assets/Stash.Native/Editor.meta rename to Packages/gg.stash.unity/Editor.meta index 7c34bb9..5d8196a 100644 --- a/Assets/Stash.Native/Editor.meta +++ b/Packages/gg.stash.unity/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7c44f463e63c5423ba00b0204919f85e +guid: f8e27d919a13341eda8b3deaed065d95 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/gg.stash.unity/Editor/Editor.meta b/Packages/gg.stash.unity/Editor/Editor.meta new file mode 100644 index 0000000..3c27bd7 --- /dev/null +++ b/Packages/gg.stash.unity/Editor/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 162c4dd57e6c428b874b49b05d30bb1e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/gg.stash.unity/Editor/Stash.Unity.Editor.asmdef b/Packages/gg.stash.unity/Editor/Stash.Unity.Editor.asmdef new file mode 100644 index 0000000..f08ebee --- /dev/null +++ b/Packages/gg.stash.unity/Editor/Stash.Unity.Editor.asmdef @@ -0,0 +1,18 @@ +{ + "name": "Stash.Unity.Editor", + "rootNamespace": "Stash.Editor", + "references": [ + "Stash.Unity" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} diff --git a/Packages/gg.stash.unity/Editor/Stash.Unity.Editor.asmdef.meta b/Packages/gg.stash.unity/Editor/Stash.Unity.Editor.asmdef.meta new file mode 100644 index 0000000..55b6168 --- /dev/null +++ b/Packages/gg.stash.unity/Editor/Stash.Unity.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 01128a6000bc4d059a885b6d51ae81e3 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/StashEditorPluginWindow.cs b/Packages/gg.stash.unity/Editor/StashEditorPluginWindow.cs similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/StashEditorPluginWindow.cs rename to Packages/gg.stash.unity/Editor/StashEditorPluginWindow.cs diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/StashEditorPluginWindow.cs.meta b/Packages/gg.stash.unity/Editor/StashEditorPluginWindow.cs.meta similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/StashEditorPluginWindow.cs.meta rename to Packages/gg.stash.unity/Editor/StashEditorPluginWindow.cs.meta diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows.meta b/Packages/gg.stash.unity/Editor/Windows.meta similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/Windows.meta rename to Packages/gg.stash.unity/Editor/Windows.meta diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/.gitignore b/Packages/gg.stash.unity/Editor/Windows/.gitignore similarity index 86% rename from Assets/Stash.Native/Editor/StashEditorPlugin/Windows/.gitignore rename to Packages/gg.stash.unity/Editor/Windows/.gitignore index 98cf1f0..81d83c3 100644 --- a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/.gitignore +++ b/Packages/gg.stash.unity/Editor/Windows/.gitignore @@ -9,4 +9,5 @@ build.rsp *.rsp # Webview SDK folder -WebView2SDK \ No newline at end of file +WebView2SDK +WebView2SDK.meta \ No newline at end of file diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/CMakeLists.txt b/Packages/gg.stash.unity/Editor/Windows/CMakeLists.txt similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/Windows/CMakeLists.txt rename to Packages/gg.stash.unity/Editor/Windows/CMakeLists.txt diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/CMakeLists.txt.meta b/Packages/gg.stash.unity/Editor/Windows/CMakeLists.txt.meta similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/Windows/CMakeLists.txt.meta rename to Packages/gg.stash.unity/Editor/Windows/CMakeLists.txt.meta diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.cpp b/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.cpp similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.cpp rename to Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.cpp diff --git a/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.cpp.meta b/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.cpp.meta new file mode 100644 index 0000000..364fb2f --- /dev/null +++ b/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.cpp.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: 6bab577689d7fdb41b32c08a688f65f5 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 0 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + AndroidSharedLibraryType: Executable + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: Windows + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - 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/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.cs b/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.cs similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.cs rename to Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.cs diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.cs.meta b/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.cs.meta similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.cs.meta rename to Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.cs.meta diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.dll b/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.dll similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.dll rename to Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.dll diff --git a/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.dll.meta b/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.dll.meta new file mode 100644 index 0000000..5f3a66f --- /dev/null +++ b/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.dll.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: 8e093f4f047405347bd87eadea2dddd2 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 0 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + AndroidSharedLibraryType: Executable + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: Windows + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - 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/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.h b/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.h similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/Windows/WebViewLauncher.h rename to Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.h diff --git a/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.h.meta b/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.h.meta new file mode 100644 index 0000000..1841fe3 --- /dev/null +++ b/Packages/gg.stash.unity/Editor/Windows/WebViewLauncher.h.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: 5d24103fd6c67884e8f06d41ce35c288 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 0 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + AndroidSharedLibraryType: Executable + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: Windows + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - 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/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/build_dll.ps1 b/Packages/gg.stash.unity/Editor/Windows/build_dll.ps1 similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/Windows/build_dll.ps1 rename to Packages/gg.stash.unity/Editor/Windows/build_dll.ps1 diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/build_dll.ps1.meta b/Packages/gg.stash.unity/Editor/Windows/build_dll.ps1.meta similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/Windows/build_dll.ps1.meta rename to Packages/gg.stash.unity/Editor/Windows/build_dll.ps1.meta diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/download_webview2_sdk.ps1 b/Packages/gg.stash.unity/Editor/Windows/download_webview2_sdk.ps1 similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/Windows/download_webview2_sdk.ps1 rename to Packages/gg.stash.unity/Editor/Windows/download_webview2_sdk.ps1 diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/Windows/download_webview2_sdk.ps1.meta b/Packages/gg.stash.unity/Editor/Windows/download_webview2_sdk.ps1.meta similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/Windows/download_webview2_sdk.ps1.meta rename to Packages/gg.stash.unity/Editor/Windows/download_webview2_sdk.ps1.meta diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/macOS.meta b/Packages/gg.stash.unity/Editor/macOS.meta similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/macOS.meta rename to Packages/gg.stash.unity/Editor/macOS.meta diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.bundle b/Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.bundle similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.bundle rename to Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.bundle diff --git a/Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.bundle.meta b/Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.bundle.meta new file mode 100644 index 0000000..155103f --- /dev/null +++ b/Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.bundle.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: bc5b232b532634b4289f10a88369a3db +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 0 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + AndroidSharedLibraryType: Executable + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: OSX + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - 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/Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.cs b/Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.cs similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.cs rename to Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.cs diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.cs.meta b/Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.cs.meta similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.cs.meta rename to Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.cs.meta diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.mm b/Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.mm similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/macOS/WebViewLauncher.mm rename to Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.mm diff --git a/Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.mm.meta b/Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.mm.meta new file mode 100644 index 0000000..8e4fa7b --- /dev/null +++ b/Packages/gg.stash.unity/Editor/macOS/WebViewLauncher.mm.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: 1183d2074acb14017b472c9326507ccd +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 0 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + AndroidSharedLibraryType: Executable + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: OSX + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - 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/Assets/Stash.Native/Editor/StashEditorPlugin/macOS/build_webview.sh b/Packages/gg.stash.unity/Editor/macOS/build_webview.sh similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/macOS/build_webview.sh rename to Packages/gg.stash.unity/Editor/macOS/build_webview.sh diff --git a/Assets/Stash.Native/Editor/StashEditorPlugin/macOS/build_webview.sh.meta b/Packages/gg.stash.unity/Editor/macOS/build_webview.sh.meta similarity index 100% rename from Assets/Stash.Native/Editor/StashEditorPlugin/macOS/build_webview.sh.meta rename to Packages/gg.stash.unity/Editor/macOS/build_webview.sh.meta diff --git a/Packages/gg.stash.unity/LICENSE.md b/Packages/gg.stash.unity/LICENSE.md new file mode 100644 index 0000000..1514908 --- /dev/null +++ b/Packages/gg.stash.unity/LICENSE.md @@ -0,0 +1,7 @@ +# Proprietary License + +Copyright (c) Fractal Wagmi Inc. / Stash. All rights reserved. + +This software and associated documentation files (the "Software") are the proprietary property of Fractal Wagmi Inc. You may not use, copy, modify, merge, publish, distribute, sublicense, or sell copies of the Software without explicit written permission from Fractal Wagmi Inc. + +For licensing inquiries, contact: developers@stash.gg diff --git a/Packages/gg.stash.unity/LICENSE.md.meta b/Packages/gg.stash.unity/LICENSE.md.meta new file mode 100644 index 0000000..152039d --- /dev/null +++ b/Packages/gg.stash.unity/LICENSE.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a1b2c3d4e5f6789012345678abcdef02 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Stash.Native/Plugins.meta b/Packages/gg.stash.unity/Plugins.meta similarity index 67% rename from Assets/Stash.Native/Plugins.meta rename to Packages/gg.stash.unity/Plugins.meta index 8398433..e917b0f 100644 --- a/Assets/Stash.Native/Plugins.meta +++ b/Packages/gg.stash.unity/Plugins.meta @@ -3,6 +3,6 @@ guid: 204ee1a0dd0914ad9b43e29e2f37adba folderAsset: yes DefaultImporter: externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Stash.Native/Plugins/Android.meta b/Packages/gg.stash.unity/Plugins/Android.meta similarity index 100% rename from Assets/Stash.Native/Plugins/Android.meta rename to Packages/gg.stash.unity/Plugins/Android.meta diff --git a/Assets/Stash.Native/Plugins/Android/StashNative-2.0.0.aar b/Packages/gg.stash.unity/Plugins/Android/StashNative-2.0.0.aar similarity index 100% rename from Assets/Stash.Native/Plugins/Android/StashNative-2.0.0.aar rename to Packages/gg.stash.unity/Plugins/Android/StashNative-2.0.0.aar diff --git a/Assets/Stash.Native/Plugins/Android/StashNative-2.0.0.aar.meta b/Packages/gg.stash.unity/Plugins/Android/StashNative-2.0.0.aar.meta similarity index 100% rename from Assets/Stash.Native/Plugins/Android/StashNative-2.0.0.aar.meta rename to Packages/gg.stash.unity/Plugins/Android/StashNative-2.0.0.aar.meta diff --git a/Assets/Stash.Native/Plugins/Android/StashNativeCardUnityBridge.java b/Packages/gg.stash.unity/Plugins/Android/StashNativeCardUnityBridge.java similarity index 100% rename from Assets/Stash.Native/Plugins/Android/StashNativeCardUnityBridge.java rename to Packages/gg.stash.unity/Plugins/Android/StashNativeCardUnityBridge.java diff --git a/Assets/Stash.Native/Plugins/Android/StashNativeCardUnityBridge.java.meta b/Packages/gg.stash.unity/Plugins/Android/StashNativeCardUnityBridge.java.meta similarity index 93% rename from Assets/Stash.Native/Plugins/Android/StashNativeCardUnityBridge.java.meta rename to Packages/gg.stash.unity/Plugins/Android/StashNativeCardUnityBridge.java.meta index bf414e2..8ddf9b4 100644 --- a/Assets/Stash.Native/Plugins/Android/StashNativeCardUnityBridge.java.meta +++ b/Packages/gg.stash.unity/Plugins/Android/StashNativeCardUnityBridge.java.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a1b2c3d4e5f6789012345678abcdef01 +guid: 84f3dfb780e3d4fc1a95893c06466bac PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Stash.Native/Plugins/iOS.meta b/Packages/gg.stash.unity/Plugins/iOS.meta similarity index 100% rename from Assets/Stash.Native/Plugins/iOS.meta rename to Packages/gg.stash.unity/Plugins/iOS.meta diff --git a/Assets/Stash.Native/Plugins/iOS/StashNative.xcframework.meta b/Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework.meta similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNative.xcframework.meta rename to Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework.meta diff --git a/Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/Info.plist b/Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/Info.plist similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/Info.plist rename to Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/Info.plist diff --git a/Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Headers/StashNative.h b/Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Headers/StashNative.h similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Headers/StashNative.h rename to Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Headers/StashNative.h diff --git a/Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Headers/StashNativeCard.h b/Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Headers/StashNativeCard.h similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Headers/StashNativeCard.h rename to Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Headers/StashNativeCard.h diff --git a/Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Info.plist b/Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Info.plist similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Info.plist rename to Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Info.plist diff --git a/Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Modules/module.modulemap b/Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Modules/module.modulemap similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Modules/module.modulemap rename to Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/Modules/module.modulemap diff --git a/Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/StashNative b/Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/StashNative similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/StashNative rename to Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64/StashNative.framework/StashNative diff --git a/Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Headers/StashNative.h b/Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Headers/StashNative.h similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Headers/StashNative.h rename to Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Headers/StashNative.h diff --git a/Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Headers/StashNativeCard.h b/Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Headers/StashNativeCard.h similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Headers/StashNativeCard.h rename to Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Headers/StashNativeCard.h diff --git a/Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Info.plist b/Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Info.plist similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Info.plist rename to Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Info.plist diff --git a/Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Modules/module.modulemap b/Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Modules/module.modulemap similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Modules/module.modulemap rename to Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/Modules/module.modulemap diff --git a/Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/StashNative b/Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/StashNative similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/StashNative rename to Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/StashNative diff --git a/Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/_CodeSignature/CodeResources b/Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/_CodeSignature/CodeResources similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/_CodeSignature/CodeResources rename to Packages/gg.stash.unity/Plugins/iOS/StashNative.xcframework/ios-arm64_x86_64-simulator/StashNative.framework/_CodeSignature/CodeResources diff --git a/Assets/Stash.Native/Plugins/iOS/StashNativeCardBridge.mm b/Packages/gg.stash.unity/Plugins/iOS/StashNativeCardBridge.mm similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNativeCardBridge.mm rename to Packages/gg.stash.unity/Plugins/iOS/StashNativeCardBridge.mm diff --git a/Assets/Stash.Native/Plugins/iOS/StashNativeCardBridge.mm.meta b/Packages/gg.stash.unity/Plugins/iOS/StashNativeCardBridge.mm.meta similarity index 100% rename from Assets/Stash.Native/Plugins/iOS/StashNativeCardBridge.mm.meta rename to Packages/gg.stash.unity/Plugins/iOS/StashNativeCardBridge.mm.meta diff --git a/Assets/Plugins.meta b/Packages/gg.stash.unity/Runtime.meta similarity index 77% rename from Assets/Plugins.meta rename to Packages/gg.stash.unity/Runtime.meta index 5716023..fe1bc85 100644 --- a/Assets/Plugins.meta +++ b/Packages/gg.stash.unity/Runtime.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7e02439881f7d4e20a6d8b66d6bdf49f +guid: cd79f182f53724953a7f2e86e52643f4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/gg.stash.unity/Runtime/Runtime.meta b/Packages/gg.stash.unity/Runtime/Runtime.meta new file mode 100644 index 0000000..8831eca --- /dev/null +++ b/Packages/gg.stash.unity/Runtime/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7fadc7aa36954ac3a32c64d912adf680 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/gg.stash.unity/Runtime/Stash.Unity.asmdef b/Packages/gg.stash.unity/Runtime/Stash.Unity.asmdef new file mode 100644 index 0000000..290ba13 --- /dev/null +++ b/Packages/gg.stash.unity/Runtime/Stash.Unity.asmdef @@ -0,0 +1,14 @@ +{ + "name": "Stash.Unity", + "rootNamespace": "Stash.Native", + "references": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} diff --git a/Packages/gg.stash.unity/Runtime/Stash.Unity.asmdef.meta b/Packages/gg.stash.unity/Runtime/Stash.Unity.asmdef.meta new file mode 100644 index 0000000..ec8fcb7 --- /dev/null +++ b/Packages/gg.stash.unity/Runtime/Stash.Unity.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 53631d7055304545b12c6bc71d078002 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Stash.Native/Scripts/StashNative.cs b/Packages/gg.stash.unity/Runtime/StashNative.cs similarity index 99% rename from Assets/Stash.Native/Scripts/StashNative.cs rename to Packages/gg.stash.unity/Runtime/StashNative.cs index e5c5235..00bc7d8 100644 --- a/Assets/Stash.Native/Scripts/StashNative.cs +++ b/Packages/gg.stash.unity/Runtime/StashNative.cs @@ -431,7 +431,7 @@ private void OpenEditorTestWindow(string url, bool isModal) { try { - var editorWindowType = Type.GetType("Stash.Editor.StashEditorPluginWindow, Assembly-CSharp-Editor") ?? Type.GetType("Stash.Editor.StashEditorPluginWindow"); + var editorWindowType = Type.GetType("Stash.Editor.StashEditorPluginWindow, Stash.Unity.Editor") ?? Type.GetType("Stash.Editor.StashEditorPluginWindow"); if (editorWindowType == null) return; if (isModal) { diff --git a/Assets/Stash.Native/Scripts/StashNative.cs.meta b/Packages/gg.stash.unity/Runtime/StashNative.cs.meta similarity index 76% rename from Assets/Stash.Native/Scripts/StashNative.cs.meta rename to Packages/gg.stash.unity/Runtime/StashNative.cs.meta index a04deb1..b68002a 100644 --- a/Assets/Stash.Native/Scripts/StashNative.cs.meta +++ b/Packages/gg.stash.unity/Runtime/StashNative.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/gg.stash.unity/Samples~.meta b/Packages/gg.stash.unity/Samples~.meta new file mode 100644 index 0000000..d3b6cb4 --- /dev/null +++ b/Packages/gg.stash.unity/Samples~.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e78eed17b2f6426da60226029a70d541 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Stash.Native/Sample.meta b/Packages/gg.stash.unity/Samples~/StashSample.meta similarity index 67% rename from Assets/Stash.Native/Sample.meta rename to Packages/gg.stash.unity/Samples~/StashSample.meta index dce404c..d183089 100644 --- a/Assets/Stash.Native/Sample.meta +++ b/Packages/gg.stash.unity/Samples~/StashSample.meta @@ -3,6 +3,6 @@ guid: 566d38df253db4363aa006cf66398109 folderAsset: yes DefaultImporter: externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Stash.Native/Sample/Resources.meta b/Packages/gg.stash.unity/Samples~/StashSample/Resources.meta similarity index 67% rename from Assets/Stash.Native/Sample/Resources.meta rename to Packages/gg.stash.unity/Samples~/StashSample/Resources.meta index dfa2606..dacbc3d 100644 --- a/Assets/Stash.Native/Sample/Resources.meta +++ b/Packages/gg.stash.unity/Samples~/StashSample/Resources.meta @@ -3,6 +3,6 @@ guid: 1158fd32c10654ffab1f59cd812fbb46 folderAsset: yes DefaultImporter: externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Stash.Native/Sample/Resources/AppIcon.png b/Packages/gg.stash.unity/Samples~/StashSample/Resources/AppIcon.png similarity index 100% rename from Assets/Stash.Native/Sample/Resources/AppIcon.png rename to Packages/gg.stash.unity/Samples~/StashSample/Resources/AppIcon.png diff --git a/Assets/Stash.Native/Sample/Resources/AppIcon.png.meta b/Packages/gg.stash.unity/Samples~/StashSample/Resources/AppIcon.png.meta similarity index 100% rename from Assets/Stash.Native/Sample/Resources/AppIcon.png.meta rename to Packages/gg.stash.unity/Samples~/StashSample/Resources/AppIcon.png.meta diff --git a/Assets/Stash.Native/Sample/Scripts/StashLinkGenerator.cs b/Packages/gg.stash.unity/Samples~/StashSample/StashLinkGenerator.cs similarity index 100% rename from Assets/Stash.Native/Sample/Scripts/StashLinkGenerator.cs rename to Packages/gg.stash.unity/Samples~/StashSample/StashLinkGenerator.cs diff --git a/Assets/Stash.Native/Sample/Scripts/StashLinkGenerator.cs.meta b/Packages/gg.stash.unity/Samples~/StashSample/StashLinkGenerator.cs.meta similarity index 100% rename from Assets/Stash.Native/Sample/Scripts/StashLinkGenerator.cs.meta rename to Packages/gg.stash.unity/Samples~/StashSample/StashLinkGenerator.cs.meta diff --git a/Assets/Stash.Native/Sample/Scripts/StashSample.cs b/Packages/gg.stash.unity/Samples~/StashSample/StashSample.cs similarity index 100% rename from Assets/Stash.Native/Sample/Scripts/StashSample.cs rename to Packages/gg.stash.unity/Samples~/StashSample/StashSample.cs diff --git a/Assets/Stash.Native/Sample/Scripts/StashSample.cs.meta b/Packages/gg.stash.unity/Samples~/StashSample/StashSample.cs.meta similarity index 100% rename from Assets/Stash.Native/Sample/Scripts/StashSample.cs.meta rename to Packages/gg.stash.unity/Samples~/StashSample/StashSample.cs.meta diff --git a/Assets/Stash.Native/Sample/StashSample.unity b/Packages/gg.stash.unity/Samples~/StashSample/StashSample.unity similarity index 100% rename from Assets/Stash.Native/Sample/StashSample.unity rename to Packages/gg.stash.unity/Samples~/StashSample/StashSample.unity diff --git a/Assets/Stash.Native/Sample/StashSample.unity.meta b/Packages/gg.stash.unity/Samples~/StashSample/StashSample.unity.meta similarity index 100% rename from Assets/Stash.Native/Sample/StashSample.unity.meta rename to Packages/gg.stash.unity/Samples~/StashSample/StashSample.unity.meta diff --git a/Packages/gg.stash.unity/package.json b/Packages/gg.stash.unity/package.json new file mode 100644 index 0000000..48249ff --- /dev/null +++ b/Packages/gg.stash.unity/package.json @@ -0,0 +1,33 @@ +{ + "name": "gg.stash.unity", + "displayName": "Stash for Unity", + "version": "2.0.0", + "unity": "2021.3", + "unityRelease": "0f1", + "description": "Native-feeling Stash Pay IAP checkout and webshop presentation directly inside your Unity game (Android/iOS).", + "keywords": [ + "stash", + "iap", + "d2c", + "checkout", + "webshop", + "payments" + ], + "author": { + "name": "Stash", + "url": "https://stash.gg" + }, + "repository": { + "type": "git", + "url": "https://github.com/stashgg/stash-unity.git" + }, + "documentationUrl": "https://docs.stash.gg", + "license": "SEE LICENSE IN LICENSE.md", + "samples": [ + { + "displayName": "Stash Integration Sample", + "description": "Reference implementation: OpenCard, OpenModal, OpenBrowser with callback handling.", + "path": "Samples~/StashSample" + } + ] +} diff --git a/Packages/gg.stash.unity/package.json.meta b/Packages/gg.stash.unity/package.json.meta new file mode 100644 index 0000000..6a00d30 --- /dev/null +++ b/Packages/gg.stash.unity/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bdf7df5c6d9784197b69824ebadd4a06 +PackageManifestImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 7a76493..9261068 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -20,6 +20,7 @@ "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.9.4", "com.unity.xr.legacyinputhelpers": "2.1.12", + "gg.stash.unity": "file:gg.stash.unity", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f22f11e..d1628aa 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -258,6 +258,12 @@ }, "url": "https://packages.unity.com" }, + "gg.stash.unity": { + "version": "file:gg.stash.unity", + "depth": 0, + "source": "embedded", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, diff --git a/README.md b/README.md index fa1cbee..1b78028 100644 --- a/README.md +++ b/README.md @@ -8,47 +8,59 @@ Unity package wrapper for [stash-native](https://github.com/stashgg/stash-native ## Requirements -- Unity 2019.4+ (LTS recommended) +- Unity 2021.3+ (LTS recommended) - iOS 12.0+ / Android API 21+ -## Sample Scene +## Installation (UPM) -Try the sample scene in the **./Sample** folder, or try our demo in the Appetize online simulator. -When using the sample scene, input your own test API key in `StashLinkGenerator.cs`. +This package is distributed via the Unity Package Manager (UPM). -- **iOS:** [Open in Appetize.io](https://appetize.io/app/b_eyszozcrmyt2zifoh5bjyiifha) -- **Android:** [Open in Appetize.io](https://appetize.io/app/b_e7zfxgltohxm2rd5aw4zplzmwq?device=pixel7&osVersion=13.0&toolbar=true) +### Add from Git URL (recommended) -## Downloads +1. Open **Window > Package Manager** +2. Click **+** → **Add package from git URL** +3. Enter: `https://github.com/stashgg/stash-unity.git?path=Packages/gg.stash.unity` -### Import package manually +### Add via manifest.json + +Add to your project's `Packages/manifest.json` under `dependencies`: + +```json +"gg.stash.unity": "https://github.com/stashgg/stash-unity.git?path=Packages/gg.stash.unity" +``` -1. Download the [latest release](https://github.com/stashgg/stash-unity/releases) or repository as a zip file. -2. Import the `.unitypackage` file into your Unity project -3. Select the components you need (Stash.Popup for Stash Pay) +### Import sample (optional) -### Import via Git URL +After adding the package, you can import the sample scene and scripts: 1. Open **Window > Package Manager** -2. Click **+** → **Add package from git URL** -3. Enter: `https://github.com/stashgg/stash-unity.git?path=Assets` +2. Select **Stash for Unity** in the list +3. Expand **Samples** and click **Import** next to **Stash Integration Sample** +4. Input your test API key in `StashLinkGenerator.cs` (in the imported sample) -# Quick Start +### Manual / .unitypackage -## Folder Structure +1. Download the [latest release](https://github.com/stashgg/stash-unity/releases) +2. Import the `.unitypackage` file into your Unity project and select the components you need -#### ./Plugins -- **`Plugins/Android/`** - Contains the StashNative AAR and Unity bridge for Android. -- **`Plugins/iOS/`** - Contains the Unity bridge and native framework for iOS. +## Sample / Demo + +- **iOS:** [Open in Appetize.io](https://appetize.io/app/b_eyszozcrmyt2zifoh5bjyiifha) +- **Android:** [Open in Appetize.io](https://appetize.io/app/b_e7zfxgltohxm2rd5aw4zplzmwq?device=pixel7&osVersion=13.0&toolbar=true) + +# Quick Start -#### ./Scripts -- **`StashNative.cs`** - Singleton API that wraps and provides calls to the native iOS and Android libraries: use `OpenCard`, `OpenModal`, `OpenBrowser`, `CloseBrowser`, and listen to events for integration. +## Package structure -#### ./Editor -- **`StashEditorPlugin/`** - **(Optional)** Editor window for testing Stash card and modal flows directly in the Unity Editor (Windows and macOS). Lets you simulate UI, trigger events, and test callback handling within the editor without building. The editor plugin is under active development and may not be fully stable. +When installed via UPM, the package lives under `Packages/gg.stash.unity/` with this layout: -#### ./Sample -- **`StashSample.cs`** / **`StashSample.unity`** - **(Optional)** Reference implementation and demo scene: Open Card, Open Modal, Open Browser, and callback status. +| Path | Description | +|------|-------------| +| **Runtime/** | **`StashNative.cs`** – Singleton API: `OpenCard`, `OpenModal`, `OpenBrowser`, `CloseBrowser`, and events. | +| **Editor/** | **(Optional)** Editor window for testing card/modal flows in the Unity Editor (Windows and macOS). | +| **Plugins/Android/** | StashNative AAR and Unity bridge for Android. | +| **Plugins/iOS/** | Unity bridge and StashNative.xcframework for iOS. | +| **Samples~/StashSample/** | Optional sample scene and scripts; import via Package Manager (see Installation). | ## Usage @@ -240,7 +252,7 @@ Or fix it in Xcode project: 3. Open the **General** tab and scroll to **Frameworks, Libraries, and Embedded Content**. 4. If **StashNative.framework** is missing, click **+** and add it from the project (it should appear under Frameworks or Plugins/iOS). If it is already listed, set it to **Embed & Sign**. -Ensure `StashNative.xcframework` is present in `Assets/Stash.Popup/Plugins/iOS/` before building from Unity so the post-process can add it to the main target’s embed phase. +Ensure `StashNative.xcframework` is present in `Packages/gg.stash.unity/Plugins/iOS/` before building from Unity so the post-process can add it to the main target’s embed phase. ### [Android] Bridge does not compile