Skip to content

Commit f5f519d

Browse files
ianlancetaylorianlancetaylor
committed
shiny: add go.mod file
The shiny package is not related to other exp packages. Put it in a separate module. This package uses a modified copy of github.com/BurntSushi/xgb. Move that out of the vendor directory, so that current go commands work. For golang/go#37175 Change-Id: Ib3bad0823d2651ff90a9651e405ed7bcd9de94b6 Reviewed-on: https://go-review.googlesource.com/c/exp/+/383197 Trust: Ian Lance Taylor <[email protected]> Run-TryBot: Ian Lance Taylor <[email protected]> Trust: Nigel Tao <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent d4f80a9 commit f5f519d

24 files changed

+70
-24
lines changed

‎shiny/driver/x11driver/buffer.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ import (
1212
"sync"
1313
"unsafe"
1414

15-
"github.com/BurntSushi/xgb"
16-
"github.com/BurntSushi/xgb/render"
17-
"github.com/BurntSushi/xgb/shm"
18-
"github.com/BurntSushi/xgb/xproto"
15+
"golang.org/x/exp/shiny/internal/xgb"
16+
"golang.org/x/exp/shiny/internal/xgb/render"
17+
"golang.org/x/exp/shiny/internal/xgb/shm"
18+
"golang.org/x/exp/shiny/internal/xgb/xproto"
19+
1920
"golang.org/x/exp/shiny/driver/internal/swizzle"
2021
)
2122

‎shiny/driver/x11driver/buffer_fallback.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import (
88
"image"
99
"sync"
1010

11-
"github.com/BurntSushi/xgb"
12-
"github.com/BurntSushi/xgb/xproto"
11+
"golang.org/x/exp/shiny/internal/xgb"
12+
"golang.org/x/exp/shiny/internal/xgb/xproto"
13+
1314
"golang.org/x/exp/shiny/driver/internal/swizzle"
1415
)
1516

‎shiny/driver/x11driver/screen.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"log"
1313
"sync"
1414

15-
"github.com/BurntSushi/xgb"
16-
"github.com/BurntSushi/xgb/render"
17-
"github.com/BurntSushi/xgb/shm"
18-
"github.com/BurntSushi/xgb/xproto"
15+
"golang.org/x/exp/shiny/internal/xgb"
16+
"golang.org/x/exp/shiny/internal/xgb/render"
17+
"golang.org/x/exp/shiny/internal/xgb/shm"
18+
"golang.org/x/exp/shiny/internal/xgb/xproto"
1919

2020
"golang.org/x/exp/shiny/driver/internal/x11key"
2121
"golang.org/x/exp/shiny/screen"

‎shiny/driver/x11driver/texture.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"math"
1212
"sync"
1313

14-
"github.com/BurntSushi/xgb/render"
15-
"github.com/BurntSushi/xgb/xproto"
14+
"golang.org/x/exp/shiny/internal/xgb/render"
15+
"golang.org/x/exp/shiny/internal/xgb/xproto"
1616

1717
"golang.org/x/exp/shiny/screen"
1818
"golang.org/x/image/math/f64"

‎shiny/driver/x11driver/window.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"image/draw"
1313
"sync"
1414

15-
"github.com/BurntSushi/xgb"
16-
"github.com/BurntSushi/xgb/render"
17-
"github.com/BurntSushi/xgb/xproto"
15+
"golang.org/x/exp/shiny/internal/xgb"
16+
"golang.org/x/exp/shiny/internal/xgb/render"
17+
"golang.org/x/exp/shiny/internal/xgb/xproto"
1818

1919
"golang.org/x/exp/shiny/driver/internal/drawer"
2020
"golang.org/x/exp/shiny/driver/internal/event"

‎shiny/driver/x11driver/x11driver.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ package x11driver // import "golang.org/x/exp/shiny/driver/x11driver"
1313
import (
1414
"fmt"
1515

16-
"github.com/BurntSushi/xgb"
17-
"github.com/BurntSushi/xgb/render"
18-
"github.com/BurntSushi/xgb/shm"
16+
"golang.org/x/exp/shiny/internal/xgb"
17+
"golang.org/x/exp/shiny/internal/xgb/render"
18+
"golang.org/x/exp/shiny/internal/xgb/shm"
1919

2020
"golang.org/x/exp/shiny/driver/internal/errscreen"
2121
"golang.org/x/exp/shiny/screen"

‎shiny/go.mod

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module golang.org/x/exp/shiny
2+
3+
go 1.18
4+
5+
require (
6+
dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037
7+
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4
8+
golang.org/x/image v0.0.0-20190802002840-cff245a6509b
9+
golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f
10+
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654
11+
)

‎shiny/go.sum

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037 h1:+PdD6GLKejR9DizMAKT5DpSAkKswvZrurk1/eEt9+pw=
2+
dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
3+
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
4+
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I=
5+
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
6+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
7+
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
8+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
9+
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 h1:estk1glOnSVeJ9tdEZZc5mAMDZk5lNJNyJ6DvrBkTEU=
10+
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
11+
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
12+
golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4=
13+
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
14+
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
15+
golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f h1:kgfVkAEEQXXQ0qc6dH7n6y37NAYmTFmz0YRwrRjgxKw=
16+
golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
17+
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
18+
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
19+
golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
20+
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
21+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
22+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
23+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
24+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
25+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
26+
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0=
27+
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
28+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
29+
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
30+
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
31+
golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
32+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
33+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎shiny/vendor/github.com/BurntSushi/xgb/AUTHORS renamed to ‎shiny/internal/xgb/AUTHORS

File renamed without changes.

‎shiny/vendor/github.com/BurntSushi/xgb/CONTRIBUTORS renamed to ‎shiny/internal/xgb/CONTRIBUTORS

File renamed without changes.

‎shiny/vendor/github.com/BurntSushi/xgb/LICENSE renamed to ‎shiny/internal/xgb/LICENSE

File renamed without changes.

‎shiny/vendor/github.com/BurntSushi/xgb/README renamed to ‎shiny/internal/xgb/README

File renamed without changes.

‎shiny/vendor/github.com/BurntSushi/xgb/README.vendor renamed to ‎shiny/internal/xgb/README.vendor

File renamed without changes.

‎shiny/vendor/github.com/BurntSushi/xgb/auth.go renamed to ‎shiny/internal/xgb/auth.go

File renamed without changes.

‎shiny/vendor/github.com/BurntSushi/xgb/conn.go renamed to ‎shiny/internal/xgb/conn.go

File renamed without changes.

‎shiny/vendor/github.com/BurntSushi/xgb/cookie.go renamed to ‎shiny/internal/xgb/cookie.go

File renamed without changes.

‎shiny/vendor/github.com/BurntSushi/xgb/doc.go renamed to ‎shiny/internal/xgb/doc.go

File renamed without changes.

‎shiny/vendor/github.com/BurntSushi/xgb/help.go renamed to ‎shiny/internal/xgb/help.go

File renamed without changes.

‎shiny/vendor/github.com/BurntSushi/xgb/render/render.go renamed to ‎shiny/internal/xgb/render/render.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ package render
44
// This file is automatically generated from render.xml. Edit at your peril!
55

66
import (
7-
"github.com/BurntSushi/xgb"
7+
"golang.org/x/exp/shiny/internal/xgb"
88

9-
"github.com/BurntSushi/xgb/xproto"
9+
"golang.org/x/exp/shiny/internal/xgb/xproto"
1010
)
1111

1212
// Init must be called before using the RENDER extension.

‎shiny/vendor/github.com/BurntSushi/xgb/shm/shm.go renamed to ‎shiny/internal/xgb/shm/shm.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ package shm
44
// This file is automatically generated from shm.xml. Edit at your peril!
55

66
import (
7-
"github.com/BurntSushi/xgb"
7+
"golang.org/x/exp/shiny/internal/xgb"
88

9-
"github.com/BurntSushi/xgb/xproto"
9+
"golang.org/x/exp/shiny/internal/xgb/xproto"
1010
)
1111

1212
// Init must be called before using the MIT-SHM extension.

‎shiny/vendor/github.com/BurntSushi/xgb/sync.go renamed to ‎shiny/internal/xgb/sync.go

File renamed without changes.

‎shiny/vendor/github.com/BurntSushi/xgb/xgb.go renamed to ‎shiny/internal/xgb/xgb.go

File renamed without changes.

‎shiny/vendor/github.com/BurntSushi/xgb/xproto/xproto.go renamed to ‎shiny/internal/xgb/xproto/xproto.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package xproto
44
// This file is automatically generated from xproto.xml. Edit at your peril!
55

66
import (
7-
"github.com/BurntSushi/xgb"
7+
"golang.org/x/exp/shiny/internal/xgb"
88
)
99

1010
// Setup parses the setup bytes retrieved when

‎shiny/vendor/github.com/BurntSushi/xgb/xproto/xproto_test.go renamed to ‎shiny/internal/xgb/xproto/xproto_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"testing"
2828
"time"
2929

30-
"github.com/BurntSushi/xgb"
30+
"golang.org/x/exp/shiny/internal/xgb"
3131
)
3232

3333
// The X connection used throughout testing.

0 commit comments

Comments
 (0)