Skip to content

Commit 431bd82

Browse files
committed
fix: clean up libs.versions.toml and build.gradle.kts configuration
1 parent 3124f0a commit 431bd82

3 files changed

Lines changed: 1 addition & 74 deletions

File tree

build.gradle.kts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -255,26 +255,6 @@ tasks {
255255
)
256256
}
257257
}
258-
259-
mergeServiceFiles()
260-
261-
// Concatenate every META-INF/NOTICE (and .txt/.md variants) from all dep JARs
262-
// plus our own into a single merged file. Satisfies Apache 2.0 §4(d) which
263-
// requires preserving attribution NOTICEs of Apache-licensed dependencies.
264-
//
265-
// Shadow's built-in ApacheNoticeResourceTransformer hardcodes ASF-branded
266-
// copyright text that cannot be fully disabled, which would falsely attribute
267-
// this GPL project to the Apache Software Foundation. NoticeMergeTransformer
268-
// (in buildSrc) is a minimal verbatim concatenator with no boilerplate.
269-
transform(NoticeMergeTransformer::class.java)
270-
}
271-
272-
distTar {
273-
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
274-
}
275-
276-
distZip {
277-
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
278258
}
279259

280260
processResources {

gradle/libs.versions.toml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -97,46 +97,6 @@ slf4j-nop = { module = "org.slf4j:slf4j-nop", version.ref = "slf4j" }
9797
about-libraries-core = { group = "com.mikepenz", name = "aboutlibraries-compose-core", version.ref = "about-libraries" }
9898
about-libraries-m3 = { group = "com.mikepenz", name = "aboutlibraries-compose-m3", version.ref = "about-libraries" }
9999

100-
# Ktor Client
101-
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
102-
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
103-
ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
104-
ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
105-
ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
106-
107-
# Koin
108-
koin-bom = { module = "io.insert-koin:koin-bom", version.ref = "koin-bom" }
109-
koin-core = { module = "io.insert-koin:koin-core" }
110-
koin-compose = { module = "io.insert-koin:koin-compose" }
111-
112-
# Voyager Navigation
113-
voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" }
114-
voyager-screenmodel = { module = "cafe.adriel.voyager:voyager-screenmodel", version.ref = "voyager" }
115-
voyager-koin = { module = "cafe.adriel.voyager:voyager-koin", version.ref = "voyager" }
116-
voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager" }
117-
118-
# Coroutines
119-
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
120-
kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
121-
122-
# Serialization
123-
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
124-
125-
# JNA (Windows DWM title bar tinting)
126-
jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
127-
jna-platform = { module = "net.java.dev.jna:jna-platform", version.ref = "jna" }
128-
129-
# Testing
130-
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
131-
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
132-
133-
# Logging
134-
slf4j-nop = { module = "org.slf4j:slf4j-nop", version.ref = "slf4j" }
135-
136-
# About Libraries
137-
about-libraries-core = { group = "com.mikepenz", name = "aboutlibraries-compose-core", version.ref = "about-libraries" }
138-
about-libraries-m3 = { group = "com.mikepenz", name = "aboutlibraries-compose-m3", version.ref = "about-libraries" }
139-
140100
[plugins]
141101
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
142102
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

package-lock.json

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)