Skip to content

Commit cec6ca7

Browse files
committed
target Go 1.13 Beta 1, update version to GopherJS 1.13-wip
Reference: https://groups.google.com/d/msg/golang-announce/fmU5r5NfHZs/xU3Ym5KJCAAJ. Updates #929
1 parent 3e4dfb7 commit cec6ca7

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

circle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- checkout
1212
- run: git clone https://github.com/creationix/nvm $HOME/.nvm && cd $HOME/.nvm && git checkout v0.33.9 && echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV && echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
1313
- run: nvm install 10.0.0 && nvm alias default 10.0.0
14-
- run: cd /usr/local && sudo rm -rf go && curl https://storage.googleapis.com/golang/go1.12.linux-amd64.tar.gz | sudo tar -xz
14+
- run: cd /usr/local && sudo rm -rf go && curl https://storage.googleapis.com/golang/go1.13beta1.linux-amd64.tar.gz | sudo tar -xz
1515
- run: echo 'export PATH="$PATH:/usr/local/go/bin:$HOME/go/bin"' >> $BASH_ENV
1616
- run: go get -t -d -v ./...
1717
- run: go install -v

compiler/compiler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
var sizes32 = &types.StdSizes{WordSize: 4, MaxAlign: 8}
1919
var reservedKeywords = make(map[string]bool)
20-
var _ = ___GOPHERJS_REQUIRES_GO_VERSION_1_12___ // Compile error on other Go versions, because they're not supported.
20+
var _ = ___GOPHERJS_REQUIRES_GO_VERSION_1_13___ // Compile error on other Go versions, because they're not supported.
2121

2222
func init() {
2323
for _, keyword := range []string{"abstract", "arguments", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "eval", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new", "null", "package", "private", "protected", "public", "return", "short", "static", "super", "switch", "synchronized", "this", "throw", "throws", "transient", "true", "try", "typeof", "undefined", "var", "void", "volatile", "while", "with", "yield"} {

compiler/version_check.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// +build go1.12
2-
// +build !go1.13
1+
// +build go1.13
2+
// +build !go1.14
33

44
package compiler
55

6-
const ___GOPHERJS_REQUIRES_GO_VERSION_1_12___ = true
6+
const ___GOPHERJS_REQUIRES_GO_VERSION_1_13___ = true
77

88
// Version is the GopherJS compiler version string.
9-
const Version = "1.12-2"
9+
const Version = "1.13-wip"

0 commit comments

Comments
 (0)