diff --git a/.github/workflows/build_macos.yaml b/.github/workflows/build_macos.yaml index 637153cb..48a8b97f 100644 --- a/.github/workflows/build_macos.yaml +++ b/.github/workflows/build_macos.yaml @@ -33,7 +33,7 @@ env: jobs: build_desktop: name: build-macOS-unity${{ inputs.unity_version}} - runs-on: macos-latest + runs-on: macos-13 strategy: fail-fast: false @@ -55,6 +55,10 @@ jobs: shell: bash run: echo "UNITY_EXE=${{ env.UNITY_ROOT_DIR }}/Unity.app/Contents/MacOS/Unity" >> $GITHUB_ENV + - name: Force Java 8 + shell: bash + run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + # Build .unitypackage - run: ./gradlew buildPlugin --info diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e6088361..a2bff30f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -107,7 +107,7 @@ jobs: test_on_macos: name: test-macOS-unity${{ needs.check_and_prepare.outputs.unity_version }} - runs-on: macos-latest + runs-on: macos-13 needs: [check_and_prepare] strategy: fail-fast: false @@ -128,6 +128,10 @@ jobs: shell: bash run: echo "UNITY_EXE=${{ env.UNITY_ROOT_DIR }}/Unity.app/Contents/MacOS/Unity" >> $GITHUB_ENV + - name: Force Java 8 + shell: bash + run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV + - name: Run tests shell: bash timeout-minutes: 60 diff --git a/CHANGELOG.md b/CHANGELOG.md index f00a1163..e1294a3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,34 @@ +# 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. + Fixes #715 + +# Version 1.2.183 - Sep 18, 2024 +* Android Resolver - Handle package paths that don't include a version hash, + which is no longer present with Unity 6. Fixes #697 +* Android Resolver - Handle packages referenced using local file paths. + Fixes #701 + +# Version 1.2.182 - Aug 2, 2024 +* General - Check for gradle version instead of Unity version when determining + the template files to modify. + +# Version 1.2.181 - Jun 26, 2024 +* General - Disable `EditorMeasurement` reporting that relied on the + Measurement Protocol for Universal Analytics. + +# Version 1.2.180 - Jun 4, 2024 +* General - Fix project settings resetting on domain reload. + Fixes #524 + # Version 1.2.179 - Feb 12, 2024 * Android Resolver - Added logic to automatically turn on `mainTemplate.gradle` for new projects, and prompt users to enable it on projects that have previously diff --git a/README.md b/README.md index 3a7a5a26..a9aafe9f 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,12 @@ EDM4U is available on openupm add com.google.external-dependency-manager ``` +### Install via git URL +1. Open Package Manager +2. Click on the + icon on the top left corner of the "Package Manager" screen +3. Click on "Install package from git url..." +4. Paste: https://github.com/googlesamples/unity-jar-resolver.git?path=upm + ### Install via Google APIs for Unity EDM4U is available both in UPM and legacy `.unitypackage` formats on diff --git a/build.gradle b/build.gradle index 92930162..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.179" + 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.179/Google.IOSResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.pdb deleted file mode 100644 index b317099b..00000000 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.pdb and /dev/null differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll deleted file mode 100644 index 57f7a07c..00000000 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll and /dev/null differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.pdb deleted file mode 100644 index e1f05052..00000000 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.pdb and /dev/null differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll similarity index 60% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll index 182b402c..30030559 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/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.179/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.179/Google.IOSResolver.dll.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll.meta index 2c9389aa..707c589b 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 052fc6841b304ce4801cd850704efc6b +guid: e2d7ea0845de4cf984265d2a444b7aa4 labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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.179/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.179/Google.IOSResolver.pdb.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb.meta index 26245d5b..e6b1e059 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 72d829fda5384bd58e7ba8d9b64c3744 +guid: baf24db2bf904e729e7796721c09e8ad labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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.179/Google.JarResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll similarity index 71% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll index 123881fb..645d5cd3 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/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.179/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.179/Google.JarResolver.dll.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll.meta index 2ee01bfe..a1398e9f 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: f8c5c28ca63d4b998365d84dd183658d +guid: fa49a85d4ba140a0ae21528ed12d174c labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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.179/Google.JarResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb old mode 100755 new mode 100644 similarity index 50% rename from upm/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.pdb rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb index c33702a9..c6eaef49 Binary files a/upm/ExternalDependencyManager/Editor/1.2.179/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.179/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.179/Google.JarResolver.pdb.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb.meta index bbd158a3..12826037 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: a57af131f256420bba8f15a4ee00e496 +guid: d13c8602d5e14e43b0e92459754c4315 labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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.179/Google.PackageManagerResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll similarity index 64% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll index c2a0c343..a4a6590c 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/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.179/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.179/Google.PackageManagerResolver.dll.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll.meta index ff01cc55..3b4fa84b 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: a22e43395e864125aec54dc456a4eda0 +guid: d8bb10c56a0147bc855a6296778e025e labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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.179/Google.PackageManagerResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb similarity index 73% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.pdb rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb index f964b211..884ce212 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/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.179/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.179/Google.PackageManagerResolver.pdb.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb.meta index 5834d6df..ac071adc 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 11e143a4c758469096247a6cf38e53c3 +guid: a695eb9f64fe49569a2db0c4246c877d labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll new file mode 100644 index 00000000..8562ef33 Binary files /dev/null and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/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.179/Google.VersionHandlerImpl.dll.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll.meta index dd7fd95c..7456068f 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 76d0a5f5ee7f4a72a3d2de688e3bd51a +guid: 5980a684c61d42fbb6b74e2eb3477016 labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb new file mode 100644 index 00000000..ed8cc976 Binary files /dev/null and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/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.179/Google.VersionHandlerImpl.pdb.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb.meta index 7fe143cb..da5b09b2 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: d43c890d3efe4d338e0573a21b29e18b +guid: 9f56badf3ca84753b00163c3b632d4e5 labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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 f00a1163..e1294a3a 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md +++ b/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md @@ -1,3 +1,34 @@ +# 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. + Fixes #715 + +# Version 1.2.183 - Sep 18, 2024 +* Android Resolver - Handle package paths that don't include a version hash, + which is no longer present with Unity 6. Fixes #697 +* Android Resolver - Handle packages referenced using local file paths. + Fixes #701 + +# Version 1.2.182 - Aug 2, 2024 +* General - Check for gradle version instead of Unity version when determining + the template files to modify. + +# Version 1.2.181 - Jun 26, 2024 +* General - Disable `EditorMeasurement` reporting that relied on the + Measurement Protocol for Universal Analytics. + +# Version 1.2.180 - Jun 4, 2024 +* General - Fix project settings resetting on domain reload. + Fixes #524 + # Version 1.2.179 - Feb 12, 2024 * Android Resolver - Added logic to automatically turn on `mainTemplate.gradle` for new projects, and prompt users to enable it on projects that have previously diff --git a/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta index ed3df93d..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: a8d928a6df80469ab6cd8eca7bf6d273 +guid: aba4ee01c6d145f7bf2d944d892f709a labels: -- gvh_version-1.2.179 +- 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 0703ad01..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 b5ee7f1b..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: efd2c569f89a449498a0c946cd37a752 +guid: f7632a50b10045458c53a5ddf7b6d238 labels: -- gvh_version-1.2.179 +- 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 b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb index 8e7e00bb..7dd02af5 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb and b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta index d46f7562..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: 17cab50d346c4431bb94bd6348328706 +guid: 57f5a82a79ab4b098f09326c8f3c73a6 labels: -- gvh_version-1.2.179 +- 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 cd17e6ff..30482451 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 9be3e4155c3148d298ad390b9db89273 +guid: ae8b2bc8d1ac4ad48f0ab2b2e7ac75fb labels: -- gvh_version-1.2.179 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE - gvh timeCreated: 1584567712 diff --git a/exploded/Assets/ExternalDependencyManager/Editor/README.md b/exploded/Assets/ExternalDependencyManager/Editor/README.md index 3a7a5a26..a9aafe9f 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/README.md +++ b/exploded/Assets/ExternalDependencyManager/Editor/README.md @@ -72,6 +72,12 @@ EDM4U is available on openupm add com.google.external-dependency-manager ``` +### Install via git URL +1. Open Package Manager +2. Click on the + icon on the top left corner of the "Package Manager" screen +3. Click on "Install package from git url..." +4. Paste: https://github.com/googlesamples/unity-jar-resolver.git?path=upm + ### Install via Google APIs for Unity EDM4U is available both in UPM and legacy `.unitypackage` formats on diff --git a/exploded/Assets/ExternalDependencyManager/Editor/README.md.meta b/exploded/Assets/ExternalDependencyManager/Editor/README.md.meta index 97b2a0cc..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: b8f8f1a310f5441f9598e2c40ac77058 +guid: 77919e84cef8419ab4b725fc16e83d52 labels: -- gvh_version-1.2.179 +- 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.179_manifest.txt b/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_manifest.txt deleted file mode 100644 index e2fe394f..00000000 --- a/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_manifest.txt +++ /dev/null @@ -1,13 +0,0 @@ -Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll -Assets/ExternalDependencyManager/Editor/1.2.179/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.179_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.179_manifest.txt.meta rename to exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt.meta index cf224b82..a36e708a 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_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: 53a0906dfc3143ba8bf0193c245ad230 +guid: c9a3138961c74d99b7046b783112fceb labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_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 51c7d58a..59c045f4 100644 --- a/export_unity_package_guids.json +++ b/export_unity_package_guids.json @@ -48,5 +48,26 @@ }, "1.2.179": { "com.google.external-dependency-manager/ExternalDependencyManager/Editor/1.2.179": "e4b2f028f2e949cfac3ba5bbb128d139" + }, + "1.2.180": { + "com.google.external-dependency-manager/ExternalDependencyManager/Editor/1.2.180": "e8f303eb74064b86b1308e81afd52ce1" + }, + "1.2.181": { + "com.google.external-dependency-manager/ExternalDependencyManager/Editor/1.2.181": "d27fe564f10147d1bfded8244b25b494" + }, + "1.2.182": { + "com.google.external-dependency-manager/ExternalDependencyManager/Editor/1.2.182": "60e9ce1be3474de5bdded37d1462e09b" + }, + "1.2.183": { + "com.google.external-dependency-manager/ExternalDependencyManager/Editor/1.2.183": "5c127f68af44472d8099a80364a25718" + }, + "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.179.unitypackage b/external-dependency-manager-1.2.179.unitypackage deleted file mode 100644 index 85a8a5a4..00000000 Binary files a/external-dependency-manager-1.2.179.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 85a8a5a4..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 ed3df93d..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: a8d928a6df80469ab6cd8eca7bf6d273 +guid: aba4ee01c6d145f7bf2d944d892f709a labels: -- gvh_version-1.2.179 +- 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 2c9389aa..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: 052fc6841b304ce4801cd850704efc6b +guid: e2d7ea0845de4cf984265d2a444b7aa4 labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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 26245d5b..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: 72d829fda5384bd58e7ba8d9b64c3744 +guid: baf24db2bf904e729e7796721c09e8ad labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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 2ee01bfe..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: f8c5c28ca63d4b998365d84dd183658d +guid: fa49a85d4ba140a0ae21528ed12d174c labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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 bbd158a3..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: a57af131f256420bba8f15a4ee00e496 +guid: d13c8602d5e14e43b0e92459754c4315 labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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 ff01cc55..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: a22e43395e864125aec54dc456a4eda0 +guid: d8bb10c56a0147bc855a6296778e025e labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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 5834d6df..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: 11e143a4c758469096247a6cf38e53c3 +guid: a695eb9f64fe49569a2db0c4246c877d labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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 b5ee7f1b..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: efd2c569f89a449498a0c946cd37a752 +guid: f7632a50b10045458c53a5ddf7b6d238 labels: -- gvh_version-1.2.179 +- 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 d46f7562..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: 17cab50d346c4431bb94bd6348328706 +guid: 57f5a82a79ab4b098f09326c8f3c73a6 labels: -- gvh_version-1.2.179 +- 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 dd7fd95c..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: 76d0a5f5ee7f4a72a3d2de688e3bd51a +guid: 5980a684c61d42fbb6b74e2eb3477016 labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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 7fe143cb..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: d43c890d3efe4d338e0573a21b29e18b +guid: 9f56badf3ca84753b00163c3b632d4e5 labels: -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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 cd17e6ff..30482451 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/LICENSE.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/LICENSE.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 9be3e4155c3148d298ad390b9db89273 +guid: ae8b2bc8d1ac4ad48f0ab2b2e7ac75fb labels: -- gvh_version-1.2.179 +- 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 97b2a0cc..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: b8f8f1a310f5441f9598e2c40ac77058 +guid: 77919e84cef8419ab4b725fc16e83d52 labels: -- gvh_version-1.2.179 +- gvh_version-1.2.186 - gvhp_exportpath-ExternalDependencyManager/Editor/README.md - gvh timeCreated: 1584567712 diff --git a/source/AndroidResolver/scripts/gradle-template.zip b/source/AndroidResolver/scripts/gradle-template.zip index 8dc0e08d..db181f66 100644 Binary files a/source/AndroidResolver/scripts/gradle-template.zip and b/source/AndroidResolver/scripts/gradle-template.zip differ diff --git a/source/AndroidResolver/src/GradleTemplateResolver.cs b/source/AndroidResolver/src/GradleTemplateResolver.cs index 59875c03..ff9f75e5 100644 --- a/source/AndroidResolver/src/GradleTemplateResolver.cs +++ b/source/AndroidResolver/src/GradleTemplateResolver.cs @@ -163,10 +163,29 @@ public static string UnityGradleSettingsTemplatePath { /// public static bool UnityChangeMavenRepoInSettingsTemplate { get { - return Google.VersionHandler.GetUnityVersionMajorMinor() >= 2022.2f; + // Check against the Android Gradle plugin version being used, since that can + // change between Unity minor versions. + return (new Dependency.VersionComparer()).Compare( + "7.0", PlayServicesResolver.AndroidGradlePluginVersion) >= 0; } } + /// + /// Modifies the given path such that the m2repository is placed into the + /// LocalMavenRepoDir/PrefixDirectory/m2repository/... + /// + /// The original path to modify. + /// A modified path if m2repository is found, the same path otherwise. + private static string ReplaceLocalFolderBasedOnM2repo(string path) { + string regexPattern = @"^(.*[/\\])([^/\\]+[/\\]m2repository.*)$"; + Match match = Regex.Match(path, regexPattern); + if (match.Success) { + path = Path.Combine(GooglePlayServices.SettingsDialog.LocalMavenRepoDir, + match.Groups[2].Value); + } + return path; + } + /// /// Copy srcaar files to aar files that are excluded from Unity's build process. /// @@ -195,6 +214,15 @@ private static bool CopySrcAars(ICollection dependencies) { var dir = FileUtils.ReplaceBaseAssetsOrPackagesFolder( Path.GetDirectoryName(aar), GooglePlayServices.SettingsDialog.LocalMavenRepoDir); + + if (!dir.StartsWith(GooglePlayServices.SettingsDialog.LocalMavenRepoDir)) { + // The directory replace logic failed, likely because the original aar + // is not located under the Assets or Packages folders. + // Try to come up with a sensible destination folder by searching for + // an m2repository within the path, and using that. + dir = ReplaceLocalFolderBasedOnM2repo(Path.GetDirectoryName(aar)); + } + var filename = Path.GetFileNameWithoutExtension(aarPath); var targetFilename = Path.Combine(dir, filename + ".aar"); @@ -697,15 +725,18 @@ internal static IList GradleMavenReposLinesFromDependencies( if (repoAndSources.Key.StartsWith(projectFileUri)) { var relativePath = repoAndSources.Key.Substring(projectFileUri.Length + 1); // Convert "Assets", "Packages/packageid", or - // "Library/PackageCache/packageid@version" prefix to local maven repo - // path. Note that local maven repo path only exists if the original repo - // path contains .srcaar. - var repoPath = FileUtils.PosixPathSeparators( - FileUtils.ReplaceBaseAssetsOrPackagesFolder( - relativePath, GooglePlayServices.SettingsDialog.LocalMavenRepoDir)); + // "Library/PackageCache/packageid@version" prefix (@version optional) to local + // maven repo path. Note that local maven repo path only exists if the original + // repo path contains .srcaar. + var repoPath = FileUtils.ReplaceBaseAssetsOrPackagesFolder( + relativePath, GooglePlayServices.SettingsDialog.LocalMavenRepoDir); + // We also want to just convert any prefixes before a directory/m2repository, since + // they are copied to the LocalMavenRepoDir as well. + repoPath = ReplaceLocalFolderBasedOnM2repo(repoPath); if (!Directory.Exists(repoPath)) { repoPath = relativePath; } + repoPath = FileUtils.PosixPathSeparators(repoPath); if (useFullPath) { // build.gradle expects file:/// URI so file separator will be "/" in anycase diff --git a/source/AndroidResolver/src/PlayServicesResolver.cs b/source/AndroidResolver/src/PlayServicesResolver.cs index 74a011bb..e4f7d40e 100644 --- a/source/AndroidResolver/src/PlayServicesResolver.cs +++ b/source/AndroidResolver/src/PlayServicesResolver.cs @@ -2352,7 +2352,13 @@ internal static IList PackagingOptionsLines(ICollection depe var sortedExcludeFiles = new List(excludeFiles); sortedExcludeFiles.Sort(); lines.Add("android {"); - lines.Add(" packagingOptions {"); + + // `packagingOptions` is replaced by `packaging` keyword in Android Gradle plugin 8.0+ + if ((new Dependency.VersionComparer()).Compare("8.0", AndroidGradlePluginVersion) >= 0) { + lines.Add(" packaging {"); + } else { + lines.Add(" packagingOptions {"); + } foreach (var filename in sortedExcludeFiles) { // Unity's Android extension replaces ** in the template with an empty // string presumably due to the token expansion it performs. It's not diff --git a/source/AndroidResolver/src/VersionNumber.cs b/source/AndroidResolver/src/VersionNumber.cs index 482becc4..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.179"; + 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 ab6c2cf1..a272810e 100644 --- a/source/IOSResolver/src/IOSResolver.cs +++ b/source/IOSResolver/src/IOSResolver.cs @@ -724,7 +724,7 @@ private static Assembly ResolveUnityEditoriOSXcodeExtension( /// static IOSResolver() { // Load log preferences. - VerboseLoggingEnabled = VerboseLoggingEnabled; + UpdateLoggerLevel(VerboseLoggingEnabled); // NOTE: We can't reference the UnityEditor.iOS.Xcode module in this // method as the Mono runtime in Unity 4 and below requires all @@ -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+ /// @@ -1039,10 +1055,14 @@ public static bool VerboseLoggingEnabled { get { return settings.GetBool(PREFERENCE_VERBOSE_LOGGING_ENABLED, defaultValue: false); } set { settings.SetBool(PREFERENCE_VERBOSE_LOGGING_ENABLED, value); - logger.Level = value ? LogLevel.Verbose : LogLevel.Info; + UpdateLoggerLevel(value); } } + private static void UpdateLoggerLevel(bool verboseLoggingEnabled) { + logger.Level = verboseLoggingEnabled ? LogLevel.Verbose : LogLevel.Info; + } + /// /// Skip pod install when using workspace integration, let user manually run it. /// diff --git a/source/IOSResolver/src/VersionNumber.cs b/source/IOSResolver/src/VersionNumber.cs index 0527afbd..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.179"; + private const string VERSION_STRING = "1.2.186"; /// /// Cached version structure. diff --git a/source/ImportUnityPackage/__pycache__/import_unity_package.cpython-311.pyc b/source/ImportUnityPackage/__pycache__/import_unity_package.cpython-311.pyc new file mode 100644 index 00000000..f1c36f67 Binary files /dev/null and b/source/ImportUnityPackage/__pycache__/import_unity_package.cpython-311.pyc differ diff --git a/source/PackageManagerResolver/src/PackageManagerResolver.cs b/source/PackageManagerResolver/src/PackageManagerResolver.cs index 03d18ddd..d041cc26 100644 --- a/source/PackageManagerResolver/src/PackageManagerResolver.cs +++ b/source/PackageManagerResolver/src/PackageManagerResolver.cs @@ -94,7 +94,7 @@ static PackageManagerResolver() { RunOnMainThread.Run(() => { // Load log preferences. - VerboseLoggingEnabled = VerboseLoggingEnabled; + UpdateLoggerLevel(VerboseLoggingEnabled); }, runNow: false); } @@ -645,9 +645,13 @@ public static bool VerboseLoggingEnabled { get { return settings.GetBool(PreferenceVerboseLoggingEnabled, defaultValue: false); } set { settings.SetBool(PreferenceVerboseLoggingEnabled, value); - logger.Level = value ? LogLevel.Verbose : LogLevel.Info; + UpdateLoggerLevel(value); } } + + private static void UpdateLoggerLevel(bool verboseLoggingEnabled) { + logger.Level = verboseLoggingEnabled ? LogLevel.Verbose : LogLevel.Info; + } /// /// Whether scoped registries are supported in current Unity editor. diff --git a/source/PackageManagerResolver/src/VersionNumber.cs b/source/PackageManagerResolver/src/VersionNumber.cs index f028bd9a..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.179"; + private const string VERSION_STRING = "1.2.186"; /// /// Cached version structure. diff --git a/source/VersionHandler/src/VersionHandler.cs b/source/VersionHandler/src/VersionHandler.cs index 1cb03ada..0b0f719e 100644 --- a/source/VersionHandler/src/VersionHandler.cs +++ b/source/VersionHandler/src/VersionHandler.cs @@ -153,7 +153,7 @@ private static void BootStrap() { if (implAvailable) return; var assemblies = new List(); - foreach (string assetGuid in AssetDatabase.FindAssets("l:gvh")) { + foreach (var assetGuid in AssetDatabase.FindAssets("l:gvh")) { string filename = AssetDatabase.GUIDToAssetPath(assetGuid); var match = VERSION_HANDLER_FILENAME_RE.Match(filename); if (match.Success) assemblies.Add(match); diff --git a/source/VersionHandlerImpl/src/EditorMeasurement.cs b/source/VersionHandlerImpl/src/EditorMeasurement.cs index 254ce50c..a2500b0c 100644 --- a/source/VersionHandlerImpl/src/EditorMeasurement.cs +++ b/source/VersionHandlerImpl/src/EditorMeasurement.cs @@ -493,7 +493,14 @@ public void Report(string reportUrl, string reportName) { PromptToEnable(() => { if (!Enabled) return; - try { + + // TODO: This logic uses the Universal Analytics Measurement Protocol, which is stopping + // support on July 1st, 2024. It needs to be upgraded to the new Google Analytics 4 protocols. + // Old: https://developers.google.com/analytics/devguides/collection/protocol/v1/reference + // New: https://developers.google.com/analytics/devguides/collection/protocol/ga4/sending-events?client_type=gtag + // Commenting it out now, to prevent any possible errors from appearing in the console until the + // upgrade is complete. + /*try { var uri = new Uri("http://ignore.host/" + reportUrl); bool reported = false; var path = String.Join("", uri.Segments); @@ -547,7 +554,7 @@ public void Report(string reportUrl, string reportName) { logger.Log(String.Format( "Failed to reporting analytics data due to exception: {0}", e), level: LogLevel.Verbose); - } + }*/ }); } } diff --git a/source/VersionHandlerImpl/src/FileUtils.cs b/source/VersionHandlerImpl/src/FileUtils.cs index 6f3b098f..75f6aae3 100644 --- a/source/VersionHandlerImpl/src/FileUtils.cs +++ b/source/VersionHandlerImpl/src/FileUtils.cs @@ -48,9 +48,10 @@ internal class FileUtils { /// /// Regex to match packages folder like "Library/PackageCache/com.company.pkg" + /// or "Library/PackageCache/com.company.pkg@version" /// private static Regex PACKAGES_PHYSICAL_PATH_REGEX = - new Regex(@"^(Library[/\\]PackageCache[/\\])([^/\\]+)(@[^/\\]+)[/\\](.*)?$"); + new Regex(@"^(Library[/\\]PackageCache[/\\])([^/\\]+)(@[^/\\]+)?[/\\](.*)?$"); /// /// Returns the project directory (e.g contains the Assets folder). @@ -448,7 +449,9 @@ public static string GetPackageDirectory( // work if the package is installed from a local tarball or from a registry // server. string absolutePath = Path.GetFullPath(packageDir); - packageDir = absolutePath.Substring(ProjectDirectory.Length + 1); + if (absolutePath.StartsWith(ProjectDirectory)) { + packageDir = absolutePath.Substring(ProjectDirectory.Length + 1); + } } } else { nameMatch = PACKAGES_PHYSICAL_PATH_REGEX.Match(path); @@ -640,42 +643,47 @@ internal static bool IsValidGuid(string guidStr) { /// Path to the file/directory that needs checking. /// True if all folders are created successfully. public static bool CreateFolder(string path, Google.Logger logger = null) { - if (AssetDatabase.IsValidFolder(path)) { - return true; - } - DirectoryInfo di = new DirectoryInfo(path); - var parentFolder = Path.GetDirectoryName(path); - if (!CreateFolder(parentFolder)) { - return false; - } + try { + if (AssetDatabase.IsValidFolder(path)) { + return true; + } + DirectoryInfo di = new DirectoryInfo(path); + var parentFolder = Path.GetDirectoryName(path); + if (!CreateFolder(parentFolder)) { + return false; + } - // Try to use Unity API to create folder. However, some versions of Unity has issue to - // create folders with version number in it like '9.0.0'. In this case, instead of - // returnig empty guid, it can return guids with all zeroes. - if (IsValidGuid(AssetDatabase.CreateFolder(parentFolder, di.Name))) { - return true; - } + // Try to use Unity API to create folder. However, some versions of Unity has issue to + // create folders with version number in it like '9.0.0'. In this case, instead of + // returning empty guid, it can return guids with all zeroes. + if (IsValidGuid(AssetDatabase.CreateFolder(parentFolder, di.Name))) { + return true; + } - if (logger != null) { - logger.Log( - String.Format( - "Please ignore Unity error messages similar to '{0}'.\n" + - "Unable to use Unity API `AssetDatabase.CreateFolder()` to " + - "create folder: '{1}'. Switch to use `Directory.CreateDirectory()` " + - "instead. \n\n" + - "See {2} for more information.", - "*** is not a valid directory name.", - path, - "https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-7046"), - LogLevel.Info); - } + if (logger != null) { + logger.Log( + String.Format( + "Please ignore Unity error messages similar to '{0}'.\n" + + "Unable to use Unity API `AssetDatabase.CreateFolder()` to " + + "create folder: '{1}'. Switch to use `Directory.CreateDirectory()` " + + "instead. \n\n" + + "See {2} for more information.", + "*** is not a valid directory name.", + path, + "https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-7046"), + LogLevel.Info); + } - return Directory.CreateDirectory(path) != null; + return Directory.CreateDirectory(path) != null; + } catch (Exception ex) { + logger.Log("Exception thrown trying to CreateFolder. " + ex, LogLevel.Error); + return false; + } } /// /// Replace "Assets/", "Packages/package-id", or "Library/PackageCache/package-id@version" - /// base in the path with the new base. + /// base (@version optional) in the path with the new base. /// /// Path to the file/directory to be modified. /// New base used to replace the given path. diff --git a/source/VersionHandlerImpl/src/VersionHandlerImpl.cs b/source/VersionHandlerImpl/src/VersionHandlerImpl.cs index 36e32fe2..f0022556 100644 --- a/source/VersionHandlerImpl/src/VersionHandlerImpl.cs +++ b/source/VersionHandlerImpl/src/VersionHandlerImpl.cs @@ -2290,7 +2290,7 @@ public static Logger Logger { /// Load log preferences. /// private static void LoadLogPreferences() { - VerboseLoggingEnabled = VerboseLoggingEnabled; + UpdateLoggerLevel(VerboseLoggingEnabled); } /// @@ -2512,9 +2512,13 @@ public static bool VerboseLoggingEnabled { defaultValue: false); } set { settings.SetBool(PREFERENCE_VERBOSE_LOGGING_ENABLED, value); - logger.Level = value ? LogLevel.Verbose : LogLevel.Info; + UpdateLoggerLevel(value); } } + + private static void UpdateLoggerLevel(bool verboseLoggingEnabled) { + logger.Level = verboseLoggingEnabled ? LogLevel.Verbose : LogLevel.Info; + } /// /// Enable / disable verbose logging. @@ -2722,7 +2726,7 @@ public static string[] SearchAssetDatabase(string assetsFilter = null, } var assetGuids = searchDirectories == null ? AssetDatabase.FindAssets(assetsFilter) : AssetDatabase.FindAssets(assetsFilter, searchDirectories); - foreach (string assetGuid in assetGuids) { + foreach (var assetGuid in assetGuids) { string filename = AssetDatabase.GUIDToAssetPath(assetGuid); // Ignore non-existent files as it's possible for the asset database to reference // missing files if it hasn't been refreshed or completed a refresh. diff --git a/source/VersionHandlerImpl/src/VersionNumber.cs b/source/VersionHandlerImpl/src/VersionNumber.cs index e5d426a1..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.179"; + private const string VERSION_STRING = "1.2.186"; /// /// Cached version structure. diff --git a/upm/CHANGELOG.md b/upm/CHANGELOG.md index f00a1163..e1294a3a 100755 --- a/upm/CHANGELOG.md +++ b/upm/CHANGELOG.md @@ -1,3 +1,34 @@ +# 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. + Fixes #715 + +# Version 1.2.183 - Sep 18, 2024 +* Android Resolver - Handle package paths that don't include a version hash, + which is no longer present with Unity 6. Fixes #697 +* Android Resolver - Handle packages referenced using local file paths. + Fixes #701 + +# Version 1.2.182 - Aug 2, 2024 +* General - Check for gradle version instead of Unity version when determining + the template files to modify. + +# Version 1.2.181 - Jun 26, 2024 +* General - Disable `EditorMeasurement` reporting that relied on the + Measurement Protocol for Universal Analytics. + +# Version 1.2.180 - Jun 4, 2024 +* General - Fix project settings resetting on domain reload. + Fixes #524 + # Version 1.2.179 - Feb 12, 2024 * Android Resolver - Added logic to automatically turn on `mainTemplate.gradle` for new projects, and prompt users to enable it on projects that have previously diff --git a/upm/CHANGELOG.md.meta b/upm/CHANGELOG.md.meta index 15580637..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.179 +- gvh_version-1.2.186 - gvhp_exportpath-CHANGELOG.md timeCreated: 0 diff --git a/upm/Documentation~/index.md b/upm/Documentation~/index.md index 3a7a5a26..a9aafe9f 100755 --- a/upm/Documentation~/index.md +++ b/upm/Documentation~/index.md @@ -72,6 +72,12 @@ EDM4U is available on openupm add com.google.external-dependency-manager ``` +### Install via git URL +1. Open Package Manager +2. Click on the + icon on the top left corner of the "Package Manager" screen +3. Click on "Install package from git url..." +4. Paste: https://github.com/googlesamples/unity-jar-resolver.git?path=upm + ### Install via Google APIs for Unity EDM4U is available both in UPM and legacy `.unitypackage` formats on diff --git a/upm/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.pdb b/upm/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.pdb deleted file mode 100755 index b317099b..00000000 Binary files a/upm/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.pdb and /dev/null differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll b/upm/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll deleted file mode 100755 index 57f7a07c..00000000 Binary files a/upm/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll and /dev/null differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.pdb b/upm/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.pdb deleted file mode 100755 index e1f05052..00000000 Binary files a/upm/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.pdb and /dev/null differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.179.meta b/upm/ExternalDependencyManager/Editor/1.2.186.meta similarity index 77% rename from upm/ExternalDependencyManager/Editor/1.2.179.meta rename to upm/ExternalDependencyManager/Editor/1.2.186.meta index c5cc9be2..c9cc4f8b 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.179.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e4b2f028f2e949cfac3ba5bbb128d139 +guid: 8a6a9bd2649d4370b43be75e1689748c timeCreated: 1480838400 folderAsset: true DefaultImporter: diff --git a/upm/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll b/upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll similarity index 60% rename from upm/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll index 182b402c..30030559 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.179/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.179/Google.IOSResolver.dll.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll.meta index cffb0776..fe84d30d 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 052fc6841b304ce4801cd850704efc6b +guid: e2d7ea0845de4cf984265d2a444b7aa4 labels: - gvh -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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.179/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.179/Google.IOSResolver.pdb.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb.meta index 2eb97850..ab8ef649 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 72d829fda5384bd58e7ba8d9b64c3744 +guid: baf24db2bf904e729e7796721c09e8ad labels: - gvh -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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.179/Google.JarResolver.dll b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll similarity index 71% rename from upm/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll index 123881fb..645d5cd3 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.179/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.179/Google.JarResolver.dll.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll.meta index 21d474c6..b3831d2a 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: f8c5c28ca63d4b998365d84dd183658d +guid: fa49a85d4ba140a0ae21528ed12d174c labels: - gvh -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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.179/Google.JarResolver.pdb b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb old mode 100644 new mode 100755 similarity index 50% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.pdb rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb index c33702a9..c6eaef49 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.pdb and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.179/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.179/Google.JarResolver.pdb.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb.meta index bf50e06b..d8895653 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: a57af131f256420bba8f15a4ee00e496 +guid: d13c8602d5e14e43b0e92459754c4315 labels: - gvh -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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.179/Google.PackageManagerResolver.dll b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll similarity index 64% rename from upm/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll index c2a0c343..a4a6590c 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.179/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.179/Google.PackageManagerResolver.dll.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll.meta index f7317db0..260efc5e 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: a22e43395e864125aec54dc456a4eda0 +guid: d8bb10c56a0147bc855a6296778e025e labels: - gvh -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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.179/Google.PackageManagerResolver.pdb b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb similarity index 73% rename from upm/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.pdb rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb index f964b211..884ce212 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.pdb and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.179/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.179/Google.PackageManagerResolver.pdb.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb.meta index 19ccd661..e08c8e68 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 11e143a4c758469096247a6cf38e53c3 +guid: a695eb9f64fe49569a2db0c4246c877d labels: - gvh -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll new file mode 100755 index 00000000..8562ef33 Binary files /dev/null and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.179/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.179/Google.VersionHandlerImpl.dll.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll.meta index 83d67f4e..a3e0b420 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 76d0a5f5ee7f4a72a3d2de688e3bd51a +guid: 5980a684c61d42fbb6b74e2eb3477016 labels: - gvh -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb new file mode 100755 index 00000000..ed8cc976 Binary files /dev/null and b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.179/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.179/Google.VersionHandlerImpl.pdb.meta rename to upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb.meta index 07b73efe..cb5d8ef5 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: d43c890d3efe4d338e0573a21b29e18b +guid: 9f56badf3ca84753b00163c3b632d4e5 labels: - gvh -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.179/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 0703ad01..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 65e18210..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: efd2c569f89a449498a0c946cd37a752 +guid: f7632a50b10045458c53a5ddf7b6d238 labels: - gvh -- gvh_version-1.2.179 +- 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 b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb index 8e7e00bb..7dd02af5 100755 Binary files a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb and b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta index 69264cf4..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: 17cab50d346c4431bb94bd6348328706 +guid: 57f5a82a79ab4b098f09326c8f3c73a6 labels: - gvh -- gvh_version-1.2.179 +- 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.179_manifest.txt b/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_manifest.txt deleted file mode 100755 index e2fe394f..00000000 --- a/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_manifest.txt +++ /dev/null @@ -1,13 +0,0 @@ -Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.179/Google.IOSResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.179/Google.JarResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.179/Google.PackageManagerResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.179/Google.VersionHandlerImpl.dll -Assets/ExternalDependencyManager/Editor/1.2.179/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.179_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.179_manifest.txt.meta rename to upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt.meta index 0d78acea..dca3f95f 100644 --- a/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_manifest.txt.meta +++ b/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: 53a0906dfc3143ba8bf0193c245ad230 +guid: c9a3138961c74d99b7046b783112fceb labels: - gvh - gvh_manifest -- gvh_version-1.2.179 -- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.179_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 107dea06..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.179 +- gvh_version-1.2.186 - gvhp_exportpath-LICENSE.md timeCreated: 0 diff --git a/upm/README.md b/upm/README.md index 3a7a5a26..a9aafe9f 100755 --- a/upm/README.md +++ b/upm/README.md @@ -72,6 +72,12 @@ EDM4U is available on openupm add com.google.external-dependency-manager ``` +### Install via git URL +1. Open Package Manager +2. Click on the + icon on the top left corner of the "Package Manager" screen +3. Click on "Install package from git url..." +4. Paste: https://github.com/googlesamples/unity-jar-resolver.git?path=upm + ### Install via Google APIs for Unity EDM4U is available both in UPM and legacy `.unitypackage` formats on diff --git a/upm/README.md.meta b/upm/README.md.meta index ab3c5de4..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.179 +- gvh_version-1.2.186 - gvhp_exportpath-README.md timeCreated: 0 diff --git a/upm/package.json b/upm/package.json index 996fa418..6d0b27ea 100755 --- a/upm/package.json +++ b/upm/package.json @@ -1,6 +1,6 @@ { "name": "com.google.external-dependency-manager", - "version": "1.2.179", + "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 02f28b42..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.179 +- gvh_version-1.2.186 - gvhp_exportpath-package.json timeCreated: 0