From a47c20900625cbbabf0b7b029a5ca1ec5e2ae08a Mon Sep 17 00:00:00 2001
From: Sam Westmoreland <samwestmoreland@users.noreply.github.com>
Date: Tue, 14 May 2024 17:47:58 +0800
Subject: [PATCH] Bump plugins and use go_toolchain (#14)

---
 .plzconfig           | 14 ++++++++++----
 BUILD                |  4 ----
 ChangeLog            |  6 ++++++
 VERSION              |  2 +-
 plugins/BUILD        | 10 +++++++---
 test/BUILD           |  3 +--
 third_party/go/BUILD |  8 +++++++-
 7 files changed, 32 insertions(+), 15 deletions(-)
 delete mode 100644 BUILD

diff --git a/.plzconfig b/.plzconfig
index 310fa99..4894030 100644
--- a/.plzconfig
+++ b/.plzconfig
@@ -1,21 +1,27 @@
-[FeatureFlags]
-ExcludeProtoRules = true
-ExcludeGoRules = true
+[Please]
+Version = 17.8.7
 
 [proto]
 protoctool = //third_party/proto:protoc
 protocgoplugin = //third_party/go:protoc-gen-go
 language = go
 
+[Parse]
+PreloadSubincludes = ///python//build_defs:python
+
 [Plugin "go"]
 Target = //plugins:go
 ImportPath = github.com/please-build/proto-rules
+GoTool = //third_party/go:toolchain|go
+
+[Plugin "python"]
+Target = //plugins:python
 
 [PluginDefinition]
 Name = proto
 
 [PluginConfig "definitions"]
-Help = A subinclude target containing a build definition that register a new languages using proto_language()
+Help = A subinclude target containing a build definition that registers a new language using proto_language()
 ConfigKey = LanguageDef
 Repeatable = true
 Inherit = true
diff --git a/BUILD b/BUILD
deleted file mode 100644
index e53f29e..0000000
--- a/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-plugin_repo(
-    name = "python",
-    revision = "v1.2.0",
-)
diff --git a/ChangeLog b/ChangeLog
index cfdbf86..a7a51ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Version 0.4.0
+-------------
+    * Bump plugin versions
+    * Use go_toolchain
+
+
 Version 0.3.1
 -------------
     * Remove specialisation for aarch64
diff --git a/VERSION b/VERSION
index 9e11b32..1d0ba9e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.1
+0.4.0
diff --git a/plugins/BUILD b/plugins/BUILD
index e9c31e3..2a5517b 100644
--- a/plugins/BUILD
+++ b/plugins/BUILD
@@ -1,5 +1,9 @@
 plugin_repo(
     name = "go",
-    plugin = "go-rules",
-    revision = "v0.5.1",
-)
\ No newline at end of file
+    revision = "v1.17.1",
+)
+
+plugin_repo(
+  name = "python",
+  revision = "v1.6.0",
+)
diff --git a/test/BUILD b/test/BUILD
index ffd5144..3a000f4 100644
--- a/test/BUILD
+++ b/test/BUILD
@@ -1,8 +1,7 @@
-# Tests on the proto rules.
+# Tests on the legacy proto rules.
 
 subinclude("///proto//build_defs:legacy")
 
-
 grpc_library(
     name = "flags_proto",
     srcs = ["flags.proto"],
diff --git a/third_party/go/BUILD b/third_party/go/BUILD
index c4beb3e..89baabf 100644
--- a/third_party/go/BUILD
+++ b/third_party/go/BUILD
@@ -1,5 +1,11 @@
 subinclude("///go//build_defs:go")
 
+go_toolchain(
+    name = "toolchain",
+    install_std = True,
+    version = "1.22.3",
+)
+
 go_module(
     name = "protoc-gen-go",
     binary = True,
@@ -232,4 +238,4 @@ go_module(
     module = "cloud.google.com/go",
     version = "v0.65.0",
     visibility = ["PUBLIC"],
-)
\ No newline at end of file
+)