diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f9490b..57ca392 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [1.1.3](https://github.com/mob-sakai/GitDependencyResolverForUnity/tree/1.1.3) (2019-10-06) + +[Full Changelog](https://github.com/mob-sakai/GitDependencyResolverForUnity/compare/1.1.2...1.1.3) + +- Some files in GitDependencyResolverForUnity conflicts with UpmGitExtension [\#16](https://github.com/mob-sakai/GitDependencyResolverForUnity/issues/16) + +## [1.1.2](https://github.com/mob-sakai/GitDependencyResolverForUnity/tree/1.1.2) (2019-08-05) + +[Full Changelog](https://github.com/mob-sakai/GitDependencyResolverForUnity/compare/1.1.1...1.1.2) + ## [1.1.1](https://github.com/mob-sakai/GitDependencyResolverForUnity/tree/1.1.1) (2019-08-05) [Full Changelog](https://github.com/mob-sakai/GitDependencyResolverForUnity/compare/1.1.0...1.1.1) @@ -22,18 +32,18 @@ [Full Changelog](https://github.com/mob-sakai/GitDependencyResolverForUnity/compare/96d11551ce2e670f5c991a254ac3dd4fb4b67c02...1.0.0) -This plugin resolves git url dependencies in the package for Unity Package Manager. - -You can use a git url as a package dependency as the following! - -```js -{ - "name": "com.coffee.package-a", - "version": "0.1.0", - "dependencies": { - "com.coffee.core-a": "https://github.com/mob-sakai/GitPackageTest.git#core-a-0.1.0" - } -} +This plugin resolves git url dependencies in the package for Unity Package Manager. + +You can use a git url as a package dependency as the following! + +```js +{ + "name": "com.coffee.package-a", + "version": "0.1.0", + "dependencies": { + "com.coffee.core-a": "https://github.com/mob-sakai/GitPackageTest.git#core-a-0.1.0" + } +} ``` **Implemented enhancements:** @@ -48,4 +58,4 @@ You can use a git url as a package dependency as the following! -\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* diff --git a/CHANGELOG.md.meta b/CHANGELOG.md.meta index 02a1f20..ffe1505 100644 --- a/CHANGELOG.md.meta +++ b/CHANGELOG.md.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 299aa978fe5f6425b8d0a7dd3c16e6b7 +guid: b6e5d86451193404dbbe90f277f59f10 TextScriptImporter: externalObjects: {} userData: diff --git a/Editor.meta b/Editor.meta index b4304d3..117f000 100644 --- a/Editor.meta +++ b/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5a27e70b9c8a14cd2a39fd440ae97c3c +guid: 47add7785471e4554b46fdb9110ff0e0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Editor/Coffee.GitDependencyResolver.asmdef.meta b/Editor/Coffee.GitDependencyResolver.asmdef.meta index 5a91ea8..b24e47c 100644 --- a/Editor/Coffee.GitDependencyResolver.asmdef.meta +++ b/Editor/Coffee.GitDependencyResolver.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b146f8c053ccc45258f4d4be02ef68a8 +guid: 29ed9576c170645c78fe5f22c5e2774e AssemblyDefinitionImporter: externalObjects: {} userData: diff --git a/Editor/GitDependencyResolver.cs b/Editor/GitDependencyResolver.cs index 99a5c4a..2f4c0c7 100644 --- a/Editor/GitDependencyResolver.cs +++ b/Editor/GitDependencyResolver.cs @@ -4,7 +4,7 @@ using UnityEditor; using UnityEngine; -namespace Coffee.PackageManager +namespace Coffee.PackageManager.DependencyResolver { [InitializeOnLoad] public static class GitDependencyResolver diff --git a/Editor/GitDependencyResolver.cs.meta b/Editor/GitDependencyResolver.cs.meta index 68b24fd..aac9c39 100644 --- a/Editor/GitDependencyResolver.cs.meta +++ b/Editor/GitDependencyResolver.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bad84303b06d74f06b7d6ff666e13f91 +guid: 24e131a5e32c3431197eb27066301dae MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Editor/MiniJSON.cs b/Editor/MiniJSON.cs index 1751486..3301c9d 100644 --- a/Editor/MiniJSON.cs +++ b/Editor/MiniJSON.cs @@ -32,7 +32,7 @@ using System.IO; using System.Text; -namespace MiniJSON +namespace Coffee.PackageManager.DependencyResolver { // Example usage: // diff --git a/Editor/MiniJSON.cs.meta b/Editor/MiniJSON.cs.meta index bb288e9..cd07179 100644 --- a/Editor/MiniJSON.cs.meta +++ b/Editor/MiniJSON.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 08cffd700e9e240d6ac689d9c47498f2 +guid: 3911ee5b86b824705bf8f92c9023a3a6 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Editor/PackageMeta.cs b/Editor/PackageMeta.cs index 1c27a5d..3abfb18 100644 --- a/Editor/PackageMeta.cs +++ b/Editor/PackageMeta.cs @@ -2,10 +2,8 @@ using System.IO; using System.Linq; using System.Text.RegularExpressions; -using MiniJSON; -using Semver; -namespace Coffee.PackageManager +namespace Coffee.PackageManager.DependencyResolver { public class PackageMeta { diff --git a/Editor/PackageMeta.cs.meta b/Editor/PackageMeta.cs.meta index a4e53a6..e1bc5a5 100644 --- a/Editor/PackageMeta.cs.meta +++ b/Editor/PackageMeta.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c92b3aa6dc55541788f00a9e7ec299df +guid: 4ee0b1c21f0a7485fae645c3b51ab9b4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Editor/SemVersion.cs b/Editor/SemVersion.cs index e20862c..3f5d9f3 100644 --- a/Editor/SemVersion.cs +++ b/Editor/SemVersion.cs @@ -27,7 +27,7 @@ THE SOFTWARE. #endif using System.Text.RegularExpressions; -namespace Semver +namespace Coffee.PackageManager.DependencyResolver { /// /// A semantic version implementation. diff --git a/Editor/SemVersion.cs.meta b/Editor/SemVersion.cs.meta index bb4a6b8..e29a99e 100644 --- a/Editor/SemVersion.cs.meta +++ b/Editor/SemVersion.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f3aaa6a7a403b4f7ca7c0c0822f60984 +guid: 73b822a6fa28744909e459ed9e1ca627 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Editor/Utils.cs b/Editor/Utils.cs index fb13079..be40d35 100644 --- a/Editor/Utils.cs +++ b/Editor/Utils.cs @@ -3,7 +3,7 @@ using UnityEditor; using UnityEngine; -namespace Coffee.PackageManager +namespace Coffee.PackageManager.DependencyResolver { internal static class GitUtils { diff --git a/Editor/Utils.cs.meta b/Editor/Utils.cs.meta index d4e71d9..7996a66 100644 --- a/Editor/Utils.cs.meta +++ b/Editor/Utils.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0c0420dbb53d34355b2c89dcc4d6c118 +guid: 6e701c1c15c7b4ed8b19c2f80c7ef0cc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/LICENSE.md.meta b/LICENSE.md.meta index ca457a1..5aaa355 100644 --- a/LICENSE.md.meta +++ b/LICENSE.md.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dcb1f5fe02ab548848663e4c3e3e172a +guid: ea5ee8eb69e6b4337962be6526665c92 TextScriptImporter: externalObjects: {} userData: diff --git a/README.md.meta b/README.md.meta index 2fff791..b14c54d 100644 --- a/README.md.meta +++ b/README.md.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c2037c0733321424ea929910fb1c0a20 +guid: 2c010f4f3f62448d7908b0a5152197b8 TextScriptImporter: externalObjects: {} userData: diff --git a/package.json b/package.json index 9c89b7a..fb8630c 100755 --- a/package.json +++ b/package.json @@ -2,14 +2,14 @@ "name": "com.coffee.git-dependency-resolver", "displayName": "Git Dependency Resolver", "description": "This plugin resolves git dependencies in the package for Unity Package Manager.\nYou can use a git url as a package dependency!", - "version": "1.1.2", + "version": "1.1.3", "unity": "2018.3", "license": "MIT", "repository": { "type": "git", "url": "https://github.com/mob-sakai/GitDependencyResolverForUnity.git" }, - "src": "Assets/GitDependencyResolver", + "src": "Packages/com.coffee.git-dependency-resolver", "author": "mob-sakai (https://github.com/mob-sakai)", "dependencies": { } diff --git a/package.json.meta b/package.json.meta index 5885285..af9a147 100644 --- a/package.json.meta +++ b/package.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0d21cb34657554ec389e853803d13e14 +guid: b979a92e59878481ca671700ce7439fd TextScriptImporter: externalObjects: {} userData: