Skip to content

Commit 290f354

Browse files
committed
Update to Unity 2021, reduce min SDK to 22; #410 #409
1 parent fdbcb82 commit 290f354

8 files changed

Lines changed: 78 additions & 17 deletions

File tree

Assets/Plugins/Android/mainTemplate.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ dependencies {
3333
**DEPS**}
3434

3535
android {
36+
namespace "com.unity3d.player"
37+
ndkPath "**NDKPATH**"
3638
compileSdkVersion **APIVERSION**
3739
buildToolsVersion '**BUILDTOOLS**'
3840

Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
33
"com.unity.ide.visualstudio": "2.0.22",
4-
"com.unity.mobile.android-logcat": "1.3.2",
4+
"com.unity.mobile.android-logcat": "1.4.3",
55
"com.unity.ugui": "1.0.0",
66
"com.yasirkula.nativegallery": "https://github.com/yasirkula/UnityNativeGallery.git",
77
"com.unity.modules.androidjni": "1.0.0",

Packages/packages-lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"url": "https://packages.unity.com"
1818
},
1919
"com.unity.mobile.android-logcat": {
20-
"version": "1.3.2",
20+
"version": "1.4.3",
2121
"depth": 0,
2222
"source": "registry",
2323
"dependencies": {},
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!387306366 &1
4+
MemorySettings:
5+
m_ObjectHideFlags: 0
6+
m_EditorMemorySettings:
7+
m_MainAllocatorBlockSize: -1
8+
m_ThreadAllocatorBlockSize: -1
9+
m_MainGfxBlockSize: -1
10+
m_ThreadGfxBlockSize: -1
11+
m_CacheBlockSize: -1
12+
m_TypetreeBlockSize: -1
13+
m_ProfilerBlockSize: -1
14+
m_ProfilerEditorBlockSize: -1
15+
m_BucketAllocatorGranularity: -1
16+
m_BucketAllocatorBucketsCount: -1
17+
m_BucketAllocatorBlockSize: -1
18+
m_BucketAllocatorBlockCount: -1
19+
m_ProfilerBucketAllocatorGranularity: -1
20+
m_ProfilerBucketAllocatorBucketsCount: -1
21+
m_ProfilerBucketAllocatorBlockSize: -1
22+
m_ProfilerBucketAllocatorBlockCount: -1
23+
m_TempAllocatorSizeMain: -1
24+
m_JobTempAllocatorBlockSize: -1
25+
m_BackgroundJobTempAllocatorBlockSize: -1
26+
m_JobTempAllocatorReducedBlockSize: -1
27+
m_TempAllocatorSizeGIBakingWorker: -1
28+
m_TempAllocatorSizeNavMeshWorker: -1
29+
m_TempAllocatorSizeAudioWorker: -1
30+
m_TempAllocatorSizeCloudWorker: -1
31+
m_TempAllocatorSizeGfx: -1
32+
m_TempAllocatorSizeJobWorker: -1
33+
m_TempAllocatorSizeBackgroundWorker: -1
34+
m_TempAllocatorSizePreloadManager: -1
35+
m_PlatformMemorySettings: {}

ProjectSettings/ProjectSettings.asset

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!129 &1
44
PlayerSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 23
6+
serializedVersion: 24
77
productGUID: 263c9899128ea644b8fcdc9ac5704b18
88
AndroidProfiler: 0
99
AndroidFilterTouchesWhenObscured: 0
@@ -50,6 +50,7 @@ PlayerSettings:
5050
defaultScreenHeightWeb: 600
5151
m_StereoRenderingPath: 0
5252
m_ActiveColorSpace: 0
53+
unsupportedMSAAFallback: 0
5354
m_MTRendering: 1
5455
mipStripping: 0
5556
numberOfMipsStripped: 0
@@ -76,6 +77,7 @@ PlayerSettings:
7677
androidMinimumWindowWidth: 400
7778
androidMinimumWindowHeight: 300
7879
androidFullscreenMode: 1
80+
androidAutoRotationBehavior: 1
7981
defaultIsNativeResolution: 1
8082
macRetinaSupport: 1
8183
runInBackground: 0
@@ -123,6 +125,7 @@ PlayerSettings:
123125
switchNVNOtherPoolsGranularity: 16777216
124126
switchNVNMaxPublicTextureIDCount: 0
125127
switchNVNMaxPublicSamplerIDCount: 0
128+
switchMaxWorkerMultiple: 8
126129
stadiaPresentMode: 0
127130
stadiaTargetFramerate: 0
128131
vulkanNumSwapchainBuffers: 3
@@ -147,6 +150,7 @@ PlayerSettings:
147150
enable360StereoCapture: 0
148151
isWsaHolographicRemotingEnabled: 0
149152
enableFrameTimingStats: 0
153+
enableOpenGLProfilerGPURecorders: 1
150154
useHDRDisplay: 0
151155
D3DHDRBitDepth: 0
152156
m_ColorGamuts: 00000000
@@ -164,7 +168,7 @@ PlayerSettings:
164168
tvOS: 0
165169
overrideDefaultApplicationIdentifier: 1
166170
AndroidBundleVersionCode: 41
167-
AndroidMinSdkVersion: 24
171+
AndroidMinSdkVersion: 22
168172
AndroidTargetSdkVersion: 35
169173
AndroidPreferredInstallLocation: 1
170174
aotOptions:
@@ -179,10 +183,10 @@ PlayerSettings:
179183
StripUnusedMeshComponents: 0
180184
VertexChannelCompressionMask: 4054
181185
iPhoneSdkVersion: 988
182-
iOSTargetOSVersionString: 11.0
186+
iOSTargetOSVersionString: 12.0
183187
tvOSSdkVersion: 0
184188
tvOSRequireExtendedGameController: 0
185-
tvOSTargetOSVersionString: 11.0
189+
tvOSTargetOSVersionString: 12.0
186190
uIPrerenderedIcon: 0
187191
uIRequiresPersistentWiFi: 0
188192
uIRequiresFullScreen: 1
@@ -220,6 +224,7 @@ PlayerSettings:
220224
iOSLaunchScreeniPadCustomStoryboardPath:
221225
iOSDeviceRequirements: []
222226
iOSURLSchemes: []
227+
macOSURLSchemes: []
223228
iOSBackgroundModes: 0
224229
iOSMetalForceHardShadows: 0
225230
metalEditorSupport: 1
@@ -244,7 +249,8 @@ PlayerSettings:
244249
useCustomMainGradleTemplate: 1
245250
useCustomLauncherGradleManifest: 0
246251
useCustomBaseGradleTemplate: 0
247-
useCustomGradlePropertiesTemplate: 1
252+
useCustomGradlePropertiesTemplate: 0
253+
useCustomGradleSettingsTemplate: 0
248254
useCustomProguardFile: 0
249255
AndroidTargetArchitectures: 3
250256
AndroidTargetDevices: 0
@@ -265,7 +271,6 @@ PlayerSettings:
265271
banner: {fileID: 0}
266272
androidGamepadSupportLevel: 0
267273
chromeosInputEmulation: 1
268-
AndroidMinifyWithR8: 0
269274
AndroidMinifyRelease: 0
270275
AndroidMinifyDebug: 0
271276
AndroidValidateAppBundleSize: 1
@@ -467,6 +472,7 @@ PlayerSettings:
467472
- m_BuildTarget: Android
468473
m_StaticBatching: 0
469474
m_DynamicBatching: 1
475+
m_BuildTargetShaderSettings: []
470476
m_BuildTargetGraphicsJobs:
471477
- m_BuildTarget: MacStandaloneSupport
472478
m_GraphicsJobs: 0
@@ -513,6 +519,8 @@ PlayerSettings:
513519
m_APIs: 02000000
514520
m_Automatic: 1
515521
m_BuildTargetVRSettings: []
522+
m_DefaultShaderChunkSizeInMB: 16
523+
m_DefaultShaderChunkCount: 0
516524
openGLRequireES31: 0
517525
openGLRequireES31AEP: 0
518526
openGLRequireES32: 0
@@ -532,6 +540,7 @@ PlayerSettings:
532540
m_EncodingQuality: 1
533541
m_BuildTargetGroupLightmapSettings: []
534542
m_BuildTargetNormalMapEncoding: []
543+
m_BuildTargetDefaultTextureCompressionFormat: []
535544
playModeTestRunnerEnabled: 0
536545
runPlayModeTestAsEditModeTest: 0
537546
actionOnDotNetUnhandledException: 1
@@ -549,7 +558,8 @@ PlayerSettings:
549558
switchSocketConcurrencyLimit: 14
550559
switchScreenResolutionBehavior: 2
551560
switchUseCPUProfiler: 0
552-
switchUseGOLDLinker: 0
561+
switchEnableFileSystemTrace: 0
562+
switchLTOSetting: 0
553563
switchApplicationID: 0x01004b9000490000
554564
switchNSODependencies:
555565
switchTitleNames_0:
@@ -625,7 +635,6 @@ PlayerSettings:
625635
switchReleaseVersion: 0
626636
switchDisplayVersion: 1.0.0
627637
switchStartupUserAccount: 0
628-
switchTouchScreenUsage: 0
629638
switchSupportedLanguagesMask: 0
630639
switchLogoType: 0
631640
switchApplicationErrorCodeCategory:
@@ -667,6 +676,7 @@ PlayerSettings:
667676
switchNativeFsCacheSize: 32
668677
switchIsHoldTypeHorizontal: 0
669678
switchSupportedNpadCount: 8
679+
switchEnableTouchScreen: 1
670680
switchSocketConfigEnabled: 0
671681
switchTcpInitialSendBufferSize: 32
672682
switchTcpInitialReceiveBufferSize: 64
@@ -677,7 +687,6 @@ PlayerSettings:
677687
switchSocketBufferEfficiency: 4
678688
switchSocketInitializeEnabled: 1
679689
switchNetworkInterfaceManagerInitializeEnabled: 1
680-
switchPlayerConnectionEnabled: 1
681690
switchUseNewStyleFilepaths: 0
682691
switchUseLegacyFmodPriorities: 1
683692
switchUseMicroSleepForYield: 1
@@ -779,19 +788,33 @@ PlayerSettings:
779788
webGLLinkerTarget: 1
780789
webGLThreadsSupport: 0
781790
webGLDecompressionFallback: 1
791+
webGLPowerPreference: 2
782792
scriptingDefineSymbols: {}
783793
additionalCompilerArguments: {}
784794
platformArchitecture:
785795
iPhone: 1
786796
scriptingBackend:
787797
Android: 1
788798
il2cppCompilerConfiguration: {}
789-
managedStrippingLevel: {}
799+
managedStrippingLevel:
800+
Android: 1
801+
EmbeddedLinux: 1
802+
GameCoreScarlett: 1
803+
GameCoreXboxOne: 1
804+
Lumin: 1
805+
Nintendo Switch: 1
806+
PS4: 1
807+
PS5: 1
808+
Stadia: 1
809+
WebGL: 1
810+
Windows Store Apps: 1
811+
XboxOne: 1
812+
iPhone: 1
813+
tvOS: 1
790814
incrementalIl2cppBuild: {}
791815
suppressCommonWarnings: 1
792816
allowUnsafeCode: 0
793817
useDeterministicCompilation: 1
794-
useReferenceAssemblies: 1
795818
enableRoslynAnalyzers: 1
796819
additionalIl2CppArgs:
797820
scriptingRuntimeVersion: 1
@@ -823,6 +846,7 @@ PlayerSettings:
823846
metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628,
824847
a: 1}
825848
metroSplashScreenUseBackgroundColor: 0
849+
syncCapabilities: 0
826850
platformCapabilities: {}
827851
metroTargetDeviceFamilies: {}
828852
metroFTAName:
@@ -879,4 +903,6 @@ PlayerSettings:
879903
organizationId:
880904
cloudEnabled: 0
881905
legacyClampBlendShapeWeights: 1
906+
playerDataPath:
907+
forceSRGBBlit: 1
882908
virtualTexturingSupportEnabled: 0

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.3.49f1
2-
m_EditorVersionWithRevision: 2020.3.49f1 (18249dd5551b)
1+
m_EditorVersion: 2021.3.45f2
2+
m_EditorVersionWithRevision: 2021.3.45f2 (88f88f591b2e)

ProjectSettings/boot.config

Whitespace-only changes.

docs/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ These notes are mostly for me, but you can read them too.
6161
- Android: open Player settings and browse for the keystore location
6262
- iOS: download certificate from Apple and install, get private key and install
6363

64-
Note: there is currently a bug when building for Android using **SDK 35**. See [this thread](https://discussions.unity.com/t/cant-build-for-android-15-in-unity-2021-3-2022-3/951797) for details.
65-
6664
## More info
6765

6866
[MIT License](https://github.com/vanjac/nspace/blob/master/LICENSE.txt)

0 commit comments

Comments
 (0)