From 0e69c5c673fb5869ee7e866e80492cac2dcbc3a2 Mon Sep 17 00:00:00 2001
From: Steph <steph@hashicorp.com>
Date: Wed, 17 Sep 2025 15:57:22 +0200
Subject: [PATCH 1/2] bump go version to 1.24.0

---
 .github/workflows/ci-go.yml | 2 +-
 README.md                   | 2 +-
 go.mod                      | 4 +---
 tools/go.mod                | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-go.yml b/.github/workflows/ci-go.yml
index b3aa4a2..2713129 100644
--- a/.github/workflows/ci-go.yml
+++ b/.github/workflows/ci-go.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ '1.24', '1.23' ]
+        go-version: [ '1.25', '1.24' ]
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
diff --git a/README.md b/README.md
index f8a433a..6a7e530 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This Go module is typically kept up to date with the latest `terraform-plugin-fr
 
 This Go module follows `terraform-plugin-framework` Go compatibility.
 
-Currently, that means Go **1.23** must be used when developing and testing code.
+Currently, that means Go **1.24** must be used when developing and testing code.
 
 ## Usage
 
diff --git a/go.mod b/go.mod
index 861e4d9..659031c 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/hashicorp/terraform-plugin-framework-timeouts
 
-go 1.23.0
-
-toolchain go1.23.7
+go 1.24.0
 
 require (
 	github.com/google/go-cmp v0.7.0
diff --git a/tools/go.mod b/tools/go.mod
index 6c06169..1ad4d79 100644
--- a/tools/go.mod
+++ b/tools/go.mod
@@ -1,6 +1,6 @@
 module tools
 
-go 1.23.7
+go 1.24.0
 
 require github.com/hashicorp/copywrite v0.22.0
 

From c31332694ac2bb5c893ee510cdbf418c4426d6a8 Mon Sep 17 00:00:00 2001
From: Steph <steph@hashicorp.com>
Date: Wed, 17 Sep 2025 15:58:48 +0200
Subject: [PATCH 2/2] add changelog

---
 .changes/unreleased/NOTES-20250317-094931.yaml | 7 -------
 .changes/unreleased/NOTES-20250917-155810.yaml | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 .changes/unreleased/NOTES-20250317-094931.yaml
 create mode 100644 .changes/unreleased/NOTES-20250917-155810.yaml

diff --git a/.changes/unreleased/NOTES-20250317-094931.yaml b/.changes/unreleased/NOTES-20250317-094931.yaml
deleted file mode 100644
index 8ce727d..0000000
--- a/.changes/unreleased/NOTES-20250317-094931.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: NOTES
-body: 'all: This Go module has been updated to Go 1.23 per the [Go support policy](https://go.dev/doc/devel/release#policy).
-  It is recommended to review the [Go 1.23 release notes](https://go.dev/doc/go1.23)
-  before upgrading. Any consumers building on earlier Go versions may experience errors.'
-time: 2025-03-17T09:49:31.275439-04:00
-custom:
-    Issue: "176"
diff --git a/.changes/unreleased/NOTES-20250917-155810.yaml b/.changes/unreleased/NOTES-20250917-155810.yaml
new file mode 100644
index 0000000..6c2baf2
--- /dev/null
+++ b/.changes/unreleased/NOTES-20250917-155810.yaml
@@ -0,0 +1,7 @@
+kind: NOTES
+body: 'all: This Go module has been updated to Go 1.24 per the [Go support policy](https://go.dev/doc/devel/release#policy).
+  It is recommended to review the [Go 1.24 release notes](https://go.dev/doc/go1.24)
+  before upgrading. Any consumers building on earlier Go versions may experience errors.'
+time: 2025-09-17T15:58:10.843676+02:00
+custom:
+    Issue: "201"