diff --git a/CHANGELOG.md b/CHANGELOG.md index 80f13fa1..e1294a3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Version 1.2.186 - May 19, 2025 +* iOS Resolver - Set `validateReferences` to off by default, + to prevent errors when running without iOS Support installed. + Fixes #412 and #622 + +# Version 1.2.185 - Feb 3, 2025 +* Android Resolver - Reverse conditional checker for `packaging` keyword in maintemplate based on android gradle plugin version. Fixes #715 + # Version 1.2.184 - Jan 28, 2025 * Android Resolver - Update and resolve `packaging` keyword in maintemplate based on android gradle plugin version. diff --git a/build.gradle b/build.gradle index 538990ac..cb824eac 100644 --- a/build.gradle +++ b/build.gradle @@ -255,7 +255,7 @@ project.ext { // Directory for testing. testDir = new File(scriptDirectory, "test_output") // Version of the plugin (update this with CHANGELOG.md on each release). - pluginVersion = "1.2.184" + pluginVersion = "1.2.186" // Directory that contains the template plugin. // Files under this directory are copied into the staging area for the // plugin. diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb deleted file mode 100644 index 585c9f2e..00000000 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb and /dev/null differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll similarity index 59% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll index d013e467..30030559 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll.meta similarity index 79% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll.meta index 0a8679d1..707c589b 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 59af55ec98c34b8d92e48d7184a21ec5 +guid: e2d7ea0845de4cf984265d2a444b7aa4 labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll - gvh - gvhp_targets-editor PluginImporter: @@ -12,6 +12,7 @@ PluginImporter: executionOrder: {} isPreloaded: 0 isOverridable: 0 + validateReferences: 0 platformData: - first: Any: diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb new file mode 100644 index 00000000..493d3b28 Binary files /dev/null and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb.meta similarity index 57% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb.meta index 60a02247..e6b1e059 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: e0dd26d694634a11a15aa1a8e9066545 +guid: baf24db2bf904e729e7796721c09e8ad labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll similarity index 99% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll index ca463bb8..645d5cd3 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll.meta similarity index 82% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll.meta index 70cfe7ae..a1398e9f 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: df91cbc3889f448ab56989da8283a95d +guid: fa49a85d4ba140a0ae21528ed12d174c labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb old mode 100755 new mode 100644 similarity index 99% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb index a8670d1b..c6eaef49 Binary files a/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb.meta similarity index 57% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb.meta index 8a553cec..12826037 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: e3777e7740314f9aa06e94be0c7e8268 +guid: d13c8602d5e14e43b0e92459754c4315 labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll similarity index 98% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll index 30d30658..a4a6590c 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll.meta similarity index 82% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll.meta index eb79a088..3b4fa84b 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 37e6baea45a44a6988cf105fd1bfb9f4 +guid: d8bb10c56a0147bc855a6296778e025e labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb similarity index 98% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb index 5a2b4b42..884ce212 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb.meta similarity index 58% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb.meta index 198672a1..ac071adc 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 544f4bc649714c569504690d8157de4b +guid: a695eb9f64fe49569a2db0c4246c877d labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll old mode 100755 new mode 100644 similarity index 98% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll index 74d8d53f..8562ef33 Binary files a/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll.meta similarity index 82% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll.meta index 8564543a..7456068f 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: e31c9800508f44c1afe7d26ac66250b2 +guid: 5980a684c61d42fbb6b74e2eb3477016 labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb old mode 100755 new mode 100644 similarity index 99% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb index 150fc7ea..ed8cc976 Binary files a/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb.meta similarity index 58% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb.meta index cfd3238b..da5b09b2 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: d50b2177ae7c4abf8ad799c0b3e13672 +guid: 9f56badf3ca84753b00163c3b632d4e5 labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md b/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md index 80f13fa1..e1294a3a 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md +++ b/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md @@ -1,3 +1,11 @@ +# Version 1.2.186 - May 19, 2025 +* iOS Resolver - Set `validateReferences` to off by default, + to prevent errors when running without iOS Support installed. + Fixes #412 and #622 + +# Version 1.2.185 - Feb 3, 2025 +* Android Resolver - Reverse conditional checker for `packaging` keyword in maintemplate based on android gradle plugin version. Fixes #715 + # Version 1.2.184 - Jan 28, 2025 * Android Resolver - Update and resolve `packaging` keyword in maintemplate based on android gradle plugin version. diff --git a/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta index 2aa655df..e5662a98 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: af66966cf1cf49089946f210b64185b7 +guid: aba4ee01c6d145f7bf2d944d892f709a labels: -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/CHANGELOG.md - gvh timeCreated: 1584567712 diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll index 430c3483..12c150e2 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll and b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta index c3968935..3babd47f 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: c7751ebdcb3d4f0b9cbc0741eb1e683f +guid: f7632a50b10045458c53a5ddf7b6d238 labels: -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll - gvh - gvhp_targets-editor diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta index fa11eee6..0b461abd 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 16ad47774cbe4f31a43e79fa12bde626 +guid: 57f5a82a79ab4b098f09326c8f3c73a6 labels: -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.pdb - gvh timeCreated: 1538009133 diff --git a/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta index 4b59ae0d..30482451 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 6926d2080b8848628f6755943ad6eecd +guid: ae8b2bc8d1ac4ad48f0ab2b2e7ac75fb labels: -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE - gvh timeCreated: 1584567712 diff --git a/exploded/Assets/ExternalDependencyManager/Editor/README.md.meta b/exploded/Assets/ExternalDependencyManager/Editor/README.md.meta index f1cce97f..6bcc2245 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/README.md.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/README.md.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 1a8431cde2d446ff9ad317b5a26dbf06 +guid: 77919e84cef8419ab4b725fc16e83d52 labels: -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/README.md - gvh timeCreated: 1584567712 diff --git a/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt b/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt deleted file mode 100644 index 9a0772c7..00000000 --- a/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt +++ /dev/null @@ -1,13 +0,0 @@ -Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll -Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb -Assets/ExternalDependencyManager/Editor/CHANGELOG.md -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb -Assets/ExternalDependencyManager/Editor/LICENSE -Assets/ExternalDependencyManager/Editor/README.md diff --git a/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt b/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt new file mode 100644 index 00000000..81c97ed6 --- /dev/null +++ b/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt @@ -0,0 +1,13 @@ +Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb +Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb +Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb +Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll +Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb +Assets/ExternalDependencyManager/Editor/CHANGELOG.md +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb +Assets/ExternalDependencyManager/Editor/LICENSE +Assets/ExternalDependencyManager/Editor/README.md diff --git a/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt.meta b/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt.meta similarity index 75% rename from exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt.meta rename to exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt.meta index cee150c6..a36e708a 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: b9f8b541191d4eb79499c0b8258dd645 +guid: c9a3138961c74d99b7046b783112fceb labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt - gvh - gvh_manifest - gvhp_manifestname-0External Dependency Manager diff --git a/export_unity_package_guids.json b/export_unity_package_guids.json index eb0105a9..59c045f4 100644 --- a/export_unity_package_guids.json +++ b/export_unity_package_guids.json @@ -63,5 +63,11 @@ }, "1.2.184": { "com.google.external-dependency-manager/ExternalDependencyManager/Editor/1.2.184": "297013161bc34ce4ac7b8ffba2384862" + }, + "1.2.185": { + "com.google.external-dependency-manager/ExternalDependencyManager/Editor/1.2.185": "eb66eed64a99451d81abd63ff417f837" + }, + "1.2.186": { + "com.google.external-dependency-manager/ExternalDependencyManager/Editor/1.2.186": "8a6a9bd2649d4370b43be75e1689748c" } } diff --git a/external-dependency-manager-1.2.184.unitypackage b/external-dependency-manager-1.2.184.unitypackage deleted file mode 100644 index 1f9e82f2..00000000 Binary files a/external-dependency-manager-1.2.184.unitypackage and /dev/null differ diff --git a/external-dependency-manager-1.2.186.unitypackage b/external-dependency-manager-1.2.186.unitypackage new file mode 100644 index 00000000..37e58cd2 Binary files /dev/null and b/external-dependency-manager-1.2.186.unitypackage differ diff --git a/external-dependency-manager-latest.unitypackage b/external-dependency-manager-latest.unitypackage index 1f9e82f2..37e58cd2 100644 Binary files a/external-dependency-manager-latest.unitypackage and b/external-dependency-manager-latest.unitypackage differ diff --git a/plugin/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/plugin/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta index 2aa655df..e5662a98 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: af66966cf1cf49089946f210b64185b7 +guid: aba4ee01c6d145f7bf2d944d892f709a labels: -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/CHANGELOG.md - gvh timeCreated: 1584567712 diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta index 0a8679d1..707c589b 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 59af55ec98c34b8d92e48d7184a21ec5 +guid: e2d7ea0845de4cf984265d2a444b7aa4 labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll - gvh - gvhp_targets-editor PluginImporter: @@ -12,6 +12,7 @@ PluginImporter: executionOrder: {} isPreloaded: 0 isOverridable: 0 + validateReferences: 0 platformData: - first: Any: diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.pdb.meta index 60a02247..e6b1e059 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.pdb.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: e0dd26d694634a11a15aa1a8e9066545 +guid: baf24db2bf904e729e7796721c09e8ad labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.dll.meta index 70cfe7ae..a1398e9f 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.dll.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: df91cbc3889f448ab56989da8283a95d +guid: fa49a85d4ba140a0ae21528ed12d174c labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.pdb.meta index 8a553cec..12826037 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.pdb.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: e3777e7740314f9aa06e94be0c7e8268 +guid: d13c8602d5e14e43b0e92459754c4315 labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.dll.meta index eb79a088..3b4fa84b 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.dll.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 37e6baea45a44a6988cf105fd1bfb9f4 +guid: d8bb10c56a0147bc855a6296778e025e labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.pdb.meta index 198672a1..ac071adc 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.pdb.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 544f4bc649714c569504690d8157de4b +guid: a695eb9f64fe49569a2db0c4246c877d labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta index c3968935..3babd47f 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: c7751ebdcb3d4f0b9cbc0741eb1e683f +guid: f7632a50b10045458c53a5ddf7b6d238 labels: -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll - gvh - gvhp_targets-editor diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta index fa11eee6..0b461abd 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 16ad47774cbe4f31a43e79fa12bde626 +guid: 57f5a82a79ab4b098f09326c8f3c73a6 labels: -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.pdb - gvh timeCreated: 1538009133 diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.dll.meta index 8564543a..7456068f 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.dll.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: e31c9800508f44c1afe7d26ac66250b2 +guid: 5980a684c61d42fbb6b74e2eb3477016 labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.pdb.meta index cfd3238b..da5b09b2 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.pdb.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: d50b2177ae7c4abf8ad799c0b3e13672 +guid: 9f56badf3ca84753b00163c3b632d4e5 labels: -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/plugin/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/plugin/Assets/ExternalDependencyManager/Editor/LICENSE.meta index 4b59ae0d..30482451 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/LICENSE.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/LICENSE.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 6926d2080b8848628f6755943ad6eecd +guid: ae8b2bc8d1ac4ad48f0ab2b2e7ac75fb labels: -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE - gvh timeCreated: 1584567712 diff --git a/plugin/Assets/ExternalDependencyManager/Editor/README.md.meta b/plugin/Assets/ExternalDependencyManager/Editor/README.md.meta index f1cce97f..6bcc2245 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/README.md.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/README.md.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 1a8431cde2d446ff9ad317b5a26dbf06 +guid: 77919e84cef8419ab4b725fc16e83d52 labels: -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/README.md - gvh timeCreated: 1584567712 diff --git a/source/AndroidResolver/src/PlayServicesResolver.cs b/source/AndroidResolver/src/PlayServicesResolver.cs index 569c7995..e4f7d40e 100644 --- a/source/AndroidResolver/src/PlayServicesResolver.cs +++ b/source/AndroidResolver/src/PlayServicesResolver.cs @@ -2354,7 +2354,7 @@ internal static IList PackagingOptionsLines(ICollection depe lines.Add("android {"); // `packagingOptions` is replaced by `packaging` keyword in Android Gradle plugin 8.0+ - if ((new Dependency.VersionComparer()).Compare("8.0", AndroidGradlePluginVersion) <= 0) { + if ((new Dependency.VersionComparer()).Compare("8.0", AndroidGradlePluginVersion) >= 0) { lines.Add(" packaging {"); } else { lines.Add(" packagingOptions {"); diff --git a/source/AndroidResolver/src/VersionNumber.cs b/source/AndroidResolver/src/VersionNumber.cs index 9355eecf..5309b99f 100644 --- a/source/AndroidResolver/src/VersionNumber.cs +++ b/source/AndroidResolver/src/VersionNumber.cs @@ -27,7 +27,7 @@ public class AndroidResolverVersionNumber { /// /// Version number, patched by the build process. /// - private const string VERSION_STRING = "1.2.184"; + private const string VERSION_STRING = "1.2.186"; /// /// Cached version structure. diff --git a/source/ExportUnityPackage/export_unity_package.py b/source/ExportUnityPackage/export_unity_package.py index 10c5651f..b8f16b5a 100755 --- a/source/ExportUnityPackage/export_unity_package.py +++ b/source/ExportUnityPackage/export_unity_package.py @@ -1851,6 +1851,10 @@ def importer_metadata(self): if "Android" in platforms and cpu_string != "AnyCPU": importer_metadata = Asset.set_cpu_for_android( importer_metadata, cpu_string) + # Set validateReferences, if requested, which should be either 0 or 1 + validateRef = safe_dict_get_value(self._json, "validateReferences", default_value=2) + if validateRef == 0 or validateRef == 1: + importer_metadata["PluginImporter"]["validateReferences"] = validateRef else: raise ProjectConfigurationError( "Unknown importer type %s for package %s, paths %s" % ( diff --git a/source/IOSResolver/src/IOSResolver.cs b/source/IOSResolver/src/IOSResolver.cs index ea312fde..a272810e 100644 --- a/source/IOSResolver/src/IOSResolver.cs +++ b/source/IOSResolver/src/IOSResolver.cs @@ -843,25 +843,41 @@ public static void SettingsDialog() { /// internal static bool MultipleXcodeTargetsSupported { get { - return typeof(UnityEditor.iOS.Xcode.PBXProject).GetMethod( - "GetUnityMainTargetGuid", Type.EmptyTypes) != null; + try { + return MultipleXcodeTargetsSupportedInternal(); + } catch (Exception e) { + return false; + } } } + private static bool MultipleXcodeTargetsSupportedInternal() { + return typeof(UnityEditor.iOS.Xcode.PBXProject).GetMethod( + "GetUnityMainTargetGuid", Type.EmptyTypes) != null; + } + /// /// Name of the Xcode main target generated by Unity. /// public static string XcodeMainTargetName { get { - // NOTE: Unity-iPhone is hard coded in UnityEditor.iOS.Xcode.PBXProject and will no - // longer be exposed via GetUnityTargetName(). It hasn't changed in many years though - // so we'll use this constant as a relatively safe default. - return MultipleXcodeTargetsSupported ? "Unity-iPhone" : - (string)VersionHandler.InvokeStaticMethod(typeof(UnityEditor.iOS.Xcode.PBXProject), - "GetUnityTargetName", null); + try { + return XcodeMainTargetNameInternal(); + } catch (Exception e) { + return "Unity-iPhone"; + } } } + private static string XcodeMainTargetNameInternal() { + // NOTE: Unity-iPhone is hard coded in UnityEditor.iOS.Xcode.PBXProject and will no + // longer be exposed via GetUnityTargetName(). It hasn't changed in many years though + // so we'll use this constant as a relatively safe default. + return MultipleXcodeTargetsSupported ? "Unity-iPhone" : + (string)VersionHandler.InvokeStaticMethod(typeof(UnityEditor.iOS.Xcode.PBXProject), + "GetUnityTargetName", null); + } + /// /// Name of the Xcode UnityFramework target generated by Unity 2019.3+ /// diff --git a/source/IOSResolver/src/VersionNumber.cs b/source/IOSResolver/src/VersionNumber.cs index d441f9fd..c9f3afa8 100644 --- a/source/IOSResolver/src/VersionNumber.cs +++ b/source/IOSResolver/src/VersionNumber.cs @@ -27,7 +27,7 @@ public class IOSResolverVersionNumber { /// /// Version number, patched by the build process. /// - private const string VERSION_STRING = "1.2.184"; + private const string VERSION_STRING = "1.2.186"; /// /// Cached version structure. diff --git a/source/PackageManagerResolver/src/VersionNumber.cs b/source/PackageManagerResolver/src/VersionNumber.cs index 529d5074..d112d2be 100644 --- a/source/PackageManagerResolver/src/VersionNumber.cs +++ b/source/PackageManagerResolver/src/VersionNumber.cs @@ -27,7 +27,7 @@ public class PackageManagerResolverVersionNumber { /// /// Version number, patched by the build process. /// - private const string VERSION_STRING = "1.2.184"; + private const string VERSION_STRING = "1.2.186"; /// /// Cached version structure. diff --git a/source/VersionHandlerImpl/src/VersionNumber.cs b/source/VersionHandlerImpl/src/VersionNumber.cs index f1f5f8cb..58c6f697 100644 --- a/source/VersionHandlerImpl/src/VersionNumber.cs +++ b/source/VersionHandlerImpl/src/VersionNumber.cs @@ -27,7 +27,7 @@ public class VersionHandlerVersionNumber { /// /// Version number, patched by the build process. /// - private const string VERSION_STRING = "1.2.184"; + private const string VERSION_STRING = "1.2.186"; /// /// Cached version structure. diff --git a/upm/CHANGELOG.md b/upm/CHANGELOG.md index 80f13fa1..e1294a3a 100755 --- a/upm/CHANGELOG.md +++ b/upm/CHANGELOG.md @@ -1,3 +1,11 @@ +# Version 1.2.186 - May 19, 2025 +* iOS Resolver - Set `validateReferences` to off by default, + to prevent errors when running without iOS Support installed. + Fixes #412 and #622 + +# Version 1.2.185 - Feb 3, 2025 +* Android Resolver - Reverse conditional checker for `packaging` keyword in maintemplate based on android gradle plugin version. Fixes #715 + # Version 1.2.184 - Jan 28, 2025 * Android Resolver - Update and resolve `packaging` keyword in maintemplate based on android gradle plugin version. diff --git a/upm/CHANGELOG.md.meta b/upm/CHANGELOG.md.meta index 2c34fbda..88b8b785 100644 --- a/upm/CHANGELOG.md.meta +++ b/upm/CHANGELOG.md.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: dd6a29a412594aadb37d9698db325eca labels: - gvh -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-CHANGELOG.md timeCreated: 0 diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb b/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb deleted file mode 100755 index 585c9f2e..00000000 Binary files a/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb and /dev/null differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.184.meta b/upm/ExternalDependencyManager/Editor/1.2.186.meta similarity index 77% rename from upm/ExternalDependencyManager/Editor/1.2.184.meta rename to upm/ExternalDependencyManager/Editor/1.2.186.meta index 1134f43f..c9cc4f8b 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.184.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 297013161bc34ce4ac7b8ffba2384862 +guid: 8a6a9bd2649d4370b43be75e1689748c timeCreated: 1480838400 folderAsset: true DefaultImporter: diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll b/upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll similarity index 59% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll index d013e467..30030559 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll.meta b/upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll.meta similarity index 80% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll.meta index ac73472a..fe84d30d 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 59af55ec98c34b8d92e48d7184a21ec5 +guid: e2d7ea0845de4cf984265d2a444b7aa4 labels: - gvh -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll - gvhp_targets-editor timeCreated: 1480838400 PluginImporter: @@ -13,6 +13,7 @@ PluginImporter: executionOrder: {} isPreloaded: 0 isOverridable: 0 + validateReferences: 0 platformData: - first: Any: diff --git a/upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb b/upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb new file mode 100755 index 00000000..493d3b28 Binary files /dev/null and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb.meta b/upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb.meta similarity index 69% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb.meta index 014ca251..ab8ef649 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: e0dd26d694634a11a15aa1a8e9066545 +guid: baf24db2bf904e729e7796721c09e8ad labels: - gvh -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb - gvhp_targets-editor timeCreated: 1538009133 licenseType: Pro diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll similarity index 99% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll index ca463bb8..645d5cd3 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll.meta b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll.meta similarity index 82% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll.meta index 19bb0e7f..b3831d2a 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: df91cbc3889f448ab56989da8283a95d +guid: fa49a85d4ba140a0ae21528ed12d174c labels: - gvh -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll - gvhp_targets-editor timeCreated: 1480838400 PluginImporter: diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb old mode 100644 new mode 100755 similarity index 99% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb index a8670d1b..c6eaef49 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb.meta b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb.meta similarity index 69% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb.meta index 3489b406..d8895653 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: e3777e7740314f9aa06e94be0c7e8268 +guid: d13c8602d5e14e43b0e92459754c4315 labels: - gvh -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb - gvhp_targets-editor timeCreated: 1538009133 licenseType: Pro diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll similarity index 98% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll index 30d30658..a4a6590c 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll.meta b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll.meta similarity index 83% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll.meta index 2efa6a69..260efc5e 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 37e6baea45a44a6988cf105fd1bfb9f4 +guid: d8bb10c56a0147bc855a6296778e025e labels: - gvh -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll - gvhp_targets-editor timeCreated: 1480838400 PluginImporter: diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb similarity index 98% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb index 5a2b4b42..884ce212 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb.meta b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb.meta similarity index 69% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb.meta index 790022eb..e08c8e68 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 544f4bc649714c569504690d8157de4b +guid: a695eb9f64fe49569a2db0c4246c877d labels: - gvh -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb - gvhp_targets-editor timeCreated: 1538009133 licenseType: Pro diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll old mode 100644 new mode 100755 similarity index 98% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll index 74d8d53f..8562ef33 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll.meta b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll.meta similarity index 83% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll.meta index 357244fb..a3e0b420 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: e31c9800508f44c1afe7d26ac66250b2 +guid: 5980a684c61d42fbb6b74e2eb3477016 labels: - gvh -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll - gvhp_targets-editor timeCreated: 1480838400 PluginImporter: diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb old mode 100644 new mode 100755 similarity index 99% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb index 150fc7ea..ed8cc976 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb.meta b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb.meta similarity index 69% rename from upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb.meta index ebb0325f..cb5d8ef5 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: d50b2177ae7c4abf8ad799c0b3e13672 +guid: 9f56badf3ca84753b00163c3b632d4e5 labels: - gvh -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb - gvhp_targets-editor timeCreated: 1538009133 licenseType: Pro diff --git a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll index 430c3483..12c150e2 100755 Binary files a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll and b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll differ diff --git a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta index 1af795ea..b43088d1 100644 --- a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta +++ b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: c7751ebdcb3d4f0b9cbc0741eb1e683f +guid: f7632a50b10045458c53a5ddf7b6d238 labels: - gvh -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll - gvhp_targets-editor timeCreated: 1480838400 diff --git a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta index 28ad1d5a..d4a34e05 100644 --- a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 16ad47774cbe4f31a43e79fa12bde626 +guid: 57f5a82a79ab4b098f09326c8f3c73a6 labels: - gvh -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.pdb timeCreated: 1538009133 licenseType: Pro diff --git a/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt b/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt deleted file mode 100755 index 9a0772c7..00000000 --- a/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt +++ /dev/null @@ -1,13 +0,0 @@ -Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll -Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb -Assets/ExternalDependencyManager/Editor/CHANGELOG.md -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb -Assets/ExternalDependencyManager/Editor/LICENSE -Assets/ExternalDependencyManager/Editor/README.md diff --git a/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt b/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt new file mode 100755 index 00000000..81c97ed6 --- /dev/null +++ b/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt @@ -0,0 +1,13 @@ +Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb +Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb +Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb +Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll +Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb +Assets/ExternalDependencyManager/Editor/CHANGELOG.md +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb +Assets/ExternalDependencyManager/Editor/LICENSE +Assets/ExternalDependencyManager/Editor/README.md diff --git a/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt.meta b/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt.meta similarity index 75% rename from upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt.meta rename to upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt.meta index 571439c2..dca3f95f 100644 --- a/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt.meta +++ b/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: b9f8b541191d4eb79499c0b8258dd645 +guid: c9a3138961c74d99b7046b783112fceb labels: - gvh - gvh_manifest -- gvh_version-1.2.184 -- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt +- gvh_version-1.2.186 +- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt - gvhp_manifestname-0External Dependency Manager - gvhp_manifestname-play-services-resolver timeCreated: 1474401009 diff --git a/upm/LICENSE.md.meta b/upm/LICENSE.md.meta index 57ccdcf4..e3344950 100644 --- a/upm/LICENSE.md.meta +++ b/upm/LICENSE.md.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: f61a1c8e753b496bb696e77d7eedfb95 labels: - gvh -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-LICENSE.md timeCreated: 0 diff --git a/upm/README.md.meta b/upm/README.md.meta index fa5d29ad..a768cca5 100644 --- a/upm/README.md.meta +++ b/upm/README.md.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: cbbebcaa6ecb4b9582dce440a386de75 labels: - gvh -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-README.md timeCreated: 0 diff --git a/upm/package.json b/upm/package.json index 344ef081..6d0b27ea 100755 --- a/upm/package.json +++ b/upm/package.json @@ -1,6 +1,6 @@ { "name": "com.google.external-dependency-manager", - "version": "1.2.184", + "version": "1.2.186", "displayName": "External Dependency Manager for Unity", "keywords": [ "Google", diff --git a/upm/package.json.meta b/upm/package.json.meta index f4e5b61f..f5581030 100644 --- a/upm/package.json.meta +++ b/upm/package.json.meta @@ -3,6 +3,6 @@ guid: 9bed450d5c03481d87e61b61431cf00a labels: - gupmr_manifest - gvh -- gvh_version-1.2.184 +- gvh_version-1.2.186 - gvhp_exportpath-package.json timeCreated: 0