From 0d0ac75347267f7c12fc9b5b349bf9ef7f632347 Mon Sep 17 00:00:00 2001
From: Jens Geyer <jensg@apache.org>
Date: Tue, 12 Mar 2024 21:49:28 +0100
Subject: [PATCH] Preparing 0.20.0

---
 CHANGES.md                 | 10 ++++++++++
 Makefile.am                |  6 ++++++
 lib/go/test/Makefile.am    |  2 ++
 test/Makefile.am           |  2 ++
 test/go/Makefile.am        |  2 ++
 tutorial/swift/Makefile.am | 10 ++++++++++
 6 files changed, 32 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index d903760a65..bc2fed4750 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,4 @@
+
 # Apache Thrift Changelog
 
 ## 0.20.0
@@ -33,6 +34,12 @@
 
 - [THRIFT-5635]https://issues.apache.org/jira/browse/THRIFT-5635 - Replace some removed functions with new counterparts
 
+### Go
+
+- [THRIFT-5744]https://issues.apache.org/jira/browse/THRIFT-5744 - Switch to slog for go library
+- [THRIFT-5745]https://issues.apache.org/jira/browse/THRIFT-5745 - Implement slog.LogValuer on go TStructs
+
+
 ### Haxe
 
 - [THRIFT-5734]https://issues.apache.org/jira/browse/THRIFT-5734 - generated code may lack required capitalization at class names
@@ -54,6 +61,9 @@
 - [THRIFT-5754]https://issues.apache.org/jira/browse/THRIFT-5754 - Fix PHP 8.1 deprecates passing null to non-nullable internal function parameters
 - [THRIFT-5753]https://issues.apache.org/jira/browse/THRIFT-5753 - PHP 8.1 deprecated warning about return type in jsonSerialize functions
 
+### Python
+
+- [THRIFT-5688]https://issues.apache.org/jira/browse/THRIFT-5688 - Add PyPI publishing github actions
 
 ## 0.19.0
 
diff --git a/Makefile.am b/Makefile.am
index b2e5b18cd5..5b9e9709f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,6 +141,12 @@ EXTRA_DIST = \
 	.flake8 \
 	.gitattributes \
 	.gitignore \
+	.github/dependabot.yml \
+	.github/pull_request_template.md \
+	.github/stale.yml \
+	.github/workflows/build.yml \
+	.github/workflows/cmake.yml \
+	.github/workflows/pypi.yml \
 	.travis.yml \
 	ApacheThrift.nuspec \
 	appveyor.yml \
diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am
index cb8928bc8c..22fad9e42d 100644
--- a/lib/go/test/Makefile.am
+++ b/lib/go/test/Makefile.am
@@ -138,6 +138,8 @@ EXTRA_DIST = \
 	dontexportrwtest \
 	tests \
 	common \
+	go.mod \
+	go.sum \
 	BinaryKeyTest.thrift \
 	ClientMiddlewareExceptionTest.thrift \
 	ConflictArgNamesTest.thrift \
diff --git a/test/Makefile.am b/test/Makefile.am
index d5f1434028..d3d0075266 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -144,6 +144,7 @@ EXTRA_DIST = \
 	AnnotationTest.thrift \
 	BrokenConstants.thrift \
 	ConstantsDemo.thrift \
+	v0.16/ConstantsDemo.thrift \
 	DebugProtoTest.thrift \
 	v0.16/DebugProtoTest.thrift \
 	DenseLinkingTest.thrift \
@@ -159,6 +160,7 @@ EXTRA_DIST = \
 	ManyOptionals.thrift \
 	ManyTypedefs.thrift \
 	NameConflictTest.thrift \
+	v0.16/NameConflictTest.thrift \
 	OptionalRequiredTest.thrift \
 	Recursive.thrift \
 	ReuseObjects.thrift \
diff --git a/test/go/Makefile.am b/test/go/Makefile.am
index ff7ce683e6..92ddc93c95 100644
--- a/test/go/Makefile.am
+++ b/test/go/Makefile.am
@@ -63,4 +63,6 @@ genmock: gopath
 EXTRA_DIST = \
 	src/bin \
 	src/common \
+	go.mod \
+	go.sum \
 	genmock.sh
diff --git a/tutorial/swift/Makefile.am b/tutorial/swift/Makefile.am
index f48456054f..e8b8b2284c 100644
--- a/tutorial/swift/Makefile.am
+++ b/tutorial/swift/Makefile.am
@@ -31,3 +31,13 @@ tutorialserver: gen_swift
 
 tutorialclient: gen_swift
 	swift run TutorialClient
+
+EXTRA_DIST = \
+	Package.swift \
+	swift-dep \
+	Sources/TutorialClient/main.swift \
+	Sources/TutorialRunner/main.swift \
+	Sources/TutorialServer/main.swift \
+	Sources/TutorialServer/CalculatorService.swift \
+	README.md
+