Add the kotlin and kotlin-lite directories to the main pom.xml (#8585)
* Add the kotlin and kotlin-lite directories to the main pom.xml
* Updated Kotlin versions to 3.17.0-rc1
* Fix Mac CI tests by resolving brew package conflict
diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml
index 80b4c4f..685e98e 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 5f28125..e7ddedc 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>
diff --git a/java/pom.xml b/java/pom.xml
index b62b406..4409f1a 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>
diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc
index d94dd54..dcd17f3 100755
--- a/kokoro/macos/prepare_build_macos_rc
+++ b/kokoro/macos/prepare_build_macos_rc
@@ -45,6 +45,11 @@
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
