From 5658e8e45f3b9866f82b231a49c181af29078668 Mon Sep 17 00:00:00 2001
From: Stu Hood <stuhood@gmail.com>
Date: Wed, 20 Apr 2022 09:29:07 -0700
Subject: [PATCH 1/2] Update to 2.11.0rc3.

---
 3rdparty/jvm/global_scalac_plugins.lock | 26 -------------------------
 pants.toml                              | 11 +++++------
 2 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 3rdparty/jvm/global_scalac_plugins.lock

diff --git a/3rdparty/jvm/global_scalac_plugins.lock b/3rdparty/jvm/global_scalac_plugins.lock
deleted file mode 100644
index 690f49e..0000000
--- a/3rdparty/jvm/global_scalac_plugins.lock
+++ /dev/null
@@ -1,26 +0,0 @@
-# This lockfile was autogenerated by Pants. To regenerate, run:
-#
-#    ./pants generate-lockfiles
-#
-# --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
-# {
-#   "version": 1,
-#   "generated_with_requirements": [
-#     "com.lihaoyi:acyclic_2.13:0.2.1,url=not_provided,jar=not_provided"
-#   ]
-# }
-# --- END PANTS LOCKFILE METADATA ---
-
-[[entries]]
-directDependencies = []
-dependencies = []
-file_name = "com.lihaoyi_acyclic_2.13_0.2.1.jar"
-
-[entries.coord]
-group = "com.lihaoyi"
-artifact = "acyclic_2.13"
-version = "0.2.1"
-packaging = "jar"
-[entries.file_digest]
-fingerprint = "4bc4656140ad5e4802fedcdbe920ec7c92dbebf5e76d1c60d35676a314481944"
-serialized_bytes_length = 62534
diff --git a/pants.toml b/pants.toml
index 32d9c9b..530984b 100644
--- a/pants.toml
+++ b/pants.toml
@@ -2,7 +2,7 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 [GLOBAL]
-pants_version = "2.11.0.dev3"
+pants_version = "2.11.0rc3"
 backend_packages = [
   # This repository demonstrates a mix of Java and Scala, and so both backends are enabled. But each
   # backend can be used independently, so there is no need to expose Scala BUILD file
@@ -33,7 +33,7 @@ args = [
 # Configure the specific Scala version to use for a resolve. This version must match the version used for the
 # `jvm_artifact` target providing the scala-library runtime jar.
 [scala.version_for_resolve]
-"jvm-default" = "2.13.8"
+jvm-default = "2.13.8"
 
 [scalac]
 args = [
@@ -43,10 +43,9 @@ args = [
   "-P:acyclic:force",
 ]
 
-# Globally enabled `scalac` plugins, which are defined as `scalac_plugin` targets. This one is
-# defined at the root of the repository.
-plugins_global = ["//:acyclic"]
-plugins_global_lockfile = "3rdparty/jvm/global_scalac_plugins.lock"
+[scalac.plugins_for_resolve]
+# Globally enabled `scalac` plugins, which are defined as `scalac_plugin` targets.
+jvm-default = "acyclic"
 
 [jvm]
 # Configure remote debugging options that will be used with `test --debug`.

From 20af08c7d2c84ee58639c16ce5d7c304ee57d262 Mon Sep 17 00:00:00 2001
From: Stu Hood <stuhood@gmail.com>
Date: Wed, 20 Apr 2022 11:08:35 -0700
Subject: [PATCH 2/2] Comment fix.

---
 pants.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pants.toml b/pants.toml
index 530984b..a51d706 100644
--- a/pants.toml
+++ b/pants.toml
@@ -44,7 +44,7 @@ args = [
 ]
 
 [scalac.plugins_for_resolve]
-# Globally enabled `scalac` plugins, which are defined as `scalac_plugin` targets.
+# Resolve-global `scalac` plugins, which are defined as `scalac_plugin` targets.
 jvm-default = "acyclic"
 
 [jvm]