From 61b693ef036b2bf7df7c56b519e3360c324fda10 Mon Sep 17 00:00:00 2001 From: chaitanyapotti Date: Mon, 17 Jul 2023 23:42:27 +0800 Subject: [PATCH 1/2] Update android deps fix android build and use custom tabs Bug fixes reg. network etc --- Assets/Plugins/Android.meta | 8 ++ Assets/Plugins/Android/AndroidManifest.xml | 19 ++++ .../Plugins/Android/AndroidManifest.xml.meta | 7 ++ ...oidx.annotation.annotation-1.6.0.jar.meta} | 4 +- ...oidx.arch.core.core-common-2.2.0.jar.meta} | 4 +- ...> androidx.browser.browser-1.5.0.aar.meta} | 4 +- ...oidx.collection.collection-1.2.0.jar.meta} | 4 +- ...ncurrent.concurrent-futures-1.0.0.jar.meta | 34 ------- ...ncurrent.concurrent-futures-1.1.0.jar.meta | 32 +++++++ .../Android/androidx.core.core-1.1.0.aar.meta | 34 ------- .../Android/androidx.core.core-1.8.0.aar.meta | 32 +++++++ ....lifecycle.lifecycle-common-2.0.0.jar.meta | 34 ------- ....lifecycle.lifecycle-common-2.6.0.jar.meta | 32 +++++++ ...lifecycle.lifecycle-runtime-2.0.0.aar.meta | 34 ------- ...lifecycle.lifecycle-runtime-2.6.0.aar.meta | 32 +++++++ ...celable.versionedparcelable-1.1.0.aar.meta | 34 ------- ...celable.versionedparcelable-1.1.1.aar.meta | 32 +++++++ .../Editor/AndroidBuildPostProcess.cs | 4 +- .../Web3AuthSDK/Samples/Web3AuthSample.cs | 4 +- .../Web3AuthSDK/Samples/Web3AuthSample.unity | 27 ++++-- Assets/Plugins/Web3AuthSDK/Web3Auth.cs | 8 ++ Packages/manifest.json | 13 +-- Packages/packages-lock.json | 45 ++++------ ProjectSettings/ProjectSettings.asset | 90 ++++++++++++++----- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/boot.config | 0 26 files changed, 322 insertions(+), 253 deletions(-) create mode 100644 Assets/Plugins/Android.meta create mode 100644 Assets/Plugins/Android/AndroidManifest.xml create mode 100644 Assets/Plugins/Android/AndroidManifest.xml.meta rename Assets/Plugins/Web3AuthSDK/Android/{androidx.annotation.annotation-1.1.0.jar.meta => androidx.annotation.annotation-1.6.0.jar.meta} (91%) rename Assets/Plugins/Web3AuthSDK/Android/{androidx.arch.core.core-common-2.0.0.jar.meta => androidx.arch.core.core-common-2.2.0.jar.meta} (91%) rename Assets/Plugins/Web3AuthSDK/Android/{androidx.browser.browser-1.4.0.aar.meta => androidx.browser.browser-1.5.0.aar.meta} (91%) rename Assets/Plugins/Web3AuthSDK/Android/{androidx.collection.collection-1.1.0.jar.meta => androidx.collection.collection-1.2.0.jar.meta} (91%) delete mode 100644 Assets/Plugins/Web3AuthSDK/Android/androidx.concurrent.concurrent-futures-1.0.0.jar.meta create mode 100644 Assets/Plugins/Web3AuthSDK/Android/androidx.concurrent.concurrent-futures-1.1.0.jar.meta delete mode 100644 Assets/Plugins/Web3AuthSDK/Android/androidx.core.core-1.1.0.aar.meta create mode 100644 Assets/Plugins/Web3AuthSDK/Android/androidx.core.core-1.8.0.aar.meta delete mode 100644 Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta create mode 100644 Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-common-2.6.0.jar.meta delete mode 100644 Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta create mode 100644 Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-runtime-2.6.0.aar.meta delete mode 100644 Assets/Plugins/Web3AuthSDK/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta create mode 100644 Assets/Plugins/Web3AuthSDK/Android/androidx.versionedparcelable.versionedparcelable-1.1.1.aar.meta delete mode 100644 ProjectSettings/boot.config diff --git a/Assets/Plugins/Android.meta b/Assets/Plugins/Android.meta new file mode 100644 index 0000000..04996ae --- /dev/null +++ b/Assets/Plugins/Android.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce2713d86b0b748319b83d98855d8c88 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml new file mode 100644 index 0000000..945c506 --- /dev/null +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/Plugins/Android/AndroidManifest.xml.meta b/Assets/Plugins/Android/AndroidManifest.xml.meta new file mode 100644 index 0000000..0dc9731 --- /dev/null +++ b/Assets/Plugins/Android/AndroidManifest.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0897f91d72ebb499cac8d84dfae5501a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.annotation.annotation-1.1.0.jar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.annotation.annotation-1.6.0.jar.meta similarity index 91% rename from Assets/Plugins/Web3AuthSDK/Android/androidx.annotation.annotation-1.1.0.jar.meta rename to Assets/Plugins/Web3AuthSDK/Android/androidx.annotation.annotation-1.6.0.jar.meta index fc0fe63..bf84e9f 100644 --- a/Assets/Plugins/Web3AuthSDK/Android/androidx.annotation.annotation-1.1.0.jar.meta +++ b/Assets/Plugins/Web3AuthSDK/Android/androidx.annotation.annotation-1.6.0.jar.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 7da6521eb784c7047a67f2745bfd1f78 -labels: -- gpsr +guid: dff8b1b0bdeaa445aa46c44b5404b869 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.arch.core.core-common-2.0.0.jar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.arch.core.core-common-2.2.0.jar.meta similarity index 91% rename from Assets/Plugins/Web3AuthSDK/Android/androidx.arch.core.core-common-2.0.0.jar.meta rename to Assets/Plugins/Web3AuthSDK/Android/androidx.arch.core.core-common-2.2.0.jar.meta index f8231a9..8b191dc 100644 --- a/Assets/Plugins/Web3AuthSDK/Android/androidx.arch.core.core-common-2.0.0.jar.meta +++ b/Assets/Plugins/Web3AuthSDK/Android/androidx.arch.core.core-common-2.2.0.jar.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: fc305d5614d22b54b8153d89c50be1db -labels: -- gpsr +guid: 96887d25b87004f819cf0accaee5ec29 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.browser.browser-1.4.0.aar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.browser.browser-1.5.0.aar.meta similarity index 91% rename from Assets/Plugins/Web3AuthSDK/Android/androidx.browser.browser-1.4.0.aar.meta rename to Assets/Plugins/Web3AuthSDK/Android/androidx.browser.browser-1.5.0.aar.meta index 99dea8a..eb1139b 100644 --- a/Assets/Plugins/Web3AuthSDK/Android/androidx.browser.browser-1.4.0.aar.meta +++ b/Assets/Plugins/Web3AuthSDK/Android/androidx.browser.browser-1.5.0.aar.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 781538c4d87aae34b87b01c40d84a9af -labels: -- gpsr +guid: b100fc6d2347941789ed9b882f0a7a37 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.collection.collection-1.1.0.jar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.collection.collection-1.2.0.jar.meta similarity index 91% rename from Assets/Plugins/Web3AuthSDK/Android/androidx.collection.collection-1.1.0.jar.meta rename to Assets/Plugins/Web3AuthSDK/Android/androidx.collection.collection-1.2.0.jar.meta index f49506c..e2219dc 100644 --- a/Assets/Plugins/Web3AuthSDK/Android/androidx.collection.collection-1.1.0.jar.meta +++ b/Assets/Plugins/Web3AuthSDK/Android/androidx.collection.collection-1.2.0.jar.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 4c896ab2fa8f26e4c89c1ebd90ddf42b -labels: -- gpsr +guid: 23b677d3499e54523a82a43d3df06b3d PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.concurrent.concurrent-futures-1.0.0.jar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.concurrent.concurrent-futures-1.0.0.jar.meta deleted file mode 100644 index 50415e1..0000000 --- a/Assets/Plugins/Web3AuthSDK/Android/androidx.concurrent.concurrent-futures-1.0.0.jar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 2bb5efdbd3eb0a44fa0152c21e44ee65 -labels: -- gpsr -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.concurrent.concurrent-futures-1.1.0.jar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.concurrent.concurrent-futures-1.1.0.jar.meta new file mode 100644 index 0000000..1614945 --- /dev/null +++ b/Assets/Plugins/Web3AuthSDK/Android/androidx.concurrent.concurrent-futures-1.1.0.jar.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: 2c8d8116cf97a4296b169ce908cf748d +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.core.core-1.1.0.aar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.core.core-1.1.0.aar.meta deleted file mode 100644 index 9b71f72..0000000 --- a/Assets/Plugins/Web3AuthSDK/Android/androidx.core.core-1.1.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: f864ae26672c8e24c891a84ba3fe1052 -labels: -- gpsr -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.core.core-1.8.0.aar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.core.core-1.8.0.aar.meta new file mode 100644 index 0000000..b9cd876 --- /dev/null +++ b/Assets/Plugins/Web3AuthSDK/Android/androidx.core.core-1.8.0.aar.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: 85fcea26219be4d35b48385d788d09e5 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta deleted file mode 100644 index 273a0b9..0000000 --- a/Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 15ca0621d7ee81043bd69184a8533339 -labels: -- gpsr -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-common-2.6.0.jar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-common-2.6.0.jar.meta new file mode 100644 index 0000000..d5fb346 --- /dev/null +++ b/Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-common-2.6.0.jar.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: 8ea28d45c8f5e4713b029e3695cc6938 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta deleted file mode 100644 index abc5eb5..0000000 --- a/Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 32123f3faecd51f498ee6804b60752a1 -labels: -- gpsr -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-runtime-2.6.0.aar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-runtime-2.6.0.aar.meta new file mode 100644 index 0000000..0210df4 --- /dev/null +++ b/Assets/Plugins/Web3AuthSDK/Android/androidx.lifecycle.lifecycle-runtime-2.6.0.aar.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: da4e39bf749d44b63ae66a8ab0aae746 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta deleted file mode 100644 index 9d57670..0000000 --- a/Assets/Plugins/Web3AuthSDK/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 83f9194c4d6c682498fe12ffa73b4529 -labels: -- gpsr -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Web3AuthSDK/Android/androidx.versionedparcelable.versionedparcelable-1.1.1.aar.meta b/Assets/Plugins/Web3AuthSDK/Android/androidx.versionedparcelable.versionedparcelable-1.1.1.aar.meta new file mode 100644 index 0000000..89015bd --- /dev/null +++ b/Assets/Plugins/Web3AuthSDK/Android/androidx.versionedparcelable.versionedparcelable-1.1.1.aar.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: cce5e807ba2234663bce8d44edb49815 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Web3AuthSDK/Editor/AndroidBuildPostProcess.cs b/Assets/Plugins/Web3AuthSDK/Editor/AndroidBuildPostProcess.cs index 9ab2a34..34a106b 100644 --- a/Assets/Plugins/Web3AuthSDK/Editor/AndroidBuildPostProcess.cs +++ b/Assets/Plugins/Web3AuthSDK/Editor/AndroidBuildPostProcess.cs @@ -37,12 +37,12 @@ public void OnPostGenerateGradleAndroidProject(string path) - + ", uri.Scheme, uri.Host, uri.LocalPath)), true)); document.Save(manifest); - + } private XmlNode BuildeNode(string text) diff --git a/Assets/Plugins/Web3AuthSDK/Samples/Web3AuthSample.cs b/Assets/Plugins/Web3AuthSDK/Samples/Web3AuthSample.cs index 72759ec..5a60124 100644 --- a/Assets/Plugins/Web3AuthSDK/Samples/Web3AuthSample.cs +++ b/Assets/Plugins/Web3AuthSDK/Samples/Web3AuthSample.cs @@ -4,6 +4,7 @@ using UnityEngine; using UnityEngine.UI; using Newtonsoft.Json; +using static Web3Auth; public class Web3AuthSample : MonoBehaviour { @@ -62,7 +63,7 @@ void Start() { { "primary", "#123456" } } - } + }, // If using your own custom verifier, uncomment this code. /* , @@ -71,6 +72,7 @@ void Start() {"CUSTOM_VERIFIER", loginConfigItem} } */ + network = Web3Auth.Network.TESTNET }); web3Auth.onLogin += onLogin; web3Auth.onLogout += onLogout; diff --git a/Assets/Plugins/Web3AuthSDK/Samples/Web3AuthSample.unity b/Assets/Plugins/Web3AuthSDK/Samples/Web3AuthSample.unity index 12c8cc4..982df56 100644 --- a/Assets/Plugins/Web3AuthSDK/Samples/Web3AuthSample.unity +++ b/Assets/Plugins/Web3AuthSDK/Samples/Web3AuthSample.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657815, g: 0.49641192, b: 0.57481617, a: 1} + m_IndirectSpecularColor: {r: 0.4439372, g: 0.49315345, b: 0.5721989, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -640,7 +640,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 4 + serializedVersion: 6 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -680,7 +680,7 @@ LightingSettings: m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 m_PVRMinBounces: 2 - m_PVREnvironmentMIS: 1 + m_PVREnvironmentImportanceSampling: 1 m_PVRFilteringMode: 1 m_PVRDenoiserTypeDirect: 1 m_PVRDenoiserTypeIndirect: 1 @@ -695,6 +695,8 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1 &448986211 GameObject: m_ObjectHideFlags: 0 @@ -813,9 +815,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -886,7 +896,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3eab2a0bf902d6e4b9c2e968ad89f528, type: 3} m_Name: m_EditorClassIdentifier: - clientId: BAwFgL-r7wzQKmtcdiz2uHJKNZdK7gzEf2q-m55xfzSZOw8jLOyIi4AVvvzaEQO5nv2dFLEmf9LBkF8kaq3aErg + clientId: BJ6l3_kIQiy6YVL7zDlCcEAvGpGukwFgp-C_0WvNI_fAEeIaoVRLDrV5OjtbZr_zJxbyXFsXMT-yhQiUNYvZWpo redirectUri: torusapp://com.torus.Web3AuthUnity/auth network: 1 --- !u!1 &529774071 @@ -1133,7 +1143,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1666,6 +1678,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit diff --git a/Assets/Plugins/Web3AuthSDK/Web3Auth.cs b/Assets/Plugins/Web3AuthSDK/Web3Auth.cs index b652572..c633a28 100644 --- a/Assets/Plugins/Web3AuthSDK/Web3Auth.cs +++ b/Assets/Plugins/Web3AuthSDK/Web3Auth.cs @@ -90,6 +90,14 @@ public void setOptions(Web3AuthOptions web3AuthOptions) if (this.web3AuthOptions.clientId != null) this.initParams["clientId"] = this.web3AuthOptions.clientId; + this.initParams["network"] = this.web3AuthOptions.network.ToString().ToLower(); + + + if (this.web3AuthOptions.useCoreKitKey.HasValue) + this.initParams["useCoreKitKey"] = this.web3AuthOptions.useCoreKitKey.Value; + + if (this.web3AuthOptions.chainNamespace != null) + this.initParams["chainNamespace"] = this.web3AuthOptions.chainNamespace; } private void onDeepLinkActivated(string url) diff --git a/Packages/manifest.json b/Packages/manifest.json index bb89f5b..6c47117 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,13 +1,14 @@ { "dependencies": { - "com.unity.collab-proxy": "1.17.1", - "com.unity.ide.rider": "3.0.15", - "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ai.navigation": "1.1.4", + "com.unity.collab-proxy": "2.0.5", + "com.unity.ide.rider": "3.0.24", + "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.test-framework": "1.1.31", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.1", + "com.unity.timeline": "1.7.4", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 943d664..8702dd3 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,14 +1,21 @@ { "dependencies": { - "com.unity.collab-proxy": { - "version": "1.17.1", + "com.unity.ai.navigation": { + "version": "1.1.4", "depth": 0, "source": "registry", "dependencies": { - "com.unity.services.core": "1.0.1" + "com.unity.modules.ai": "1.0.0" }, "url": "https://packages.unity.com" }, + "com.unity.collab-proxy": { + "version": "2.0.5", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, @@ -17,7 +24,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.15", + "version": "3.0.24", "depth": 0, "source": "registry", "dependencies": { @@ -26,7 +33,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.16", + "version": "2.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -42,25 +49,14 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", + "version": "3.2.1", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.services.core": { - "version": "1.3.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.modules.androidjni": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -80,7 +76,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.1", + "version": "1.7.4", "depth": 0, "source": "registry", "dependencies": { @@ -232,17 +228,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 12e315f..f48f981 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 26 productGUID: b18450dd9ae02564085778e41b485e8b AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,15 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -119,8 +120,11 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -128,12 +132,7 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 @@ -147,7 +146,7 @@ PlayerSettings: enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -155,34 +154,38 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: org.torusresearch.web3authunitysdk + Android: com.torus.Web3AuthUnity Standalone: org.torusresearch.web3authunitysdk iPhone: com.torusresearch.web3auth-unity-sdk buildNumber: + Bratwurst: 0 Standalone: 0 iPhone: 0 tvOS: 0 - overrideDefaultApplicationIdentifier: 0 + overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 24 - AndroidTargetSdkVersion: 0 + AndroidTargetSdkVersion: 33 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 - ForceInternetPermission: 0 + ForceInternetPermission: 1 ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 - iPhoneSdkVersion: 989 - iOSTargetOSVersionString: 12.0 + iPhoneSdkVersion: 988 + iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 12.0 + bratwurstSdkVersion: 0 + bratwurstTargetOSVersionString: 16.4 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -231,8 +234,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + bratwurstManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + bratwurstManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -241,12 +246,13 @@ PlayerSettings: clonedFromGUID: 00000000000000000000000000000000 templatePackageId: templateDefaultScene: - useCustomMainManifest: 0 + useCustomMainManifest: 1 useCustomLauncherManifest: 0 useCustomMainGradleTemplate: 0 useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 3 AndroidTargetDevices: 0 @@ -254,6 +260,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -267,7 +274,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -464,6 +470,7 @@ PlayerSettings: m_Kind: 4 m_SubKind: App Store m_BuildTargetBatching: [] + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: [] m_BuildTargetGraphicsJobMode: [] m_BuildTargetGraphicsAPIs: @@ -474,6 +481,8 @@ PlayerSettings: m_APIs: 0b00000008000000 m_Automatic: 0 m_BuildTargetVRSettings: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -483,7 +492,9 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 @@ -496,6 +507,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -507,6 +519,7 @@ PlayerSettings: switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -580,7 +593,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -622,6 +634,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -634,6 +647,7 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 1 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -708,6 +722,7 @@ PlayerSettings: ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] @@ -720,6 +735,7 @@ PlayerSettings: webGLMemorySize: 32 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -732,22 +748,43 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 + webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: Android: 1 il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + il2cppCodeGeneration: {} + managedStrippingLevel: + Android: 1 + Bratwurst: 1 + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + QNX: 1 + Stadia: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: Android: 3 @@ -821,8 +858,14 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -830,6 +873,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 4cb0460..e7e2f19 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.6f1 -m_EditorVersionWithRevision: 2021.3.6f1 (7da38d85baf6) +m_EditorVersion: 2022.3.4f1 +m_EditorVersionWithRevision: 2022.3.4f1 (35713cd46cd7) diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29..0000000 From a1026c77522651247bc59d0126da2b485ab1ba77 Mon Sep 17 00:00:00 2001 From: chaitanyapotti Date: Tue, 18 Jul 2023 13:21:27 +0800 Subject: [PATCH 2/2] adds id_token --- .gitignore | 3 ++- .vscode/settings.json | 3 +++ Assets/Plugins/Android/AndroidManifest.xml | 16 +++++++++++++--- .../Web3AuthSDK/Types/ExtraLoginOptions.cs | 1 + 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 2612daf..4c36115 100644 --- a/.gitignore +++ b/.gitignore @@ -74,4 +74,5 @@ crashlytics-build.properties /UIElementsSchema ios-build/* web3auth-android-build_*/ -TestBuild_BackUpThisFolder_ButDontShipItWithYourGame/* \ No newline at end of file +TestBuild_BackUpThisFolder_ButDontShipItWithYourGame/* +.DS_Store \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..a6cfd19 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "dotnet.defaultSolution": "web3auth-unity-sdk.sln" +} diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index 945c506..1fd0007 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -1,18 +1,28 @@ - + - + - + + + + + + + diff --git a/Assets/Plugins/Web3AuthSDK/Types/ExtraLoginOptions.cs b/Assets/Plugins/Web3AuthSDK/Types/ExtraLoginOptions.cs index c19d459..65dfe5d 100644 --- a/Assets/Plugins/Web3AuthSDK/Types/ExtraLoginOptions.cs +++ b/Assets/Plugins/Web3AuthSDK/Types/ExtraLoginOptions.cs @@ -11,6 +11,7 @@ public class ExtraLoginOptions { public Prompt prompt { get; set; } public string max_age { get; set; } public string ui_locales { get; set; } + public string id_token { get; set; } public string id_token_hint { get; set; } public string login_hint { get; set; } public string acr_values { get; set; }