all: update go and backend tools

.github/workflows/build.yml

@@ -1,7 +1,7 @@
 'name': 'build'
 
 'env':
-  'GO_VERSION': '1.15'
+  'GO_VERSION': '1.16'
   'NODE_VERSION': '14'
 
 'on':

.gitignore

@@ -5,7 +5,6 @@
 # See https://stackoverflow.com/a/7335487/1892060.
 #
 # Only build, run, and test outputs here.  Sorted.
-*-packr.go
 *.db
 *.log
 *.snap

CHANGELOG.md

@@ -13,6 +13,21 @@ and this project adheres to
 ## [v0.107.0] - 2021-06-28 (APPROX.)
 -->
 
+### Deprecated
+
+<!--
+TODO(a.garipov): Remove the Go 1.16 deprecation message if Go 1.17 is not
+released by then.
+-->
+
+- Go 1.16 support.  v0.108.0 will require at least Go 1.17 to build.
+
+### Removed
+
+- Go 1.15 support.
+
+
+
 ## [v0.106.3] - 2021-05-19
 
 ### Added

Makefile

@@ -33,6 +33,21 @@ YARN_INSTALL_FLAGS = $(YARN_FLAGS) --network-timeout 120000 --silent\
 	--ignore-engines --ignore-optional --ignore-platform\
 	--ignore-scripts
 
+# Macros for the build-release target.  If FRONTEND_PREBUILT is 0, the
+# default, the macro $(BUILD_RELEASE_DEPS_$(FRONTEND_PREBUILT)) expands
+# into BUILD_RELEASE_DEPS_0, and so both frontend and backend
+# dependencies are fetched and the frontend is built.  Otherwise, if
+# FRONTEND_PREBUILT is 1, only backend dependencies are fetched and the
+# frontend isn't reuilt.
+#
+# TODO(a.garipov): We could probably do that from .../build-release.sh,
+# but that would mean either calling make from inside make or
+# duplicating commands in two places, both of which don't seem to me
+# like nice solutions.
+FRONTEND_PREBUILT = 0
+BUILD_RELEASE_DEPS_0 = deps js-build
+BUILD_RELEASE_DEPS_1 = go-deps
+
 ENV = env\
 	COMMIT='$(COMMIT)'\
 	CHANNEL='$(CHANNEL)'\
@@ -65,7 +80,7 @@ test: js-test go-test
 # expand to something like "C:/Program Files/Git/usr/bin/sh.exe".
 build-docker: ; $(ENV) "$(SHELL)" ./scripts/make/build-docker.sh
 
-build-release: deps js-build
+build-release: $(BUILD_RELEASE_DEPS_$(FRONTEND_PREBUILT))
 	$(ENV) "$(SHELL)" ./scripts/make/build-release.sh
 
 clean: ; $(ENV) "$(SHELL)" ./scripts/make/clean.sh

README.md

@@ -185,7 +185,7 @@ Run `make init` to prepare the development environment.
 
 You will need this to build AdGuard Home:
 
- * [go](https://golang.org/dl/) v1.15 or later.
+ * [go](https://golang.org/dl/) v1.16 or later.
  * [node.js](https://nodejs.org/en/download/) v10.16.2 or later.
  * [npm](https://www.npmjs.com/) v6.14 or later (temporary requirement, TODO: remove when redesign is finished).
  * [yarn](https://yarnpkg.com/) v1.22.5 or later.
@@ -338,7 +338,6 @@ Here's what you can also do to contribute:
 This software wouldn't have been possible without:
 
  * [Go](https://golang.org/dl/) and it's libraries:
-   * [packr](https://github.com/gobuffalo/packr)
    * [gcache](https://github.com/bluele/gcache)
    * [miekg's dns](https://github.com/miekg/dns)
    * [go-yaml](https://github.com/go-yaml/yaml)

bamboo-specs/release.yaml

@@ -7,7 +7,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
   'channel': 'edge'
-  'dockerGo': 'adguard/golang-ubuntu:2.0'
+  'dockerGo': 'adguard/golang-ubuntu:3.0'
 
 'stages':
 - 'Make release':

bamboo-specs/test.yaml

@@ -5,7 +5,7 @@
   'key': 'AHBRTSPECS'
   'name': 'AdGuard Home - Build and run tests'
 'variables':
-  'dockerGo': 'adguard/golang-ubuntu:2.0'
+  'dockerGo': 'adguard/golang-ubuntu:3.0'
 
 'stages':
 - 'Tests':

go.mod

@@ -1,6 +1,6 @@
 module github.com/AdguardTeam/AdGuardHome
 
-go 1.15
+go 1.16
 
 require (
 	github.com/AdguardTeam/dnsproxy v0.37.4
@@ -10,34 +10,26 @@ require (
 	github.com/ameshkov/dnscrypt/v2 v2.1.3
 	github.com/digineo/go-ipset/v2 v2.2.1
 	github.com/fsnotify/fsnotify v1.4.9
-	github.com/go-ping/ping v0.0.0-20210216210419-25d1413fb7bb
-	github.com/gobuffalo/envy v1.9.0 // indirect
-	github.com/gobuffalo/packr v1.30.1
-	github.com/gobuffalo/packr/v2 v2.8.1 // indirect
+	github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
 	github.com/google/go-cmp v0.5.5 // indirect
-	github.com/google/renameio v1.0.1-0.20210406141108-81588dbe0453
+	github.com/google/renameio v1.0.1
 	github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
 	github.com/kardianos/service v1.2.0
-	github.com/karrick/godirwalk v1.16.1 // indirect
 	github.com/lucas-clemente/quic-go v0.20.1
 	github.com/mdlayher/netlink v1.4.0
-	github.com/miekg/dns v1.1.40
-	github.com/rogpeppe/go-internal v1.7.0 // indirect
+	github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf // indirect
+	github.com/miekg/dns v1.1.42
 	github.com/satori/go.uuid v1.2.0
-	github.com/sirupsen/logrus v1.8.1 // indirect
-	github.com/spf13/cobra v1.1.3 // indirect
+	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/ti-mo/netfilter v0.4.0
 	go.etcd.io/bbolt v1.3.5
-	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44
-	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
-	golang.org/x/text v0.3.5 // indirect
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed
+	golang.org/x/sys v0.0.0-20210514084401-e8d321eab015
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v2 v2.4.0
 	howett.net/plist v0.0.0-20201203080718-1454fab16a06
 )
 
-replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210517101438-550ef4cd8c6e
+replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf