From f9436906c151fe126ab3487f7ab18a13239c33b8 Mon Sep 17 00:00:00 2001 From: Yurii Soldak Date: Sat, 29 Apr 2023 17:58:07 +0200 Subject: [PATCH] all: go 1.18 and remove old-style build tags --- adapter_linux.go | 1 - adapter_nrf51.go | 1 - adapter_nrf528xx-full.go | 1 - adapter_nrf528xx-peripheral.go | 1 - adapter_nrf528xx.go | 1 - adapter_s110.go | 1 - adapter_s113v7.go | 1 - adapter_s132.go | 1 - adapter_s140v6.go | 1 - adapter_s140v7.go | 1 - adapter_sd.go | 1 - error_sd.go | 1 - examples/discover/mcu.go | 2 +- examples/discover/os.go | 2 +- examples/heartrate-monitor/mcu.go | 2 +- examples/heartrate-monitor/os.go | 2 +- gap_linux.go | 1 - gap_nrf51.go | 1 - gap_nrf528xx-advertisement.go | 1 - gap_nrf528xx-central.go | 1 - gattc_linux.go | 1 - gattc_sd.go | 1 - gatts_linux.go | 1 - gatts_other.go | 1 - gatts_sd.go | 1 - go.mod | 15 +++++++++----- go.sum | 27 -------------------------- rawterm/hosted.go | 2 +- rawterm/nrf.go | 2 +- tools/gen-characteristic-uuids/main.go | 1 - tools/gen-service-uuids/main.go | 1 - uuid_sd.go | 1 - 32 files changed, 16 insertions(+), 62 deletions(-) diff --git a/adapter_linux.go b/adapter_linux.go index 529e02b..8ff9260 100644 --- a/adapter_linux.go +++ b/adapter_linux.go @@ -1,5 +1,4 @@ //go:build !baremetal -// +build !baremetal // Some documentation for the BlueZ D-Bus interface: // https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/doc diff --git a/adapter_nrf51.go b/adapter_nrf51.go index ef35ddf..a46efb3 100644 --- a/adapter_nrf51.go +++ b/adapter_nrf51.go @@ -1,5 +1,4 @@ //go:build softdevice && s110v8 -// +build softdevice,s110v8 package bluetooth diff --git a/adapter_nrf528xx-full.go b/adapter_nrf528xx-full.go index a602b77..64dc954 100644 --- a/adapter_nrf528xx-full.go +++ b/adapter_nrf528xx-full.go @@ -1,5 +1,4 @@ //go:build (softdevice && s132v6) || (softdevice && s140v6) || (softdevice && s140v7) -// +build softdevice,s132v6 softdevice,s140v6 softdevice,s140v7 package bluetooth diff --git a/adapter_nrf528xx-peripheral.go b/adapter_nrf528xx-peripheral.go index 2cd1d4f..3b4ab51 100644 --- a/adapter_nrf528xx-peripheral.go +++ b/adapter_nrf528xx-peripheral.go @@ -1,5 +1,4 @@ //go:build softdevice && s113v7 -// +build softdevice,s113v7 package bluetooth diff --git a/adapter_nrf528xx.go b/adapter_nrf528xx.go index 3f8a39b..7c47f4e 100644 --- a/adapter_nrf528xx.go +++ b/adapter_nrf528xx.go @@ -1,5 +1,4 @@ //go:build (softdevice && s113v7) || (softdevice && s132v6) || (softdevice && s140v6) || (softdevice && s140v7) -// +build softdevice,s113v7 softdevice,s132v6 softdevice,s140v6 softdevice,s140v7 package bluetooth diff --git a/adapter_s110.go b/adapter_s110.go index 3cec2e4..4a03668 100644 --- a/adapter_s110.go +++ b/adapter_s110.go @@ -1,5 +1,4 @@ //go:build softdevice && s110v8 -// +build softdevice,s110v8 package bluetooth diff --git a/adapter_s113v7.go b/adapter_s113v7.go index 1119b25..ada240d 100644 --- a/adapter_s113v7.go +++ b/adapter_s113v7.go @@ -1,5 +1,4 @@ //go:build softdevice && s113v7 -// +build softdevice,s113v7 package bluetooth diff --git a/adapter_s132.go b/adapter_s132.go index d9bb5f6..0bc924f 100644 --- a/adapter_s132.go +++ b/adapter_s132.go @@ -1,5 +1,4 @@ //go:build softdevice && s132v6 -// +build softdevice,s132v6 package bluetooth diff --git a/adapter_s140v6.go b/adapter_s140v6.go index eec190a..764932f 100644 --- a/adapter_s140v6.go +++ b/adapter_s140v6.go @@ -1,5 +1,4 @@ //go:build softdevice && s140v6 -// +build softdevice,s140v6 package bluetooth diff --git a/adapter_s140v7.go b/adapter_s140v7.go index 974307d..ded15c3 100644 --- a/adapter_s140v7.go +++ b/adapter_s140v7.go @@ -1,5 +1,4 @@ //go:build softdevice && s140v7 -// +build softdevice,s140v7 package bluetooth diff --git a/adapter_sd.go b/adapter_sd.go index 6f2bd03..24963b3 100644 --- a/adapter_sd.go +++ b/adapter_sd.go @@ -1,5 +1,4 @@ //go:build softdevice -// +build softdevice package bluetooth diff --git a/error_sd.go b/error_sd.go index ee9f867..16c43ee 100644 --- a/error_sd.go +++ b/error_sd.go @@ -1,5 +1,4 @@ //go:build softdevice -// +build softdevice package bluetooth diff --git a/examples/discover/mcu.go b/examples/discover/mcu.go index ab0d7c1..ffde2f4 100644 --- a/examples/discover/mcu.go +++ b/examples/discover/mcu.go @@ -1,4 +1,4 @@ -// +build baremetal +//go:build baremetal package main diff --git a/examples/discover/os.go b/examples/discover/os.go index caed49c..f783ead 100644 --- a/examples/discover/os.go +++ b/examples/discover/os.go @@ -1,4 +1,4 @@ -// +build !baremetal +//go:build !baremetal package main diff --git a/examples/heartrate-monitor/mcu.go b/examples/heartrate-monitor/mcu.go index e12c479..3527bde 100644 --- a/examples/heartrate-monitor/mcu.go +++ b/examples/heartrate-monitor/mcu.go @@ -1,4 +1,4 @@ -// +build baremetal +//go:build baremetal package main diff --git a/examples/heartrate-monitor/os.go b/examples/heartrate-monitor/os.go index 14cf255..7352ae0 100644 --- a/examples/heartrate-monitor/os.go +++ b/examples/heartrate-monitor/os.go @@ -1,4 +1,4 @@ -// +build !baremetal +//go:build !baremetal package main diff --git a/gap_linux.go b/gap_linux.go index 74e6121..542096c 100644 --- a/gap_linux.go +++ b/gap_linux.go @@ -1,5 +1,4 @@ //go:build !baremetal -// +build !baremetal package bluetooth diff --git a/gap_nrf51.go b/gap_nrf51.go index 8a54ab7..9771d52 100644 --- a/gap_nrf51.go +++ b/gap_nrf51.go @@ -1,5 +1,4 @@ //go:build softdevice && s110v8 -// +build softdevice,s110v8 package bluetooth diff --git a/gap_nrf528xx-advertisement.go b/gap_nrf528xx-advertisement.go index e1cdbe3..9b3a653 100644 --- a/gap_nrf528xx-advertisement.go +++ b/gap_nrf528xx-advertisement.go @@ -1,5 +1,4 @@ //go:build (softdevice && s113v7) || (softdevice && s132v6) || (softdevice && s140v6) || (softdevice && s140v7) -// +build softdevice,s113v7 softdevice,s132v6 softdevice,s140v6 softdevice,s140v7 package bluetooth diff --git a/gap_nrf528xx-central.go b/gap_nrf528xx-central.go index a6123fa..d3faa4a 100644 --- a/gap_nrf528xx-central.go +++ b/gap_nrf528xx-central.go @@ -1,5 +1,4 @@ //go:build (softdevice && s132v6) || (softdevice && s140v6) || (softdevice && s140v7) -// +build softdevice,s132v6 softdevice,s140v6 softdevice,s140v7 package bluetooth diff --git a/gattc_linux.go b/gattc_linux.go index 0b8ae8c..462040d 100644 --- a/gattc_linux.go +++ b/gattc_linux.go @@ -1,5 +1,4 @@ //go:build !baremetal -// +build !baremetal package bluetooth diff --git a/gattc_sd.go b/gattc_sd.go index 8c7ca73..018d398 100644 --- a/gattc_sd.go +++ b/gattc_sd.go @@ -1,5 +1,4 @@ //go:build (softdevice && s132v6) || (softdevice && s140v6) || (softdevice && s140v7) -// +build softdevice,s132v6 softdevice,s140v6 softdevice,s140v7 package bluetooth diff --git a/gatts_linux.go b/gatts_linux.go index fe5e549..288ca2a 100644 --- a/gatts_linux.go +++ b/gatts_linux.go @@ -1,5 +1,4 @@ //go:build !baremetal -// +build !baremetal package bluetooth diff --git a/gatts_other.go b/gatts_other.go index 128371a..ac0312b 100644 --- a/gatts_other.go +++ b/gatts_other.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package bluetooth diff --git a/gatts_sd.go b/gatts_sd.go index ea8078d..0630889 100644 --- a/gatts_sd.go +++ b/gatts_sd.go @@ -1,5 +1,4 @@ //go:build softdevice -// +build softdevice package bluetooth diff --git a/go.mod b/go.mod index 50f2586..b2d18df 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,23 @@ module tinygo.org/x/bluetooth -go 1.15 +go 1.18 require ( github.com/go-ole/go-ole v1.2.6 github.com/godbus/dbus/v5 v5.0.3 github.com/muka/go-bluetooth v0.0.0-20220830075246-0746e3a1ea53 github.com/saltosystems/winrt-go v0.0.0-20230613063811-c792451fa808 - github.com/sirupsen/logrus v1.9.0 // indirect github.com/tinygo-org/cbgo v0.0.4 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 - golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect tinygo.org/x/drivers v0.25.0 - tinygo.org/x/tinyfont v0.4.0 // indirect tinygo.org/x/tinyterm v0.1.0 ) + +require ( + github.com/fatih/structs v1.1.0 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/sirupsen/logrus v1.9.0 // indirect + golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + tinygo.org/x/tinyfont v0.4.0 // indirect +) diff --git a/go.sum b/go.sum index a5414dc..a38e192 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/bgould/http v0.0.0-20190627042742-d268792bdee7/go.mod h1:BTqvVegvwifopl4KTEDth6Zezs9eR+lCWhvGKvkxJHE= 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= @@ -7,9 +6,6 @@ github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7j github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/frankban/quicktest v1.10.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= -github.com/glerchundi/subcommands v0.0.0-20181212083838-923a6ccb11f8/go.mod h1:r0g3O7Y5lrWXgDfcFBRgnAKzjmPgTzwoMC2ieB345FY= -github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= @@ -23,15 +19,11 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/muka/go-bluetooth v0.0.0-20220830075246-0746e3a1ea53 h1:zfLHhuGzmSbthZ00FfbEjgAHUOOj7NGiITojMTCFy6U= github.com/muka/go-bluetooth v0.0.0-20220830075246-0746e3a1ea53/go.mod h1:dMCjicU6vRBk34dqOmIZm0aod6gUwZXOXzBROqGous0= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/paypal/gatt v0.0.0-20151011220935-4ae819d591cf/go.mod h1:+AwQL2mK3Pd3S+TUwg0tYQjid0q1txyNUJuuSmz8Kdk= -github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= -github.com/peterbourgon/ff/v3 v3.1.2/go.mod h1:XNJLY8EIl6MjMVjBS4F0+G0LYoAqs0DTa4rmHHukKDE= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -43,38 +35,28 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q= -github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/suapapa/go_eddystone v1.3.1/go.mod h1:bXC11TfJOS+3g3q/Uzd7FKd5g62STQEfeEIhcKe4Qy8= -github.com/tdakkota/win32metadata v0.1.0/go.mod h1:77e6YvX0LIVW+O81fhWLnXAxxcyu/wdZdG7iwed7Fyk= github.com/tinygo-org/cbgo v0.0.4 h1:3D76CRYbH03Rudi8sEgs/YO0x3JIMdyq8jlQtk/44fU= github.com/tinygo-org/cbgo v0.0.4/go.mod h1:7+HgWIHd4nbAz0ESjGlJ1/v9LDU1Ox8MGzP9mah/fLk= github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= 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-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -golang.org/x/image v0.0.0-20220617043117-41969df76e82/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= 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-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -83,9 +65,6 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -93,24 +72,18 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= 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/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200925191224-5d1fdd8fa346/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= tinygo.org/x/drivers v0.14.0/go.mod h1:uT2svMq3EpBZpKkGO+NQHjxjGf1f42ra4OnMMwQL2aI= tinygo.org/x/drivers v0.15.1/go.mod h1:uT2svMq3EpBZpKkGO+NQHjxjGf1f42ra4OnMMwQL2aI= tinygo.org/x/drivers v0.16.0/go.mod h1:uT2svMq3EpBZpKkGO+NQHjxjGf1f42ra4OnMMwQL2aI= diff --git a/rawterm/hosted.go b/rawterm/hosted.go index fa39f2e..1617931 100644 --- a/rawterm/hosted.go +++ b/rawterm/hosted.go @@ -1,4 +1,4 @@ -// +build linux,!baremetal darwin +//go:build (linux && !baremetal) || darwin // Package rawterm provides some sort of raw terminal interface, both on hosted // systems and baremetal. It is intended only for use by examples. diff --git a/rawterm/nrf.go b/rawterm/nrf.go index ac1e56d..ab65667 100644 --- a/rawterm/nrf.go +++ b/rawterm/nrf.go @@ -1,4 +1,4 @@ -// +build nrf +//go:build nrf package rawterm diff --git a/tools/gen-characteristic-uuids/main.go b/tools/gen-characteristic-uuids/main.go index 5472671..794e1fd 100644 --- a/tools/gen-characteristic-uuids/main.go +++ b/tools/gen-characteristic-uuids/main.go @@ -1,5 +1,4 @@ //go:build ignore -// +build ignore package main diff --git a/tools/gen-service-uuids/main.go b/tools/gen-service-uuids/main.go index 6a7f7f5..cad8dcc 100644 --- a/tools/gen-service-uuids/main.go +++ b/tools/gen-service-uuids/main.go @@ -1,5 +1,4 @@ //go:build ignore -// +build ignore package main diff --git a/uuid_sd.go b/uuid_sd.go index e8c03b1..b8b28fe 100644 --- a/uuid_sd.go +++ b/uuid_sd.go @@ -1,5 +1,4 @@ //go:build softdevice -// +build softdevice package bluetooth