Skip to content

Commit 16c9753

Browse files
author
Stewart Miles
committed
Fixed exception in OnPostProcessScene() when Android is not selected.
Change-Id: I3cbacfdca896a570f13234f661bbb888e1c03c98
1 parent bc4c345 commit 16c9753

19 files changed

+29
-24
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Version 1.2.86 - Aug 22, 2018
2+
## Bug Fixes
3+
* Fixed Android Resolver exception in OnPostProcessScene() when the Android
4+
platform isn't selected.
5+
16
# Version 1.2.85 - Aug 17, 2018
27
## Changes
38
* Added support for synchronous resolution in the Android Resolver.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ project.ext {
188188
// Solution which references all projects used by the plugin.
189189
pluginSolutionFile = new File(pluginSourceDir, "JarResolver.sln")
190190
// Version of the plugin (update this with CHANGELOG.md on each release).
191-
pluginVersion = "1.2.85.0"
191+
pluginVersion = "1.2.86.0"
192192
// Base filename of the released plugin.
193193
currentPluginBasename = "play-services-resolver"
194194
// Versioned release plugin file.

exploded/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.85.0.dll.meta renamed to exploded/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.86.0.dll.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exploded/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.85.0.dll.meta renamed to exploded/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.86.0.dll.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exploded/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exploded/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.85.0.dll.meta renamed to exploded/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.86.0.dll.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exploded/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.85.0.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.86.0.dll
2+
Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.86.0.dll
3+
Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll
4+
Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.86.0.dll

exploded/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.85.0.txt.meta renamed to exploded/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.86.0.txt.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-174 KB
Binary file not shown.
174 KB
Binary file not shown.

plugin/Assets/PlayServicesResolver/Editor/Google.IOSResolver.dll.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugin/Assets/PlayServicesResolver/Editor/Google.JarResolver.dll.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugin/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugin/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl.dll.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

source/PlayServicesResolver/src/PlayServicesResolver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ private static void OnPostprocessAllAssets(string[] importedAssets,
822822
/// </summary>
823823
[UnityEditor.Callbacks.PostProcessSceneAttribute(0)]
824824
private static void OnPostProcessScene() {
825-
if (Resolver.AutomaticResolutionEnabled()) {
825+
if (Resolver != null && Resolver.AutomaticResolutionEnabled()) {
826826
Log("Starting auto-resolution before scene build...");
827827
bool success = ResolveSync(false);
828828
Log(String.Format("Android resolution {0}.", success ? "succeeded" : "failed"),

0 commit comments

Comments
 (0)