Skip to content

Commit edccad6

Browse files
author
Stewart Miles
committed
Fixed JarResolverLib tests following breakage in I843b89ffa6
Updated release notes and for a 1.2.11 build. BUG=34667843 Change-Id: Ic1abab6d35af25236bbf2b40d0d3d411cb3ddca1
1 parent e7bcc04 commit edccad6

23 files changed

+34
-23
lines changed

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# Version 1.2.11 - Jan 30, 2017
2+
## New Features
3+
* Added support for Android Studio builds.
4+
* Added support for native (C/C++) shared libraries in AARs.
5+
6+
# Version 1.2.10 - Jan 11, 2017
7+
## Bug Fixes
8+
* Fixed SDK manager path retrieval.
9+
* Also, report stderr when it's not possible to run the "pod" tool.
10+
* Handle exceptions thrown by Unity.Cecil on asset rename
11+
* Fixed IOSResolver to handle PlayerSettings.iOS.targetOSVersionString
12+
113
# Version 1.2.9 - Dec 7, 2016
214
## Bug Fixes
315
* Improved error reporting when "pod repo update" fails.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ project.ext {
138138
buildPath = file('build').absolutePath
139139
exportPath = file('build/plugin.unitypackage').absolutePath
140140
dllDir = 'Assets/PlayServicesResolver/Editor'
141-
pluginVersion = '1.2.10.0'
141+
pluginVersion = '1.2.11.0'
142142
currentPluginPath = file('.').absolutePath
143143
currentPluginBasename = 'play-services-resolver'
144144
currentPluginName = (currentPluginBasename + '-' + pluginVersion +

exploded/Assets/PlayServicesResolver/Editor.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exploded/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.10.0.dll.meta renamed to exploded/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.11.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.
Binary file not shown.
Binary file not shown.

exploded/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.10.0.dll.meta renamed to exploded/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.11.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_v1.2.10.0.dll.meta renamed to exploded/Assets/PlayServicesResolver/Editor/Google.VersionHandler_v1.2.11.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.10.0.txt

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

exploded/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.10.0.txt.meta renamed to exploded/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.11.0.txt.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-44.9 KB
Binary file not shown.
46.3 KB
Binary file not shown.

plugin/Assets/PlayServicesResolver.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugin/Assets/PlayServicesResolver/Editor.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
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: 1 addition & 1 deletion
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: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugin/Assets/PlayServicesResolver/Editor/play-services-resolver.txt.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

source/JarResolverLib/src/Google.JarResolver/PlayServicesSupport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class PlayServicesSupport
5151
/// <summary>
5252
/// Log function delegate. If set, this class will write log messages via this method.
5353
/// </summary>
54-
private static LogMessage logger;
54+
internal static LogMessage logger;
5555

5656
/// <summary>
5757
/// The repository paths.

source/JarResolverTests/src/Google.JarResolver.Tests/PlayServicesSupportTests.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public static PlayServicesSupport CreateInstance(
104104
var instance = PlayServicesSupport.CreateInstance(
105105
instanceName ?? "testInstance", sdkPath ?? PATH,
106106
additionalRepositories, Path.GetTempPath(), logger: logger ?? Console.WriteLine);
107-
instance.verboseLogging = VERBOSE_LOGGING;
107+
PlayServicesSupport.verboseLogging = VERBOSE_LOGGING;
108108
return instance;
109109
}
110110

@@ -486,10 +486,9 @@ public void TestLogger()
486486
{
487487
List<string> messageList = new List<string>();
488488
string logMessage = "this is a test";
489-
PlayServicesSupport support =
490-
TestData.CreateInstance(logger: (message) => messageList.Add(message));
489+
PlayServicesSupport.logger = (message) => messageList.Add(message);
491490
Assert.AreEqual(0, messageList.Count);
492-
support.Log(logMessage);
491+
PlayServicesSupport.Log(logMessage);
493492
Assert.AreEqual(1, messageList.Count);
494493
Assert.AreEqual(logMessage, messageList[0]);
495494
}

0 commit comments

Comments
 (0)