Merge pull request #663 from f1yingbanana/master

Add and release OpenUPM support.
googlesamples · Dec 21, 2023 · ecae23d · ecae23d
2 parents ae200af + da0779a
commit ecae23d
Show file tree

Hide file tree

Showing 96 changed files with 4,405 additions and 1,295 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Version 1.2.178 - Dec 20, 2023
+* Added [OpenUPM support](https://openupm.com/packages/com.google.external-dependency-manager/).
+
 # Version 1.2.177 - Aug 14, 2023
 * iOS Resolver - Added `/opt/homebrew/bin` to Cocoapod executable search path.
   Fixes #627

diff --git a/README.md b/README.md
diff --git 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.177"
+  pluginVersion = "1.2.178"
   // Directory that contains the template plugin.
   // Files under this directory are copied into the staging area for the
   // plugin.
@@ -264,14 +264,18 @@ project.ext {
   pluginStagingAreaDir = new File(buildDir, "staging")
   // Directory where the build plugin is unpacked to.
   pluginExplodedDir = new File(scriptDirectory, "exploded")
+  // Directory where the UPM package is unpacked to.
+  pluginUpmDir = new File(scriptDirectory, "upm")
   // Base filename of the released plugin.
   currentPluginBasename = "external-dependency-manager"
+  // Base UPM package name of the released plugin.
+  currentPluginUpmPackageName = "com.google.external-dependency-manager"
   // Where the exported plugin file is built before it's copied to the release
   // location.
   pluginExportFile = new File(buildDir, currentPluginBasename + ".unitypackage")
   // Where the exported UPM plugin file is built.
   pluginUpmExportFile = new File(buildDir,
-                                 currentPluginBasename + pluginVersion + ".tgz")
+                                 currentPluginUpmPackageName + "-" + pluginVersion + ".tgz")
   // Directory within the plugin staging area that just contains the plugin.
   pluginAssetsDir = new File("Assets", "ExternalDependencyManager")
   // Directories within the staging area to export.
@@ -2069,8 +2073,7 @@ buildPlugin.with {
 }
 
 // Guid paths for UPM package.
-File upmPluginPackageDir = new File("com.google.external-dependency-manager",
-    "ExternalDependencyManager")
+File upmPluginPackageDir = new File(currentPluginUpmPackageName, "ExternalDependencyManager")
 File upmPluginEditorDir = new File(upmPluginPackageDir, "Editor")
 File upmPluginDllDir = new File(upmPluginEditorDir, project.ext.pluginVersion)
 
@@ -2121,6 +2124,7 @@ task releasePlugin(dependsOn: [buildPlugin, buildUpmPlugin]) {
                       fileTree(dir: project.ext.pluginExplodedDir),
                       pluginTemplateFilesMap.values())
   doLast {
+    // Delete and regenerate built .unitypackage in the repo.
     delete fileTree(
       dir: project.ext.pluginReleaseFile.parentFile,
       includes: [project.ext.currentPluginBasename + "-*.unitypackage"])
@@ -2134,6 +2138,7 @@ task releasePlugin(dependsOn: [buildPlugin, buildUpmPlugin]) {
       into project.ext.pluginReleaseFileUnversioned.parentFile
       rename { src_filename -> project.ext.pluginReleaseFileUnversioned.name }
     }
+    // Delete and regenerate the exploded plugin folder in the repo.
     delete fileTree(dir: project.ext.pluginExplodedDir)
     copy {
       from project.ext.pluginStagingAreaDir
@@ -2142,6 +2147,16 @@ task releasePlugin(dependsOn: [buildPlugin, buildUpmPlugin]) {
         it.path + "/**/*"
       }
     }
+    // Delete and regenerate the UPM package in the repo.
+    delete fileTree(dir: project.ext.pluginUpmDir) 
+    copy {
+      // Rename the top-level package folder to upm.
+      eachFile {
+        path = path.replaceFirst(/^.+?\//, "upm/")
+      }  
+      from tarTree(project.ext.pluginUpmExportFile)
+      into project.ext.scriptDirectory
+    }
     pluginTemplateFilesMap.each {
       sourceFile, targetFile -> copyFile(sourceFile, targetFile)
     }

diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.mdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.mdb
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.mdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.mdb
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll
diff --git a/...ded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.mdb b/...ded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.mdb
diff --git a/...ssets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.mdb.meta b/...ssets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.mdb.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.mdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.mdb
diff --git a/...ed/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.mdb.meta b/...ed/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.mdb.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.IOSResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.IOSResolver.dll
diff --git a/...ditor/1.2.177/Google.IOSResolver.dll.meta → ...ditor/1.2.178/Google.IOSResolver.dll.meta b/...ditor/1.2.177/Google.IOSResolver.dll.meta → ...ditor/1.2.178/Google.IOSResolver.dll.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.IOSResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.IOSResolver.pdb
diff --git a/...r/1.2.177/Google.JarResolver.dll.mdb.meta → ...ditor/1.2.178/Google.IOSResolver.pdb.meta b/...r/1.2.177/Google.JarResolver.dll.mdb.meta → ...ditor/1.2.178/Google.IOSResolver.pdb.meta
diff --git a/...ger/Editor/1.2.177/Google.JarResolver.dll → ...ger/Editor/1.2.178/Google.JarResolver.dll b/...ger/Editor/1.2.177/Google.JarResolver.dll → ...ger/Editor/1.2.178/Google.JarResolver.dll
diff --git a/...ditor/1.2.177/Google.JarResolver.dll.meta → ...ditor/1.2.178/Google.JarResolver.dll.meta b/...ditor/1.2.177/Google.JarResolver.dll.meta → ...ditor/1.2.178/Google.JarResolver.dll.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.JarResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.JarResolver.pdb
diff --git a/...r/1.2.177/Google.IOSResolver.dll.mdb.meta → ...ditor/1.2.178/Google.JarResolver.pdb.meta b/...r/1.2.177/Google.IOSResolver.dll.mdb.meta → ...ditor/1.2.178/Google.JarResolver.pdb.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.PackageManagerResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.PackageManagerResolver.dll
diff --git a/...77/Google.PackageManagerResolver.dll.meta → ...78/Google.PackageManagerResolver.dll.meta b/...77/Google.PackageManagerResolver.dll.meta → ...78/Google.PackageManagerResolver.dll.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.PackageManagerResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.PackageManagerResolver.pdb
diff --git a/...ed/Assets/ExternalDependencyManager/Editor/1.2.178/Google.PackageManagerResolver.pdb.meta b/...ed/Assets/ExternalDependencyManager/Editor/1.2.178/Google.PackageManagerResolver.pdb.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.VersionHandlerImpl.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.VersionHandlerImpl.dll
diff --git a/....2.177/Google.VersionHandlerImpl.dll.meta → ....2.178/Google.VersionHandlerImpl.dll.meta b/....2.177/Google.VersionHandlerImpl.dll.meta → ....2.178/Google.VersionHandlerImpl.dll.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.VersionHandlerImpl.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.VersionHandlerImpl.pdb
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.VersionHandlerImpl.pdb.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.178/Google.VersionHandlerImpl.pdb.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md b/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Version 1.2.178 - Dec 20, 2023
+* Added [OpenUPM support](https://openupm.com/packages/com.google.external-dependency-manager/).
+
 # Version 1.2.177 - Aug 14, 2023
 * iOS Resolver - Added `/opt/homebrew/bin` to Cocoapod executable search path.
   Fixes #627

diff --git a/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb
diff --git a/...Editor/Google.VersionHandler.dll.mdb.meta → ...ger/Editor/Google.VersionHandler.pdb.meta b/...Editor/Google.VersionHandler.dll.mdb.meta → ...ger/Editor/Google.VersionHandler.pdb.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta