Skip to content
Permalink
Browse files

update dependencies

Take advantage of a recent update to the GopherJS compiler that
allows it to build with newer versions of Go to make it so that
Conception-go can be built with the latest version of Go.

Also update to glfw/v3.3, since it fixes warnings and improves
compatibility.

Updates gopherjs/gopherjs#941.
  • Loading branch information
dmitshur committed Feb 9, 2020
1 parent c361540 commit 7c2afaf2e798e042be848e0180316318c4c790c3
Showing with 21 additions and 24 deletions.
  1. +1 −1 README.md
  2. +18 −21 go.mod
  3. +2 −2 main.go
@@ -40,7 +40,7 @@ $(go env GOPATH)/bin/Conception-go
```bash
# Install latest Go (if you don't already have it).
sudo apt-get install --yes curl
curl -L https://golang.org/dl/go1.12.4.linux-amd64.tar.gz | sudo tar zx -C /usr/local/
curl -L https://golang.org/dl/go1.13.7.linux-amd64.tar.gz | sudo tar zx -C /usr/local/
export PATH="$PATH:/usr/local/go/bin"
# Install git, OpenGL headers (if you don't already have them).
39 go.mod
@@ -3,43 +3,40 @@ module github.com/shurcooL-legacy/Conception-go
go 1.12

require (
github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c
github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8
github.com/fsnotify/fsnotify v1.4.7 // indirect
github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1
github.com/go-gl/mathgl v0.0.0-20190416160123-c4601bc793c7
github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e // indirect
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72
github.com/go-gl/mathgl v0.0.0-20190713194549-592312d8590a
github.com/gopherjs/gopherjs v0.0.0-20200209144316-f9cef593def5 // indirect
github.com/goxjs/gl v0.0.0-20171128034433-dc8f4a9a3c9c
github.com/goxjs/glfw v0.0.0-20171018044755-7dec05603e06
github.com/goxjs/glfw v0.0.0-20191126052801-d2efb5f20838
github.com/kisielk/gotool v1.0.0 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/mattn/go-runewidth v0.0.4
github.com/mattn/go-runewidth v0.0.8
github.com/mb0/diff v0.0.0-20131118162322-d8d9a906c24d
github.com/microcosm-cc/bluemonday v1.0.2 // indirect
github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86 // indirect
github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab // indirect
github.com/pkg/math v0.0.0-20141027224758-f2ed9e40e245
github.com/sergi/go-diff v1.0.0
github.com/sergi/go-diff v1.1.0
github.com/shurcooL-legacy/octicons v0.0.0-20180602233653-10c8018fdc76
github.com/shurcooL/frontend v0.0.0-20180531171852-7e359e4b7b17
github.com/shurcooL/frontend v0.0.0-20191223011957-441c9e127002
github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470
github.com/shurcooL/go v0.0.0-20190330031554-6713ea532688
github.com/shurcooL/go v0.0.0-20191216061654-b114cc39af9f
github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041
github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c // indirect
github.com/shurcooL/gopherjslib v0.0.0-20200209150458-30f639db26d4 // indirect
github.com/shurcooL/highlight_diff v0.0.0-20181222201841-111da2e7d480 // indirect
github.com/shurcooL/highlight_go v0.0.0-20181215221002-9d8641ddf2e1
github.com/shurcooL/httpfs v0.0.0-20181222201310-74dc9339e414
github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9
github.com/shurcooL/markdownfmt v0.0.0-20190409060426-3438a10682f5
github.com/shurcooL/octicon v0.0.0-20181222203144-9ff1a4cf27f4 // indirect
github.com/shurcooL/highlight_go v0.0.0-20191220051317-782971ddf21b
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
github.com/shurcooL/httpgzip v0.0.0-20190720172056-320755c1c1b0
github.com/shurcooL/markdownfmt v0.0.0-20191117054414-21fe95c248e9
github.com/shurcooL/octicon v0.0.0-20191102190552-cbb32d6a785c // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
github.com/sourcegraph/go-diff v0.5.1
github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e
github.com/stretchr/testify v1.3.0 // indirect
golang.org/x/net v0.0.0-20190420063019-afa5a82059c6
golang.org/x/tools v0.0.0-20190420181800-aa740d480789
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
golang.org/x/net v0.0.0-20200202094626-16171245cfb2
golang.org/x/tools v0.0.0-20200207224406-61798d64f025
gopkg.in/pipe.v2 v2.0.0-20140414041502-3c2ca4d52544
honnef.co/go/js/dom v0.0.0-20190403051653-d6d651dc5aea // indirect
honnef.co/go/js/dom v0.0.0-20190526011328-ebc4cf92d81f // indirect
)
@@ -36,7 +36,7 @@ import (

"github.com/bradfitz/iter"
"github.com/go-gl/gl/v2.1/gl"
"github.com/go-gl/glfw/v3.2/glfw"
"github.com/go-gl/glfw/v3.3/glfw"
"github.com/go-gl/mathgl/mgl64"
"github.com/mattn/go-runewidth"
intmath "github.com/pkg/math"
@@ -5763,7 +5763,7 @@ func (w *TextBoxWidget) ProcessEvent(inputEvent InputEvent) {
}
case glfw.KeyV:
if inputEvent.ModifierKey == glfw.ModSuper {
if clipboard, err := globalWindow.GetClipboardString(); err == nil && clipboard != "" { // TODO: Don't use globalWindow
if clipboard := globalWindow.GetClipboardString(); clipboard != "" { // TODO: Don't use globalWindow
w.caretPosition.ReplaceSelectionWith(clipboard)
}
}

0 comments on commit 7c2afaf

Please sign in to comment.
You can’t perform that action at this time.