From 9f28d9bbb446886a7d1280d71e8cd01c0118474c Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Fri, 7 May 2021 15:54:16 -0700
Subject: [PATCH 1/3] Add the kotlin and kotlin-lite directories to the main
 pom.xml

---
 java/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java/pom.xml b/java/pom.xml
index b62b4066751b..4409f1ad635e 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -238,6 +238,8 @@
     <module>lite</module>
     <module>core</module>
     <module>util</module>
+    <module>kotlin</module>
+    <module>kotlin-lite</module>
   </modules>
 
 </project>

From 9ed323467aa811671629f59aeb9f603288696075 Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Fri, 7 May 2021 16:29:35 -0700
Subject: [PATCH 2/3] Updated Kotlin versions to 3.17.0-rc1

---
 java/kotlin-lite/pom.xml | 2 +-
 java/kotlin/pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml
index 80b4c4ffaeac..685e98ea46d4 100644
--- a/java/kotlin-lite/pom.xml
+++ b/java/kotlin-lite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.15.6</version>
+    <version>3.17.0-rc-1</version>
   </parent>
 
   <artifactId>protobuf-kotlin-lite</artifactId>
diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
index 5f281251753c..e7ddedcc07df 100644
--- a/java/kotlin/pom.xml
+++ b/java/kotlin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.15.6</version>
+    <version>3.17.0-rc-1</version>
   </parent>
 
   <artifactId>protobuf-kotlin</artifactId>

From f0e2df95bdcf768a65259c260888b2dbc01d4c55 Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Mon, 10 May 2021 12:24:22 -0700
Subject: [PATCH 3/3] Fix Mac CI tests by resolving brew package conflict

---
 kokoro/macos/prepare_build_macos_rc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc
index d94dd543fd5b..dcd17f330c12 100755
--- a/kokoro/macos/prepare_build_macos_rc
+++ b/kokoro/macos/prepare_build_macos_rc
@@ -45,6 +45,11 @@ sudo rm -rf \
 git -C /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core fetch --unshallow
 git -C /usr/local/Homebrew/Library/Taps/homebrew/homebrew-cask fetch --unshallow
 
+# This is needed to fix a conflict between the ilmbase and imath packages,
+# which seem to conflict with each other by both trying to install
+# libImath.dylib.
+brew unlink ilmbase
+
 brew update
 brew upgrade