Skip to content

Commit fab113f

Browse files
Revert "Implemented Json to Tlv and Tlv to Json Converter in Kotlin (project-chip#26458)"
This reverts commit 60866e8. project-chip#26458 was merged with failing CI, and the failure is in the files the PR added. CI is now permanently failing.
1 parent 8a5b352 commit fab113f

File tree

8 files changed

+6
-2093
lines changed

8 files changed

+6
-2093
lines changed

examples/java-matter-controller/BUILD.gn

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022-2023 Project CHIP Authors
1+
# Copyright (c) 2022 Project CHIP Authors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@ kotlin_binary("java-matter-controller") {
3838
output_name = "java-matter-controller"
3939
deps = [
4040
":java",
41-
"${chip_root}/src/controller/java:json_to_tlv_to_json_test",
4241
"${chip_root}/src/controller/java:tlv_read_write_test",
4342
"${chip_root}/src/controller/java:tlv_reader_test",
4443
"${chip_root}/src/controller/java:tlv_writer_test",

src/controller/java/BUILD.gn

+1-34
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020-2023 Project CHIP Authors
1+
# Copyright (c) 2020-2021 Project CHIP Authors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -204,39 +204,6 @@ kotlin_library("tlv_read_write_test") {
204204
kotlinc_flags = [ "-Xlint:deprecation" ]
205205
}
206206

207-
kotlin_library("json") {
208-
output_name = "libCHIPJson.jar"
209-
210-
deps = [
211-
":tlv",
212-
"${chip_root}/third_party/java_deps:gson",
213-
]
214-
215-
sources = [
216-
"src/chip/json/JsonToTlv.kt",
217-
"src/chip/json/TlvToJson.kt",
218-
]
219-
220-
kotlinc_flags = [ "-Xlint:deprecation" ]
221-
}
222-
223-
kotlin_library("json_to_tlv_to_json_test") {
224-
output_name = "JsonToTlvToJsonTest.jar"
225-
226-
deps = [
227-
":json",
228-
":tlv",
229-
"${chip_root}/third_party/java_deps:gson",
230-
"${chip_root}/third_party/java_deps:junit-4",
231-
"${chip_root}/third_party/java_deps:kotlin-test",
232-
"${chip_root}/third_party/java_deps:truth",
233-
]
234-
235-
sources = [ "tests/chip/json/JsonToTlvToJsonTest.kt" ]
236-
237-
kotlinc_flags = [ "-Xlint:deprecation" ]
238-
}
239-
240207
android_library("java") {
241208
output_name = "CHIPController.jar"
242209

src/controller/java/src/chip/json/JsonToTlv.kt

-201
This file was deleted.

0 commit comments

Comments
 (0)