Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix build error "more than one files found with path 'META-INF/main.kotlin_module #33648

Merged
merged 1 commit into from
May 29, 2024
Merged

fix build error "more than one files found with path 'META-INF/main.kotlin_module #33648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions examples/android/CHIPTool/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

packagingOptions {
exclude 'META-INF/main.kotlin_module'
}

buildFeatures {
viewBinding = true
Expand Down
22 changes: 19 additions & 3 deletions src/controller/java/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,11 @@ kotlin_library("tlv") {
"src/matter/tlv/values.kt",
]

kotlinc_flags = [ "-Xlint:deprecation" ]
kotlinc_flags = [
"-Xlint:deprecation",
"-module-name",
"com.matter.tlv",
]
}

kotlin_library("tlv_reader_test") {
Expand Down Expand Up @@ -323,7 +327,11 @@ kotlin_library("jsontlv") {
"src/matter/jsontlv/types.kt",
]

kotlinc_flags = [ "-Xlint:deprecation" ]
kotlinc_flags = [
"-Xlint:deprecation",
"-module-name",
"com.matter.matterjson",
]
}

kotlin_library("json_to_tlv_to_json_test") {
Expand Down Expand Up @@ -363,6 +371,10 @@ kotlin_library("onboarding_payload") {
"src/matter/onboardingpayload/Verhoeff.kt",
"src/matter/onboardingpayload/Verhoeff10.kt",
]
kotlinc_flags = [
"-module-name",
"com.matter.onboarding",
]
}

kotlin_library("onboardingpayload_manual_code_test") {
Expand Down Expand Up @@ -404,7 +416,11 @@ kotlin_library("chipcluster") {
sources = structs_sources
sources += eventstructs_sources

kotlinc_flags = [ "-Xlint:deprecation" ]
kotlinc_flags = [
"-Xlint:deprecation",
"-module-name",
"com.matter.chipcluster",
]
}

kotlin_library("chipcluster_test") {
Expand Down
Loading