Fix function deprecation of merge(::URI) (#191)

Author: jeremiahpslewis

Project.toml

@@ -10,9 +10,11 @@ JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 MbedTLS = "739be429-bea8-5141-9913-cc70e7f3736d"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 SodiumSeal = "2133526b-2bfb-4018-ac12-889fb3908a75"
+URIs = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
 
 [compat]
-HTTP = "0.8, 0.9"
+HTTP = "0.9"
+URIs = "1.1"
 JSON = "0.19, 0.20, 0.21"
 MbedTLS = "0.6, 0.7, 1"
 SodiumSeal = "0.1"

README.md

@@ -115,7 +115,7 @@ GitHub.jl implements a bunch of methods that make REST requests to GitHub's API.
 | `create_file(repo, path)`                                | `Dict`                         | [create a file at `path` in `repo`](https://developer.github.com/v3/repos/contents/#create-a-file)                                              |
 | `update_file(repo, path)`                                | `Dict`                         | [update a file at `path` in `repo`](https://developer.github.com/v3/repos/contents/#update-a-file)                                              |
 | `delete_file(repo, path)`                                | `Dict`                         | [delete a file at `path` in `repo`](https://developer.github.com/v3/repos/contents/#delete-a-file)                                              |
-| `permalink(content::Content, commit)`                    | `HTTP.URI`                     | [get a permalink for `content` at the SHA specified by `commit`](https://help.github.com/articles/getting-permanent-links-to-files/)            |
+| `permalink(content::Content, commit)`                    | `URIs.URI`                     | [get a permalink for `content` at the SHA specified by `commit`](https://help.github.com/articles/getting-permanent-links-to-files/)            |
 | `readme(repo)`                                           | `Content`                      | [get `repo`'s README](https://developer.github.com/v3/repos/contents/#get-the-readme)                                                           |
 | `create_status(repo, sha)`                               | `Status`                       | [create a status for the commit specified by `sha`](https://developer.github.com/v3/repos/statuses/#create-a-status)                            |
 | `statuses(repo, ref)`                                    | `Tuple{Vector{Status}, Dict}`  | [get the statuses posted to `ref`](https://developer.github.com/v3/repos/statuses/#list-statuses-for-a-specific-ref)                            |
@@ -397,19 +397,19 @@ The `EventListener` constructor takes the following keyword arguments:
 - `secret`: A string used to verify the event source. If the event is from a GitHub Webhook, it's the Webhook's secret. If a secret is not provided, the server won't validate the secret signature of incoming requests.
 - `repos`: A vector of `Repo`s (or fully qualified repository names) listing all acceptable repositories. All repositories are whitelisted by default.
 - `events`: A vector of [event names](https://developer.github.com/webhooks/#events) listing all acceptable events (e.g. ["commit_comment", "pull_request"]). All events are whitelisted by default.
-- `forwards`: A vector of `HTTP.URI`s (or URI strings) to which any incoming requests should be forwarded (after being validated by the listener)
+- `forwards`: A vector of `URIs.URI`s (or URI strings) to which any incoming requests should be forwarded (after being validated by the listener)
 
 Here's an example that demonstrates how to construct and run an `EventListener` that does benchmarking on every commit and PR:
 
 ```julia
 import GitHub
-
+import URIs
 # EventListener settings
 myauth = GitHub.authenticate(ENV["GITHUB_AUTH"])
 mysecret = ENV["MY_SECRET"]
 myevents = ["pull_request", "push"]
 myrepos = [GitHub.Repo("owner1/repo1"), "owner2/repo2"] # can be Repos or repo names
-myforwards = [HTTP.URI("http://myforward1.com"), "http://myforward2.com"] # can be HTTP.URIs or URI strings
+myforwards = [URIs.URI("http://myforward1.com"), "http://myforward2.com"] # can be URIs.URIs or URI strings
 
 # Set up Status parameters
 pending_params = Dict(
@@ -550,8 +550,9 @@ Following example shows obtaining repository info `private/Package.jl` on github
 
 ```julia
 import GitHub
+import URIs
 
-api = GitHub.GitHubWebAPI(HTTP.URI("https://git.company.com/api/v3"))
+api = GitHub.GitHubWebAPI(URIs.URI("https://git.company.com/api/v3"))
 myauth = GitHub.authenticate(api, ENV["GITHUB_AUTH"])
 myrepo = GitHub.repo(api, "private/Package.jl", auth=myauth)
 ```

src/GitHub.jl

@@ -8,6 +8,7 @@ using Base64
 ##########
 
 import HTTP,
+       URIs,
        JSON,
        MbedTLS,
        Sockets,

src/activity/events.jl

@@ -69,7 +69,7 @@ struct EventListener
                            secret = nothing, events = nothing,
                            repos = nothing, forwards = nothing)
         if !(isa(forwards, Nothing))
-            forwards = map(HTTP.URI, forwards)
+            forwards = map(URIs.URI, forwards)
         end
 
         if !(isa(repos, Nothing))

src/apps/checks/runs.jl

@@ -15,7 +15,7 @@
     app::Union{App, Nothing}
     pull_requests::Union{Vector{PullRequest}, Nothing}
     check_suite::Union{CheckSuite, Nothing}
-    html_url::Union{HTTP.URI, Nothing}
+    html_url::Union{URIs.URI, Nothing}
 end
 namefield(cr::CheckRun) = cr.id
 

src/gists/gist.jl

@@ -1,18 +1,18 @@
 @ghdef mutable struct Gist
-    url::Union{HTTP.URI, Nothing}
-    forks_url::Union{HTTP.URI, Nothing}
-    commits_url::Union{HTTP.URI, Nothing}
+    url::Union{URIs.URI, Nothing}
+    forks_url::Union{URIs.URI, Nothing}
+    commits_url::Union{URIs.URI, Nothing}
     id::Union{String, Nothing}
     description::Union{String, Nothing}
     public::Union{Bool, Nothing}
     owner::Union{Owner, Nothing}
     user::Union{Owner, Nothing}
     truncated::Union{Bool, Nothing}
     comments::Union{Int, Nothing}
-    comments_url::Union{HTTP.URI, Nothing}
-    html_url::Union{HTTP.URI, Nothing}
-    git_pull_url::Union{HTTP.URI, Nothing}
-    git_push_url::Union{HTTP.URI, Nothing}
+    comments_url::Union{URIs.URI, Nothing}
+    html_url::Union{URIs.URI, Nothing}
+    git_pull_url::Union{URIs.URI, Nothing}
+    git_push_url::Union{URIs.URI, Nothing}
     created_at::Union{Dates.DateTime, Nothing}
     updated_at::Union{Dates.DateTime, Nothing}
     forks::Union{Vector{Gist}, Nothing}

src/git/blob.jl

@@ -1,7 +1,7 @@
 @ghdef mutable struct Blob
     content::Union{String, Nothing}
     encoding::Union{String, Nothing}
-    url::Union{HTTP.URI, Nothing}
+    url::Union{URIs.URI, Nothing}
     sha::Union{String, Nothing}
     size::Union{Int, Nothing}
 end

src/git/gitcommit.jl

@@ -1,6 +1,6 @@
 @ghdef mutable struct GitCommit
     sha::Union{String, Nothing}
-    url::Union{HTTP.URI, Nothing}
+    url::Union{URIs.URI, Nothing}
     author::Union{Dict, Nothing}
     commiter::Union{Dict, Nothing}
     message::Union{String, Nothing}

src/git/reference.jl

@@ -1,6 +1,6 @@
 @ghdef mutable struct Reference
     ref::Union{String, Nothing}
-    url::Union{HTTP.URI, Nothing}
+    url::Union{URIs.URI, Nothing}
     object::Union{Dict, Nothing}
 end
 

src/git/tag.jl

@@ -1,7 +1,7 @@
 @ghdef mutable struct Tag
     tag::Union{String, Nothing}
     sha::Union{String, Nothing}
-    url::Union{HTTP.URI, Nothing}
+    url::Union{URIs.URI, Nothing}
     message::Union{String, Nothing}
     tagger::Union{Dict, Nothing}
     object::Union{Dict, Nothing}