From a8ee7047c72fb905f5eb86e6e650634acf88ba8c Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Thu, 5 Aug 2021 16:29:20 -0700 Subject: [PATCH] move package and imports from flutter to cwtch.im reflecting actual package and home now --- features/contacts/contact_functionality.go | 2 +- .../contact_functionality_addcontact_test.go | 2 +- features/groups/group_functionality.go | 2 +- go.mod | 2 +- go.sum | 18 ++++++++++++++++++ lib.go | 8 ++++---- utils/eventHandler.go | 4 ++-- utils/manager.go | 2 +- 8 files changed, 29 insertions(+), 11 deletions(-) diff --git a/features/contacts/contact_functionality.go b/features/contacts/contact_functionality.go index 1f62219..431f921 100644 --- a/features/contacts/contact_functionality.go +++ b/features/contacts/contact_functionality.go @@ -3,7 +3,7 @@ package contact import ( "cwtch.im/cwtch/model" "cwtch.im/cwtch/peer" - "git.openprivacy.ca/flutter/libcwtch-go/features" + "git.openprivacy.ca/cwtch.im/libcwtch-go/features" "git.openprivacy.ca/openprivacy/connectivity/tor" ) diff --git a/features/contacts/contact_functionality_addcontact_test.go b/features/contacts/contact_functionality_addcontact_test.go index a460651..1771391 100644 --- a/features/contacts/contact_functionality_addcontact_test.go +++ b/features/contacts/contact_functionality_addcontact_test.go @@ -2,7 +2,7 @@ package contact import ( "cwtch.im/cwtch/model" - "git.openprivacy.ca/flutter/libcwtch-go/features" + "git.openprivacy.ca/cwtch.im/libcwtch-go/features" "testing" ) diff --git a/features/groups/group_functionality.go b/features/groups/group_functionality.go index 9a33418..df83f9b 100644 --- a/features/groups/group_functionality.go +++ b/features/groups/group_functionality.go @@ -6,7 +6,7 @@ import ( "cwtch.im/cwtch/peer" "encoding/base64" "fmt" - "git.openprivacy.ca/flutter/libcwtch-go/features" + "git.openprivacy.ca/cwtch.im/libcwtch-go/features" "git.openprivacy.ca/openprivacy/log" "strings" ) diff --git a/go.mod b/go.mod index f25f6b2..7cdf10e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.openprivacy.ca/flutter/libcwtch-go +module git.openprivacy.ca/cwtch.im/libcwtch-go go 1.15 diff --git a/go.sum b/go.sum index 06acf8a..0286330 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,20 @@ +cwtch.im/cwtch v0.6.7/go.mod h1:KDy4lWWxcYAjeKclwVFkoTQ2dWnZcM0k3Xck+zEuBmE= cwtch.im/cwtch v0.9.2 h1:daDJPDWJ3uwRZ/UYPkmhpxxA/G8/FtFAQwbIGhM24ng= cwtch.im/cwtch v0.9.2/go.mod h1:EwUUVWIU4OAcz0HmHUxaY4orzKH6ZiNXaVI8y/5UP5k= +git.openprivacy.ca/cwtch.im/tapir v0.3.4/go.mod h1:+Niy2AHhQC351ZTtfhC0uLjViCICyOxCJZsIlGKKNAU= git.openprivacy.ca/cwtch.im/tapir v0.4.4 h1:KyuTVmr9GYptTCeR7JDODjmhBBbnIBf9V3NSC4+6bHc= git.openprivacy.ca/cwtch.im/tapir v0.4.4/go.mod h1:qMFTdmDZITc1BLP1jSW0gVpLmvpg+Zjsh5ek8StwbFE= +git.openprivacy.ca/flutter/libcwtch-go v0.0.2 h1:Njc417xxzh9rxSsJWFWrIPezJeY31CuQSuSAA9II5eE= +git.openprivacy.ca/flutter/libcwtch-go v0.0.2/go.mod h1:Qc7knXLjifyYssPXEkxNknXaNsWrBkJrReu/0WjIJwI= git.openprivacy.ca/openprivacy/bine v0.0.4 h1:CO7EkGyz+jegZ4ap8g5NWRuDHA/56KKvGySR6OBPW+c= git.openprivacy.ca/openprivacy/bine v0.0.4/go.mod h1:13ZqhKyqakDsN/ZkQkIGNULsmLyqtXc46XBcnuXm/mU= +git.openprivacy.ca/openprivacy/connectivity v1.4.2/go.mod h1:bR0Myx9nm2YzWtsThRelkNMV4Pp7sPDa123O1qsAbVo= git.openprivacy.ca/openprivacy/connectivity v1.4.5 h1:UYMdCWPzEAP7LbqdMXGNXmfKjWlvfnKdmewBtnbgQRI= git.openprivacy.ca/openprivacy/connectivity v1.4.5/go.mod h1:JVRCIdL+lAG6ohBFWiKeC/MN42nnC0sfFszR9XG6vPQ= +git.openprivacy.ca/openprivacy/log v1.0.1/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw= git.openprivacy.ca/openprivacy/log v1.0.2 h1:HLP4wsw4ljczFAelYnbObIs821z+jgMPCe8uODPnGQM= git.openprivacy.ca/openprivacy/log v1.0.2/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -33,13 +40,22 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg= go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee h1:4yd7jl+vXjalO5ztz6Vc1VADv+S/80LGJmyl1ROJ2AI= golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -60,7 +76,9 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/lib.go b/lib.go index 64af745..652c5fe 100644 --- a/lib.go +++ b/lib.go @@ -12,10 +12,10 @@ import ( "cwtch.im/cwtch/peer" "encoding/json" "fmt" - "git.openprivacy.ca/flutter/libcwtch-go/constants" - contact "git.openprivacy.ca/flutter/libcwtch-go/features/contacts" - "git.openprivacy.ca/flutter/libcwtch-go/features/groups" - "git.openprivacy.ca/flutter/libcwtch-go/utils" + "git.openprivacy.ca/cwtch.im/libcwtch-go/constants" + contact "git.openprivacy.ca/cwtch.im/libcwtch-go/features/contacts" + "git.openprivacy.ca/cwtch.im/libcwtch-go/features/groups" + "git.openprivacy.ca/cwtch.im/libcwtch-go/utils" "git.openprivacy.ca/openprivacy/connectivity" "os/user" "runtime" diff --git a/utils/eventHandler.go b/utils/eventHandler.go index 2108c90..cba106b 100644 --- a/utils/eventHandler.go +++ b/utils/eventHandler.go @@ -7,8 +7,8 @@ import ( "cwtch.im/cwtch/model/attr" "cwtch.im/cwtch/protocol/connections" "encoding/json" - "git.openprivacy.ca/flutter/libcwtch-go/constants" - "git.openprivacy.ca/flutter/libcwtch-go/features/groups" + "git.openprivacy.ca/cwtch.im/libcwtch-go/constants" + "git.openprivacy.ca/cwtch.im/libcwtch-go/features/groups" "git.openprivacy.ca/openprivacy/log" "strconv" ) diff --git a/utils/manager.go b/utils/manager.go index c704596..ea6528f 100644 --- a/utils/manager.go +++ b/utils/manager.go @@ -6,7 +6,7 @@ import ( "cwtch.im/cwtch/peer" "cwtch.im/cwtch/protocol/connections" "errors" - "git.openprivacy.ca/flutter/libcwtch-go/constants" + "git.openprivacy.ca/cwtch.im/libcwtch-go/constants" "git.openprivacy.ca/openprivacy/log" "strconv" "strings"