Skip to content

Commit 1846009

Browse files
yufengwangcapull[bot]
authored andcommitted
Add kotlinx-coroutines library into Matter SDK (#29335)
* Add kotlinx-coroutines library into Matter SDK * Update version in Manifest
1 parent ae3aa8f commit 1846009

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Main-Class: com.matter.controller.MainKt
2-
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
2+
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
33

third_party/java_deps/BUILD.gn

+6-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,15 @@ java_prebuilt("json") {
2626
}
2727

2828
java_prebuilt("kotlin-stdlib") {
29-
jar_path = "artifacts/kotlin-stdlib-1.8.10.jar"
29+
jar_path = "artifacts/kotlin-stdlib-1.8.20.jar"
3030
}
3131

3232
java_prebuilt("kotlin-test") {
33-
jar_path = "artifacts/kotlin-test-1.8.10.jar"
33+
jar_path = "artifacts/kotlin-test-1.8.20.jar"
34+
}
35+
36+
java_prebuilt("kotlinx-coroutines-core-jvm") {
37+
jar_path = "artifacts/kotlinx-coroutines-core-jvm-1.7.3.jar"
3438
}
3539

3640
java_prebuilt("protobuf-java") {

third_party/java_deps/set_up_java_deps.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ download_jar "repo1.maven.org" "com/google/code/gson/gson/2.9.1" "gson-2.9.1.jar
3737
download_jar "repo1.maven.org" "com/google/protobuf/protobuf-java/3.22.0" "protobuf-java-3.22.0.jar"
3838
download_jar "repo1.maven.org" "com/google/truth/truth/1.1.3" "truth-1.1.3.jar"
3939
download_jar "repo1.maven.org" "junit/junit/4.13.2" "junit-4.13.2.jar"
40-
download_jar "repo1.maven.org" "org/jetbrains/kotlin/kotlin-stdlib/1.8.10" "kotlin-stdlib-1.8.10.jar"
41-
download_jar "repo1.maven.org" "org/jetbrains/kotlin/kotlin-test/1.8.10" "kotlin-test-1.8.10.jar"
40+
download_jar "repo1.maven.org" "org/jetbrains/kotlin/kotlin-stdlib/1.8.20" "kotlin-stdlib-1.8.20.jar"
41+
download_jar "repo1.maven.org" "org/jetbrains/kotlin/kotlin-test/1.8.20" "kotlin-test-1.8.20.jar"
42+
download_jar "repo1.maven.org" "org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.7.3" "kotlinx-coroutines-core-jvm-1.7.3.jar"
4243
download_jar "repo1.maven.org" "org/json/json/20220924" "json-20220924.jar"
4344

4445
# Unit test requirements

0 commit comments

Comments
 (0)