Skip to content

Commit eb90612

Browse files
authored
Unity version updates (#53)
* update dev version * build script working * update maze build scripts * build piple line update
1 parent de064e5 commit eb90612

File tree

9 files changed

+82
-100
lines changed

9 files changed

+82
-100
lines changed

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
timeout_in_minutes: 30
1111
key: 'build-artifacts'
1212
env:
13-
UNITY_PERFORMANCE_VERSION: "2019.4.35f1"
13+
UNITY_PERFORMANCE_VERSION: "2020.3.48f1"
1414
commands:
1515
- bundle install
1616
- bundle exec rake plugin:build:export

BugsnagPerformance/Packages/manifest.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"dependencies": {
3-
"com.unity.collab-proxy": "1.14.9",
4-
"com.unity.ide.rider": "1.2.1",
5-
"com.unity.ide.visualstudio": "2.0.12",
6-
"com.unity.ide.vscode": "1.2.4",
7-
"com.unity.nuget.newtonsoft-json": "2.0.2",
8-
"com.unity.test-framework": "1.1.29",
9-
"com.unity.textmeshpro": "2.1.6",
10-
"com.unity.timeline": "1.2.18",
3+
"com.unity.collab-proxy": "2.0.4",
4+
"com.unity.ide.rider": "3.0.21",
5+
"com.unity.ide.visualstudio": "2.0.18",
6+
"com.unity.ide.vscode": "1.2.5",
7+
"com.unity.nuget.newtonsoft-json": "3.2.0",
8+
"com.unity.test-framework": "1.1.33",
9+
"com.unity.textmeshpro": "3.0.6",
10+
"com.unity.timeline": "1.4.8",
1111
"com.unity.ugui": "1.0.0",
1212
"com.unity.modules.ai": "1.0.0",
1313
"com.unity.modules.androidjni": "1.0.0",

BugsnagPerformance/ProjectSettings/ProjectSettings.asset

Lines changed: 50 additions & 65 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: 20
6+
serializedVersion: 23
77
productGUID: 1178061c9375f47dcb7f63291259645e
88
AndroidProfiler: 0
99
AndroidFilterTouchesWhenObscured: 0
@@ -49,6 +49,8 @@ PlayerSettings:
4949
m_StereoRenderingPath: 0
5050
m_ActiveColorSpace: 0
5151
m_MTRendering: 1
52+
mipStripping: 0
53+
numberOfMipsStripped: 0
5254
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
5355
iosShowActivityIndicatorOnLoading: -1
5456
androidShowActivityIndicatorOnLoading: -1
@@ -123,7 +125,9 @@ PlayerSettings:
123125
stadiaTargetFramerate: 0
124126
vulkanNumSwapchainBuffers: 3
125127
vulkanEnableSetSRGBWrite: 0
128+
vulkanEnablePreTransform: 0
126129
vulkanEnableLateAcquireNextImage: 0
130+
vulkanEnableCommandBufferRecycling: 1
127131
m_SupportedAspectRatios:
128132
4:3: 1
129133
5:4: 1
@@ -138,31 +142,6 @@ PlayerSettings:
138142
xboxOneDisableKinectGpuReservation: 0
139143
xboxOneEnable7thCore: 1
140144
vrSettings:
141-
cardboard:
142-
depthFormat: 0
143-
enableTransitionView: 0
144-
daydream:
145-
depthFormat: 0
146-
useSustainedPerformanceMode: 0
147-
enableVideoLayer: 0
148-
useProtectedVideoMemory: 0
149-
minimumSupportedHeadTracking: 0
150-
maximumSupportedHeadTracking: 1
151-
hololens:
152-
depthFormat: 1
153-
depthBufferSharingEnabled: 1
154-
lumin:
155-
depthFormat: 0
156-
frameTiming: 2
157-
enableGLCache: 0
158-
glCacheMaxBlobSize: 524288
159-
glCacheMaxFileSize: 8388608
160-
oculus:
161-
sharedDepthBuffer: 1
162-
dashSupport: 1
163-
lowOverheadMode: 0
164-
protectedContext: 0
165-
v2Signing: 0
166145
enable360StereoCapture: 0
167146
isWsaHolographicRemotingEnabled: 0
168147
enableFrameTimingStats: 0
@@ -171,10 +150,15 @@ PlayerSettings:
171150
m_ColorGamuts: 00000000
172151
targetPixelDensity: 30
173152
resolutionScalingMode: 0
153+
resetResolutionOnWindowResize: 0
174154
androidSupportedAspectRatio: 1
175155
androidMaxAspectRatio: 2.1
176156
applicationIdentifier: {}
177-
buildNumber: {}
157+
buildNumber:
158+
Standalone: 0
159+
iPhone: 0
160+
tvOS: 0
161+
overrideDefaultApplicationIdentifier: 0
178162
AndroidBundleVersionCode: 222
179163
AndroidMinSdkVersion: 19
180164
AndroidTargetSdkVersion: 0
@@ -191,10 +175,10 @@ PlayerSettings:
191175
StripUnusedMeshComponents: 0
192176
VertexChannelCompressionMask: 4054
193177
iPhoneSdkVersion: 988
194-
iOSTargetOSVersionString: 10.0
178+
iOSTargetOSVersionString: 11.0
195179
tvOSSdkVersion: 0
196180
tvOSRequireExtendedGameController: 0
197-
tvOSTargetOSVersionString: 10.0
181+
tvOSTargetOSVersionString: 11.0
198182
uIPrerenderedIcon: 0
199183
uIRequiresPersistentWiFi: 0
200184
uIRequiresFullScreen: 1
@@ -228,8 +212,8 @@ PlayerSettings:
228212
iOSLaunchScreeniPadFillPct: 100
229213
iOSLaunchScreeniPadSize: 100
230214
iOSLaunchScreeniPadCustomXibPath:
231-
iOSUseLaunchScreenStoryboard: 0
232215
iOSLaunchScreenCustomStoryboardPath:
216+
iOSLaunchScreeniPadCustomStoryboardPath:
233217
iOSDeviceRequirements: []
234218
iOSURLSchemes: []
235219
iOSBackgroundModes: 0
@@ -247,9 +231,17 @@ PlayerSettings:
247231
iOSRequireARKit: 0
248232
iOSAutomaticallyDetectAndAddCapabilities: 1
249233
appleEnableProMotion: 0
234+
shaderPrecisionModel: 0
250235
clonedFromGUID: 00000000000000000000000000000000
251236
templatePackageId:
252237
templateDefaultScene:
238+
useCustomMainManifest: 0
239+
useCustomLauncherManifest: 0
240+
useCustomMainGradleTemplate: 0
241+
useCustomLauncherGradleManifest: 0
242+
useCustomBaseGradleTemplate: 0
243+
useCustomGradlePropertiesTemplate: 0
244+
useCustomProguardFile: 0
253245
AndroidTargetArchitectures: 1
254246
AndroidTargetDevices: 0
255247
AndroidSplashScreenScale: 0
@@ -269,6 +261,9 @@ PlayerSettings:
269261
banner: {fileID: 0}
270262
androidGamepadSupportLevel: 0
271263
chromeosInputEmulation: 1
264+
AndroidMinifyWithR8: 0
265+
AndroidMinifyRelease: 0
266+
AndroidMinifyDebug: 0
272267
AndroidValidateAppBundleSize: 1
273268
AndroidAppBundleSizeToValidate: 150
274269
m_BuildTargetIcons: []
@@ -406,7 +401,10 @@ PlayerSettings:
406401
m_GraphicsJobMode: 0
407402
- m_BuildTarget: XboxOnePlayer
408403
m_GraphicsJobMode: 0
409-
m_BuildTargetGraphicsAPIs: []
404+
m_BuildTargetGraphicsAPIs:
405+
- m_BuildTarget: iOSSupport
406+
m_APIs: 10000000
407+
m_Automatic: 1
410408
m_BuildTargetVRSettings: []
411409
openGLRequireES31: 0
412410
openGLRequireES31AEP: 0
@@ -418,6 +416,7 @@ PlayerSettings:
418416
tvOS: 1
419417
m_BuildTargetGroupLightmapEncodingQuality: []
420418
m_BuildTargetGroupLightmapSettings: []
419+
m_BuildTargetNormalMapEncoding: []
421420
playModeTestRunnerEnabled: 0
422421
runPlayModeTestAsEditModeTest: 0
423422
actionOnDotNetUnhandledException: 1
@@ -427,12 +426,15 @@ PlayerSettings:
427426
cameraUsageDescription:
428427
locationUsageDescription:
429428
microphoneUsageDescription:
429+
bluetoothUsageDescription:
430+
switchNMETAOverride:
430431
switchNetLibKey:
431432
switchSocketMemoryPoolSize: 6144
432433
switchSocketAllocatorPoolSize: 128
433434
switchSocketConcurrencyLimit: 14
434435
switchScreenResolutionBehavior: 2
435436
switchUseCPUProfiler: 0
437+
switchUseGOLDLinker: 0
436438
switchApplicationID: 0x01004b9000490000
437439
switchNSODependencies:
438440
switchTitleNames_0:
@@ -561,8 +563,12 @@ PlayerSettings:
561563
switchSocketInitializeEnabled: 1
562564
switchNetworkInterfaceManagerInitializeEnabled: 1
563565
switchPlayerConnectionEnabled: 1
566+
switchUseNewStyleFilepaths: 0
567+
switchUseLegacyFmodPriorities: 1
564568
switchUseMicroSleepForYield: 1
569+
switchEnableRamDiskSupport: 0
565570
switchMicroSleepForYieldTime: 25
571+
switchRamDiskSpaceSize: 12
566572
ps4NPAgeRating: 12
567573
ps4NPTitleSecret:
568574
ps4NPTrophyPackPath:
@@ -638,31 +644,6 @@ PlayerSettings:
638644
ps4attribEyeToEyeDistanceSettingVR: 0
639645
ps4IncludedModules: []
640646
ps4attribVROutputEnabled: 0
641-
ps5ParamFilePath:
642-
ps5VideoOutPixelFormat: 0
643-
ps5VideoOutInitialWidth: 1920
644-
ps5VideoOutOutputMode: 1
645-
ps5BackgroundImagePath:
646-
ps5StartupImagePath:
647-
ps5Pic2Path:
648-
ps5StartupImagesFolder:
649-
ps5IconImagesFolder:
650-
ps5SaveDataImagePath:
651-
ps5SdkOverride:
652-
ps5BGMPath:
653-
ps5ShareOverlayImagePath:
654-
ps5NPConfigZipPath:
655-
ps5Passcode: Qj99nsQzldVI5ZuGXbEWRK5RhRXdCdG5
656-
ps5UseResolutionFallback: 0
657-
ps5UseAudio3dBackend: 0
658-
ps5ScriptOptimizationLevel: 2
659-
ps5Audio3dVirtualSpeakerCount: 14
660-
ps5UpdateReferencePackage:
661-
ps5disableAutoHideSplash: 0
662-
ps5OperatingSystemCanDisableSplashScreen: 0
663-
ps5IncludedModules: []
664-
ps5SharedBinaryContentLabels: []
665-
ps5SharedBinarySystemFolders: []
666647
monoEnv:
667648
splashScreenBackgroundSourceLandscape: {fileID: 0}
668649
splashScreenBackgroundSourcePortrait: {fileID: 0}
@@ -679,21 +660,26 @@ PlayerSettings:
679660
webGLAnalyzeBuildSize: 0
680661
webGLUseEmbeddedResources: 0
681662
webGLCompressionFormat: 1
663+
webGLWasmArithmeticExceptions: 0
682664
webGLLinkerTarget: 1
683665
webGLThreadsSupport: 0
684-
webGLWasmStreaming: 0
666+
webGLDecompressionFallback: 0
685667
scriptingDefineSymbols:
686668
1: BUGSNAG_PERFORMANCE
687669
4: BUGSNAG_PERFORMANCE
688670
7: BUGSNAG_PERFORMANCE
689671
13: BUGSNAG_PERFORMANCE
672+
additionalCompilerArguments: {}
690673
platformArchitecture: {}
691674
scriptingBackend: {}
692675
il2cppCompilerConfiguration: {}
693676
managedStrippingLevel: {}
694677
incrementalIl2cppBuild: {}
695678
suppressCommonWarnings: 1
696679
allowUnsafeCode: 0
680+
useDeterministicCompilation: 1
681+
useReferenceAssemblies: 1
682+
enableRoslynAnalyzers: 1
697683
additionalIl2CppArgs:
698684
scriptingRuntimeVersion: 1
699685
gcIncremental: 0
@@ -721,14 +707,14 @@ PlayerSettings:
721707
metroDefaultTileSize: 1
722708
metroTileForegroundText: 2
723709
metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0}
724-
metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628,
725-
a: 1}
710+
metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1}
726711
metroSplashScreenUseBackgroundColor: 0
727712
platformCapabilities: {}
728713
metroTargetDeviceFamilies: {}
729714
metroFTAName:
730715
metroFTAFileTypes: []
731716
metroProtocolName:
717+
vcxProjDefaultLanguage:
732718
XboxOneProductId:
733719
XboxOneUpdateKey:
734720
XboxOneSandboxId:
@@ -756,10 +742,7 @@ PlayerSettings:
756742
XboxOneXTitleMemory: 8
757743
XboxOneOverrideIdentityName:
758744
XboxOneOverrideIdentityPublisher:
759-
vrEditorSettings:
760-
daydream:
761-
daydreamIconForeground: {fileID: 0}
762-
daydreamIconBackground: {fileID: 0}
745+
vrEditorSettings: {}
763746
cloudServicesEnabled: {}
764747
luminIcon:
765748
m_Name:
@@ -773,11 +756,13 @@ PlayerSettings:
773756
m_VersionCode: 1
774757
m_VersionName:
775758
apiCompatibilityLevel: 6
759+
activeInputHandler: 0
760+
windowsGamepadBackendHint: 0
776761
cloudProjectId:
777762
framebufferDepthMemorylessMode: 0
763+
qualitySettingsNames: []
778764
projectName:
779765
organizationId:
780766
cloudEnabled: 0
781-
enableNativePlatformBackendsForNewInputSystem: 0
782-
disableOldInputManagerSupport: 0
783767
legacyClampBlendShapeWeights: 0
768+
virtualTexturingSupportEnabled: 0
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.4.35f1
2-
m_EditorVersionWithRevision: 2019.4.35f1 (0462406dff2e)
1+
m_EditorVersion: 2020.3.48f1
2+
m_EditorVersionWithRevision: 2020.3.48f1 (b805b124c6b7)

Rakefile

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,11 @@ require "rbconfig"
33

44
HOST_OS = RbConfig::CONFIG['host_os']
55

6-
##
7-
#
8-
# Find the directory that Unity has been installed in. This can be set via
9-
# an ENV variable, if this has not been set then it will look in the default
10-
# install location for both windows and mac.
11-
#
126
def unity_directory
13-
147
if ENV.has_key? 'UNITY_PERFORMANCE_VERSION'
158
"/Applications/Unity/Hub/Editor/#{ENV['UNITY_PERFORMANCE_VERSION']}"
16-
elsif ENV.has_key? "UNITY_DIR"
17-
ENV["UNITY_DIR"]
189
else
19-
raise 'No unity directory set - use $UNITY_DIR or $UNITY_PERFORMANCE_VERSION'
10+
raise 'No unity version set - use $UNITY_PERFORMANCE_VERSION'
2011
end
2112
end
2213

@@ -26,8 +17,7 @@ end
2617
#
2718
def unity_executable dir=unity_directory
2819
[File.join(dir, "Unity.app", "Contents", "MacOS", "Unity"),
29-
File.join(dir, "Editor", "Unity"),
30-
File.join(dir, "Editor", "Unity.exe")].find do |unity|
20+
File.join(dir, "Editor", "Unity")].find do |unity|
3121
File.exists? unity
3222
end
3323
end
@@ -42,7 +32,7 @@ def get_required_unity_paths
4232
exe = unity_executable(dir)
4333
raise "No unity executable found in '#{dir}'" if exe.nil?
4434
unless File.exists? exe
45-
raise "Unity not found at path '#{exe}' - set $UNITY_DIR (full path) or $UNITY_PERFORMANCE_VERSION (loaded via hub) to customize"
35+
raise "Unity not found at path '#{exe}'"
4636
end
4737
[dir, exe]
4838
end
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.4.35f1
2-
m_EditorVersionWithRevision: 2019.4.35f1 (0462406dff2e)
1+
m_EditorVersion: 2020.3.48f1
2+
m_EditorVersionWithRevision: 2020.3.48f1 (b805b124c6b7)

features/scripts/build_android.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
#!/usr/bin/env bash
22

3-
if [ -z "$UNITY_PATH" ]
3+
if [ -z "$UNITY_PERFORMANCE_VERSION" ]
44
then
5-
echo "PATH USED $UNITY_PATH"
6-
echo "UNITY_PATH must be set, to e.g. /Applications/Unity/Hub/Editor/2018.4.36f1/Unity.app/Contents/MacOS"
5+
echo "UNITY_PERFORMANCE_VERSION must be set"
76
exit 1
87
fi
98

10-
echo "\`which Unity\`=`which Unity`"
9+
UNITY_PATH="/Applications/Unity/Hub/Editor/$UNITY_PERFORMANCE_VERSION/Unity.app/Contents/MacOS"
10+
11+
echo "\`Unity\` executable = $UNITY_PATH/Unity"
12+
1113

1214
pushd "${0%/*}"
1315
script_path=`pwd`

0 commit comments

Comments
 (0)