Add kotlinx-coroutines library into Matter SDK (#29335)

* Add kotlinx-coroutines library into Matter SDK * Update version in Manifest
project-chip · Feb 26, 2024 · 1846009 · 1846009
1 parent ae3aa8f
commit 1846009
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/examples/java-matter-controller/Manifest.txt b/examples/java-matter-controller/Manifest.txt
@@ -1,3 +1,3 @@
 Main-Class: com.matter.controller.MainKt
-Class-Path: ../lib/third_party/connectedhomeip/src/controller/java/CHIPController.jar ../lib/third_party/connectedhomeip/src/setup_payload/java/OnboardingPayload.jar ../lib/third_party/connectedhomeip/third_party/java_deps/stub_src/Android.jar ../lib/third_party/connectedhomeip/third_party/java_deps/json-20220924.jar ../lib/third_party/connectedhomeip/third_party/java_deps/jsr305-3.0.2.jar ../lib/third_party/connectedhomeip/third_party/java_deps/kotlin-stdlib-1.8.10.jar
+Class-Path: ../lib/third_party/connectedhomeip/src/controller/java/CHIPController.jar ../lib/third_party/connectedhomeip/src/setup_payload/java/OnboardingPayload.jar ../lib/third_party/connectedhomeip/third_party/java_deps/stub_src/Android.jar ../lib/third_party/connectedhomeip/third_party/java_deps/json-20220924.jar ../lib/third_party/connectedhomeip/third_party/java_deps/jsr305-3.0.2.jar ../lib/third_party/connectedhomeip/third_party/java_deps/kotlin-stdlib-1.8.20.jar
 
diff --git a/third_party/java_deps/BUILD.gn b/third_party/java_deps/BUILD.gn
@@ -26,11 +26,15 @@ java_prebuilt("json") {
 }
 
 java_prebuilt("kotlin-stdlib") {
-  jar_path = "artifacts/kotlin-stdlib-1.8.10.jar"
+  jar_path = "artifacts/kotlin-stdlib-1.8.20.jar"
 }
 
 java_prebuilt("kotlin-test") {
-  jar_path = "artifacts/kotlin-test-1.8.10.jar"
+  jar_path = "artifacts/kotlin-test-1.8.20.jar"
+}
+
+java_prebuilt("kotlinx-coroutines-core-jvm") {
+  jar_path = "artifacts/kotlinx-coroutines-core-jvm-1.7.3.jar"
 }
 
 java_prebuilt("protobuf-java") {

diff --git a/third_party/java_deps/set_up_java_deps.sh b/third_party/java_deps/set_up_java_deps.sh
@@ -37,8 +37,9 @@ download_jar "repo1.maven.org" "com/google/code/gson/gson/2.9.1" "gson-2.9.1.jar
 download_jar "repo1.maven.org" "com/google/protobuf/protobuf-java/3.22.0" "protobuf-java-3.22.0.jar"
 download_jar "repo1.maven.org" "com/google/truth/truth/1.1.3" "truth-1.1.3.jar"
 download_jar "repo1.maven.org" "junit/junit/4.13.2" "junit-4.13.2.jar"
-download_jar "repo1.maven.org" "org/jetbrains/kotlin/kotlin-stdlib/1.8.10" "kotlin-stdlib-1.8.10.jar"
-download_jar "repo1.maven.org" "org/jetbrains/kotlin/kotlin-test/1.8.10" "kotlin-test-1.8.10.jar"
+download_jar "repo1.maven.org" "org/jetbrains/kotlin/kotlin-stdlib/1.8.20" "kotlin-stdlib-1.8.20.jar"
+download_jar "repo1.maven.org" "org/jetbrains/kotlin/kotlin-test/1.8.20" "kotlin-test-1.8.20.jar"
+download_jar "repo1.maven.org" "org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.7.3" "kotlinx-coroutines-core-jvm-1.7.3.jar"
 download_jar "repo1.maven.org" "org/json/json/20220924" "json-20220924.jar"
 
 # Unit test requirements