From 6047e83b8bce906156451b33c26464920c56cea0 Mon Sep 17 00:00:00 2001 From: Fabian Quosdorf Date: Thu, 31 Oct 2024 09:53:40 +0100 Subject: [PATCH 1/2] Unity 2022.3 LTS compatibility Update Project and Code to ensure Unity 2022 LTS compatibility. --- .../DisplayCapture/Barcode/BarcodeReader.java | 18 +- .../DisplayCapture/DisplayCaptureManager.java | 9 +- .../DisplayCaptureNotificationService.java | 4 +- Assets/Plugins/Android/AndroidManifest.xml | 3 +- Assets/Plugins/Android/mainTemplate.gradle | 21 ++- Packages/manifest.json | 2 - Packages/packages-lock.json | 48 ++--- ProjectSettings/ProjectSettings.asset | 173 +++++++++++++----- ProjectSettings/ProjectVersion.txt | 4 +- 9 files changed, 184 insertions(+), 98 deletions(-) diff --git a/Assets/DisplayCapture/Barcode/BarcodeReader.java b/Assets/DisplayCapture/Barcode/BarcodeReader.java index bbffb58..79de248 100644 --- a/Assets/DisplayCapture/Barcode/BarcodeReader.java +++ b/Assets/DisplayCapture/Barcode/BarcodeReader.java @@ -55,7 +55,13 @@ public Point(android.graphics.Point point) { private UnityInterface unityInterface; - private record UnityInterface(String gameObjectName) { + private static class UnityInterface { + private final String gameObjectName; + + private UnityInterface(String gameObjectName) { + this.gameObjectName = gameObjectName; + } + private void Call(String functionName) { UnityPlayer.UnitySendMessage(gameObjectName, functionName, ""); } @@ -66,13 +72,11 @@ public void OnBarcodeResults(String json) { } public BarcodeReader() { - - var optBuilder = new BarcodeScannerOptions.Builder(); + BarcodeScannerOptions.Builder optBuilder = new BarcodeScannerOptions.Builder(); optBuilder.setBarcodeFormats(Barcode.FORMAT_QR_CODE); optBuilder.build(); scanner = BarcodeScanning.getClient(optBuilder.build()); - gson = new Gson(); } @@ -103,7 +107,7 @@ public void onNewImage(ByteBuffer byteBuffer, int width, int height, long timest if(readingBarcode) return; - var bitmap = Bitmap.createBitmap( + Bitmap bitmap = Bitmap.createBitmap( width, height, Bitmap.Config.ARGB_8888 @@ -124,7 +128,7 @@ public void onNewImage(ByteBuffer byteBuffer, int width, int height, long timest return; } - var taskResult = task.getResult(); + List taskResult = task.getResult(); Results results = new Results(taskResult.size()); Log.i(TAG, taskResult.size() + " barcodes found."); @@ -137,7 +141,7 @@ public void onNewImage(ByteBuffer byteBuffer, int width, int height, long timest result.text = barcode.getDisplayValue(); result.timestamp = timestamp; - var cornerPoints = Objects.requireNonNull(barcode.getCornerPoints()); + android.graphics.Point[] cornerPoints = Objects.requireNonNull(barcode.getCornerPoints()); result.points = new Point[cornerPoints.length]; for(int j = 0; j < cornerPoints.length; j++) result.points[j] = new Point(cornerPoints[j]); diff --git a/Assets/DisplayCapture/DisplayCaptureManager.java b/Assets/DisplayCapture/DisplayCaptureManager.java index a096fd7..efc8240 100644 --- a/Assets/DisplayCapture/DisplayCaptureManager.java +++ b/Assets/DisplayCapture/DisplayCaptureManager.java @@ -40,7 +40,12 @@ public class DisplayCaptureManager implements ImageReader.OnImageAvailableListen private UnityInterface unityInterface; - private record UnityInterface(String gameObjectName) { + private static class UnityInterface { + private final String gameObjectName; + + private UnityInterface(String gameObjectName) { + this.gameObjectName = gameObjectName; + } private void Call(String functionName) { UnityPlayer.UnitySendMessage(gameObjectName, functionName, ""); @@ -91,7 +96,7 @@ public void onPermissionResponse(int resultCode, Intent intent) { Log.i(TAG, "Starting screen capture..."); - var projectionManager = (MediaProjectionManager) + MediaProjectionManager projectionManager = (MediaProjectionManager) UnityPlayer.currentContext.getSystemService(Context.MEDIA_PROJECTION_SERVICE); projection = projectionManager.getMediaProjection(resultCode, intent); diff --git a/Assets/DisplayCapture/DisplayCaptureNotificationService.java b/Assets/DisplayCapture/DisplayCaptureNotificationService.java index c6f059b..291c008 100644 --- a/Assets/DisplayCapture/DisplayCaptureNotificationService.java +++ b/Assets/DisplayCapture/DisplayCaptureNotificationService.java @@ -14,7 +14,7 @@ import android.graphics.Color; import android.os.IBinder; import android.util.Log; -import com.unity3d.player.UnityPlayerForGameActivity; +import com.unity3d.player.UnityPlayerActivity; public class DisplayCaptureNotificationService extends Service { @@ -30,7 +30,7 @@ public int onStartCommand(Intent intent, int flags, int startId) { Intent activityIntent = new Intent( this, - UnityPlayerForGameActivity.class); + UnityPlayerActivity.class); activityIntent.setAction("stop"); PendingIntent contentIntent = PendingIntent.getActivity( this, diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index d524031..905726b 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -25,7 +25,8 @@ - + diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle index 062fa7e..dca7f95 100644 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -1,13 +1,19 @@ apply plugin: 'com.android.library' -apply from: '../shared/keepUnitySymbols.gradle' +// apply from: '../shared/keepUnitySymbols.gradle' **APPLY_PLUGINS** +configurations.all { + resolutionStrategy.force 'androidx.appcompat:appcompat:1.5.1' + resolutionStrategy.force 'androidx.appcompat:appcompat-resources:1.5.1' +} + dependencies { /* ADD THESE LINES TO YOUR GRADLE DEPENDENCIES SECTION */ - implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.appcompat:appcompat-resources:1.5.1' implementation 'com.google.mlkit:barcode-scanning:17.3.0' implementation 'com.google.code.gson:gson:2.11.0' /* ADD THESE LINES TO YOUR GRADLE DEPENDENCIES SECTION */ @@ -22,17 +28,18 @@ android { ndkPath "**NDKPATH**" ndkVersion "**NDKVERSION**" - compileSdk **APIVERSION** + compileSdkVersion 33 buildToolsVersion = "**BUILDTOOLS**" compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } defaultConfig { - minSdk **MINSDK** - targetSdk **TARGETSDK** + minSdkVersion **MINSDKVERSION** + compileSdkVersion 33 + targetSdkVersion **TARGETSDKVERSION** ndk { abiFilters **ABIFILTERS** debugSymbolLevel **DEBUGSYMBOLLEVEL** diff --git a/Packages/manifest.json b/Packages/manifest.json index ca37250..0744de2 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -6,13 +6,11 @@ "com.unity.collab-proxy": "2.5.2", "com.unity.feature.development": "1.0.2", "com.unity.mobile.android-logcat": "1.4.3", - "com.unity.multiplayer.center": "1.0.0", "com.unity.timeline": "1.8.7", "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.9.4", "com.unity.xr.management": "4.5.0", "com.unity.xr.oculus": "4.3.0", - "com.unity.modules.accessibility": "1.0.0", "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 f7a3497..bcdaaa9 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -42,7 +42,7 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "2.0.5", + "version": "1.0.6", "depth": 2, "source": "registry", "dependencies": {}, @@ -55,9 +55,10 @@ "dependencies": { "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.rider": "3.0.31", + "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.2", - "com.unity.test-framework": "1.4.5", + "com.unity.test-framework": "1.1.33", "com.unity.testtools.codecoverage": "1.2.6" } }, @@ -79,6 +80,13 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ide.vscode": { + "version": "1.2.5", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.mobile.android-logcat": { "version": "1.4.3", "depth": 0, @@ -86,14 +94,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.multiplayer.center": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.uielements": "1.0.0" - } - }, "com.unity.performance.profile-analyzer": { "version": "1.2.2", "depth": 1, @@ -109,11 +109,11 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.4.5", + "version": "1.1.33", "depth": 1, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "2.0.3", + "com.unity.ext.nunit": "1.0.6", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, @@ -132,10 +132,11 @@ "com.unity.textmeshpro": { "version": "3.0.6", "depth": 1, - "source": "builtin", + "source": "registry", "dependencies": { - "com.unity.ugui": "2.0.0" - } + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" }, "com.unity.timeline": { "version": "1.8.7", @@ -169,7 +170,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.11", + "version": "2.1.10", "depth": 1, "source": "registry", "dependencies": { @@ -199,12 +200,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.modules.accessibility": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -252,12 +247,6 @@ "com.unity.modules.animation": "1.0.0" } }, - "com.unity.modules.hierarchycore": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": {} - }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -346,8 +335,7 @@ "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.hierarchycore": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 4c28e73..e64f3dc 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 28 + serializedVersion: 26 productGUID: e34780f044a61ce448cc6ad9e88096c7 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -49,7 +49,6 @@ PlayerSettings: m_StereoRenderingPath: 2 m_ActiveColorSpace: 1 unsupportedMSAAFallback: 0 - m_SpriteBatchMaxVertexCount: 65535 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -71,18 +70,17 @@ PlayerSettings: androidRenderOutsideSafeArea: 1 androidUseSwappy: 1 androidBlitType: 0 - androidResizeableActivity: 0 + androidResizableWindow: 0 androidDefaultWindowWidth: 1920 androidDefaultWindowHeight: 1080 androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 androidAutoRotationBehavior: 1 - androidPredictiveBackSupport: 0 - androidApplicationEntry: 2 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 + captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 @@ -98,7 +96,6 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 - meshDeformation: 2 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -130,8 +127,10 @@ PlayerSettings: switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 - switchMaxWorkerMultiple: 8 switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 1 @@ -140,11 +139,9 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.1 + bundleVersion: 0.3.3 preloadedAssets: - {fileID: 11400000, guid: d74a44d505873014abfc713e01964032, type: 2} - - {fileID: 11400000, guid: 1bb06a00ec5dec54db1d31bef6527f28, type: 2} - - {fileID: -8545116121635861856, guid: c2b75685dd2424a488c3e7ac94fc51fa, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -175,8 +172,8 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 29 - AndroidTargetSdkVersion: 34 + AndroidMinSdkVersion: 32 + AndroidTargetSdkVersion: 33 AndroidPreferredInstallLocation: 0 aotOptions: stripEngineCode: 1 @@ -185,16 +182,14 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - androidSplitApplicationBinary: 0 + APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSSimulatorArchitecture: 0 iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 - tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 13.0 VisionOSSdkVersion: 0 @@ -223,6 +218,7 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 + iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -230,6 +226,7 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 + iOSLaunchScreeniPadCustomXibPath: iOSLaunchScreenCustomStoryboardPath: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] @@ -263,15 +260,15 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 - useCustomGradleSettingsTemplate: 0 + useCustomGradleSettingsTemplate: 1 useCustomProguardFile: 0 AndroidTargetArchitectures: 2 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: AndroidEnableArmv9SecurityFeatures: 0 - AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -284,12 +281,11 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - AndroidReportGooglePlayAppDependencies: 1 - androidSymbolsSizeThreshold: 800 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: - m_BuildTarget: Android @@ -384,6 +380,110 @@ PlayerSettings: m_Height: 36 m_Kind: 0 m_SubKind: + - m_BuildTarget: VisionOS + m_Icons: + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 0 + m_SubKind: + - m_BuildTarget: iPhone + m_Icons: + - m_Textures: [] + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 @@ -466,15 +566,13 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: - - serializedVersion: 2 - m_BuildTarget: Android + - m_BuildTarget: Android m_EncodingQuality: 1 - - serializedVersion: 2 - m_BuildTarget: iOS + - m_BuildTarget: iOS m_EncodingQuality: 1 - - serializedVersion: 2 - m_BuildTarget: tvOS + - m_BuildTarget: tvOS m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: @@ -485,13 +583,11 @@ PlayerSettings: - m_BuildTarget: tvOS m_Encoding: 1 m_BuildTargetDefaultTextureCompressionFormat: - - serializedVersion: 3 - m_BuildTarget: Android - m_Formats: 03000000 + - m_BuildTarget: Android + m_Format: 0 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 - editorGfxJobOverride: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 @@ -637,14 +733,12 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 1 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 switchRamDiskSpaceSize: 12 - switchUpgradedPlayerSettingsToNMETA: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -747,12 +841,7 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 - webGLEnableWebGPU: 0 webGLPowerPreference: 2 - webGLWebAssemblyTable: 0 - webGLWebAssemblyBigInt: 0 - webGLCloseOnQuit: 0 - webWasm2023: 0 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} @@ -760,7 +849,6 @@ PlayerSettings: Android: 1 il2cppCompilerConfiguration: {} il2cppCodeGeneration: {} - il2cppStacktraceInformation: {} managedStrippingLevel: EmbeddedLinux: 1 GameCoreScarlett: 1 @@ -785,11 +873,10 @@ PlayerSettings: gcIncremental: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} - editorAssembliesCompatibilityLevel: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: MediaProjectionDemo - metroPackageVersion: + metroPackageVersion: 1.0.0.0 metroCertificatePath: metroCertificatePassword: metroCertificateSubject: @@ -797,7 +884,7 @@ PlayerSettings: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: MediaProjectionDemo wsaImages: {} - metroTileShortName: + metroTileShortName: MediaProjectionDemo metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -860,11 +947,9 @@ PlayerSettings: hmiPlayerDataPath: hmiForceSRGBBlit: 1 embeddedLinuxEnableGamepadInput: 1 - hmiCpuConfiguration: hmiLogStartupTiming: 0 - qnxGraphicConfPath: + hmiCpuConfiguration: apiCompatibilityLevel: 6 - captureStartupLogs: {} activeInputHandler: 0 windowsGamepadBackendHint: 0 cloudProjectId: @@ -878,5 +963,3 @@ PlayerSettings: platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 insecureHttpOption: 0 - androidVulkanDenyFilterList: [] - androidVulkanAllowFilterList: [] diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 2958948..690d52d 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.24f1 -m_EditorVersionWithRevision: 6000.0.24f1 (11fa355cd605) +m_EditorVersion: 2022.3.43f1 +m_EditorVersionWithRevision: 2022.3.43f1 (85497d293fa1) From ef30ad949d0883f7228aaa99c7be70dfce42c881 Mon Sep 17 00:00:00 2001 From: Fabian Quosdorf Date: Thu, 31 Oct 2024 11:33:46 +0100 Subject: [PATCH 2/2] Fixed dependency issues to support compatibility to Android SDK 32. For Meta Horizon Store submissions, Android SDK 32 (Android 12L) is currently a requirement. Hence having plugin dependencies that force API Level 33 or above as build target will void submission eligebility. --- Assets/Plugins/Android/mainTemplate.gradle | 43 ++++++++++++++++++---- Assets/XR/Settings/OculusSettings.asset | 8 ++-- ProjectSettings/ProjectSettings.asset | 9 +++-- 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle index dca7f95..3d2a034 100644 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -3,17 +3,45 @@ apply plugin: 'com.android.library' **APPLY_PLUGINS** configurations.all { - resolutionStrategy.force 'androidx.appcompat:appcompat:1.5.1' - resolutionStrategy.force 'androidx.appcompat:appcompat-resources:1.5.1' + resolutionStrategy { + eachDependency { DependencyResolveDetails details -> + if (details.requested.group == 'androidx.appcompat') { + details.useVersion "1.5.1" + } + if (details.requested.group == 'androidx.core') { + details.useVersion "1.8.0" + } + if (details.requested.group == 'androidx.activity') { + details.useVersion "1.5.1" + } + if (details.requested.name == 'annotation-experimental') { + details.useVersion "1.2.0" + } + } + } } dependencies { - - /* ADD THESE LINES TO YOUR GRADLE DEPENDENCIES SECTION */ - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'androidx.appcompat:appcompat-resources:1.5.1' + implementation('androidx.appcompat:appcompat:1.5.1') { + force = true + } + implementation('androidx.appcompat:appcompat-resources:1.5.1') { + force = true + } + implementation('androidx.core:core:1.8.0') { + force = true + } + implementation('androidx.core:core-ktx:1.8.0') { + force = true + } + implementation('androidx.activity:activity:1.5.1') { + force = true + } + implementation('androidx.annotation:annotation-experimental:1.2.0') { + force = true + } implementation 'com.google.mlkit:barcode-scanning:17.3.0' implementation 'com.google.code.gson:gson:2.11.0' /* ADD THESE LINES TO YOUR GRADLE DEPENDENCIES SECTION */ @@ -28,7 +56,7 @@ android { ndkPath "**NDKPATH**" ndkVersion "**NDKVERSION**" - compileSdkVersion 33 + compileSdkVersion 32 buildToolsVersion = "**BUILDTOOLS**" compileOptions { @@ -38,7 +66,6 @@ android { defaultConfig { minSdkVersion **MINSDKVERSION** - compileSdkVersion 33 targetSdkVersion **TARGETSDKVERSION** ndk { abiFilters **ABIFILTERS** diff --git a/Assets/XR/Settings/OculusSettings.asset b/Assets/XR/Settings/OculusSettings.asset index 4aa9cf4..bc5c40a 100644 --- a/Assets/XR/Settings/OculusSettings.asset +++ b/Assets/XR/Settings/OculusSettings.asset @@ -21,14 +21,14 @@ MonoBehaviour: OptimizeBufferDiscards: 1 PhaseSync: 1 SymmetricProjection: 1 - SubsampledLayout: 0 + SubsampledLayout: 1 FoveatedRenderingMethod: 0 LateLatching: 1 LateLatchingDebug: 0 EnableTrackingOriginStageMode: 0 - SpaceWarp: 0 - TargetQuest2: 1 - TargetQuestPro: 1 + SpaceWarp: 1 + TargetQuest2: 0 + TargetQuestPro: 0 TargetQuest3: 1 SystemSplashScreen: {fileID: 0} UseStickControlThumbsticks: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e64f3dc..0a55945 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -142,6 +142,8 @@ PlayerSettings: bundleVersion: 0.3.3 preloadedAssets: - {fileID: 11400000, guid: d74a44d505873014abfc713e01964032, type: 2} + - {fileID: -8545116121635861856, guid: c2b75685dd2424a488c3e7ac94fc51fa, type: 2} + - {fileID: 11400000, guid: 1bb06a00ec5dec54db1d31bef6527f28, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -161,7 +163,6 @@ PlayerSettings: resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - androidMinAspectRatio: 1 applicationIdentifier: Android: ph.anagly.mediaprojectiondemo Standalone: com.trev3d.mediaprojectiondemo @@ -173,7 +174,7 @@ PlayerSettings: overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 32 - AndroidTargetSdkVersion: 33 + AndroidTargetSdkVersion: 32 AndroidPreferredInstallLocation: 0 aotOptions: stripEngineCode: 1 @@ -260,7 +261,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 - useCustomGradleSettingsTemplate: 1 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 2 AndroidTargetDevices: 0 @@ -584,7 +585,7 @@ PlayerSettings: m_Encoding: 1 m_BuildTargetDefaultTextureCompressionFormat: - m_BuildTarget: Android - m_Format: 0 + m_Format: 3 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1