Skip to content

Commit 46851fd

Browse files
author
Stewart Miles
committed
Fixed duplicate exportpath labels.
Fixed duplicate exportpath labels caused by the integrattion of export_unity_package in I6fbb9da338ee2c29782226e95c17c2e485d191e7. In addition, this change export paths to be calculated relative to the plugin install location (i.e in Assets/ or Packages/) and handle export paths that have Assets/ as the root of their path which is typical for .unitypackage plugins. Change-Id: I4d30d0a6f1f106a60ca871ebbfd13ab1966f1bf9
1 parent 3970bcd commit 46851fd

22 files changed

+75
-44
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ File copyAssetMetadataFile(File sourceFile, File targetFile) {
644644
} else if (exportPathMatch.matches()) {
645645
// Update the export path of the asset.
646646
line = sprintf("%s%s", exportPathMatch.group(1),
647-
targetFile.path.replaceFirst(/.*\/Assets\//, "Assets/"))
647+
targetFile.path.replaceFirst(/.*\/Assets\//, ""))
648648
line = line.substring(0, line.length() -
649649
project.ext.unityMetadataExtension.length())
650650
}

plugin/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.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/ExternalDependencyManager/Editor/Google.IOSResolver.dll.mdb.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/ExternalDependencyManager/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/ExternalDependencyManager/Editor/Google.IOSResolver.pdb.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/ExternalDependencyManager/Editor/Google.JarResolver.dll.mdb.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/ExternalDependencyManager/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/ExternalDependencyManager/Editor/Google.JarResolver.pdb.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/ExternalDependencyManager/Editor/Google.UnityPackageManagerResolver.dll.mdb.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/ExternalDependencyManager/Editor/Google.UnityPackageManagerResolver.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.

0 commit comments

Comments
 (0)