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

[DX-3326] refactor: move sample app into passport package #303

Merged
merged 3 commits into from
Oct 15, 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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
with:
unityVersion: 2021.3.26f1
projectPath: './sample'
projectPath: './src/Packages/Passport/Samples~/sample'
githubToken: ${{ secrets.GITHUB_TOKEN }}
testMode: 'EditMode'
- uses: actions/upload-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ crashlytics-build.properties
._.DS_Store

sample-passport-unity-game/
sample/iosBuild
!/sample/webgl/Build/
src/Packages/Passport/Samples~/sample/iosBuild
!src/Packages/Passport/Samples~/sample/webgl/Build/

# Android
src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/**/*.meta
Expand Down

This file was deleted.

Binary file removed sample/mono_crash.mem.44209.1.blob
Binary file not shown.
6 changes: 0 additions & 6 deletions sample/omnisharp.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ public class SelectAuthMethodScript : MonoBehaviour

void Start()
{
// Determine if PKCE is supported based on the platform
SampleAppManager.SupportsPKCE = IsPKCESupported();

// WebGL does not support Device Code Auth, so we'll use PKCE by default instead.
#if UNITY_WEBGL
UsePKCE();
#else
// Determine if PKCE is supported based on the platform
SampleAppManager.SupportsPKCE = IsPKCESupported();

// If PKCE is not supported, initialise Passport to use Device Code Auth
if (!SampleAppManager.SupportsPKCE)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"dependencies": {
"com.alttester.sdk": "2.1.1",
"com.cysharp.unitask": "2.3.3",
"com.immutable.passport": "file:../../src/Packages/Passport",
"com.immutable.marketplace": "file:../../src/Packages/Marketplace",
"com.immutable.orderbook": "file:../../src/Packages/Orderbook",
"com.immutable.passport": "file:../../../",
"com.unity.ai.navigation": "1.1.4",
"com.unity.ide.visualstudio": "2.0.21",
"com.unity.ide.vscode": "1.2.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,8 @@
"dependencies": {},
"url": "https://package.openupm.com"
},
"com.immutable.marketplace": {
"version": "file:../../src/Packages/Marketplace",
"depth": 0,
"source": "local",
"dependencies": {
"com.cysharp.unitask": "2.3.3"
}
},
"com.immutable.orderbook": {
"version": "file:../../src/Packages/Orderbook",
"depth": 0,
"source": "local",
"dependencies": {
"com.cysharp.unitask": "2.3.3"
}
},
"com.immutable.passport": {
"version": "file:../../src/Packages/Passport",
"version": "file:../../../",
"depth": 0,
"source": "local",
"dependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ MonoBehaviour:
m_IsDefault: 0
m_Capabilities: 0
m_ConfigSource: 4
m_UserSelectedRegistryName: npmjs
m_UserSelectedRegistryName: Open UPM Packages
m_UserAddingNewScopedRegistry: 0
m_RegistryInfoDraft:
m_Modified: 0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"m_Name": "Settings",
"m_Path": "ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json",
"m_Dictionary": {
"m_DictionaryValues": []
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,9 @@ PlayerSettings:
- m_BuildTarget: WindowsStandaloneSupport
m_APIs: 02000000
m_Automatic: 1
- m_BuildTarget: WebGLSupport
m_APIs: 080000000b000000
m_Automatic: 1
m_BuildTargetVRSettings: []
m_DefaultShaderChunkSizeInMB: 16
m_DefaultShaderChunkCount: 0
Expand Down Expand Up @@ -762,7 +765,7 @@ PlayerSettings:
webGLTemplate: PROJECT:unity-webview
webGLAnalyzeBuildSize: 0
webGLUseEmbeddedResources: 0
webGLCompressionFormat: 0
webGLCompressionFormat: 2
webGLWasmArithmeticExceptions: 0
webGLLinkerTarget: 1
webGLThreadsSupport: 0
Expand Down
Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file not shown.
Loading