Skip to content

Commit 4143e54

Browse files
author
Stewart Miles
committed
Fixed renaming of Linux libraries with hypen in filename.
Bug: 78794108 Change-Id: I99aa75c48183271ecf1ccd8707e047e8c10c4d05
1 parent 4f1a6db commit 4143e54

24 files changed

+32
-25
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# Version 1.2.66 - April 27, 2017
2+
## Bug Fixes
3+
* Fixed Version Handler renaming of Linux libraries with hypens in filenames.
4+
Previously, libraries named Foo-1.2.3.so were not being renamed to
5+
libFoo-1.2.3.so on Linux which could break native library loading on some
6+
versions of Unity.
7+
18
# Version 1.2.65 - April 26, 2017
29
## Bug Fixes
310
* Fix CocoaPods casing in logs and comments.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ project.ext {
153153
buildPath = file('build').absolutePath
154154
exportPath = file('build/plugin.unitypackage').absolutePath
155155
dllDir = 'Assets/PlayServicesResolver/Editor'
156-
pluginVersion = '1.2.65.0'
156+
pluginVersion = '1.2.66.0'
157157
currentPluginPath = file('.').absolutePath
158158
currentPluginBasename = 'play-services-resolver'
159159
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.65.0.dll.meta renamed to exploded/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.66.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.65.0.dll.meta renamed to exploded/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.66.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.

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.65.0.dll.meta renamed to exploded/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.66.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.65.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.JarResolver_v1.2.66.0.dll
2+
Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll
3+
Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.66.0.dll
4+
Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.66.0.dll

exploded/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.65.0.txt.meta renamed to exploded/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.66.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.

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.PackageManager.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/Google.VersionHandlerImpl.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/VersionHandlerImpl/src/VersionHandlerImpl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ private bool ParseToken(string token, string prefix = null) {
395395
}
396396
values = MatchPrefixesGetValues(token, TOKEN_LINUX_LIBRARY_BASENAME, prefix);
397397
if (values != null) {
398-
linuxLibraryBasename = values[0];
398+
linuxLibraryBasename = String.Join(FIELD_SEPARATOR[0].ToString(), values);
399399
return true;
400400
}
401401
return false;

0 commit comments

Comments
 (0)