Skip to content

Commit 0370520

Browse files
committed
chore: minor changes to dependencies
1 parent e5e9f8f commit 0370520

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

common/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ dependencies {
3535
commonMainApi(libs.intellij.markdown)
3636
commonMainApi(libs.kotlin.codepoints.deluxe)
3737
commonMainApi(libs.multiplatform.settings.core)
38+
commonTestApi(libs.ktor.client.mock)
3839

3940
jvmMainApi(libs.kotlin.retry)
4041
// jvmMainImplementation(libs.slf4j.api)
41-
commonTestApi(libs.ktor.client.mock)
4242
}
4343

4444
// kotlin.sourceSets.commonMain {

gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.jvm.gradle.kts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package plugins
22

33
import com.google.devtools.ksp.gradle.KspTaskJvm
44
import common.*
5+
import java.util.jar.Attributes
56
import org.gradle.kotlin.dsl.*
67
import org.jetbrains.kotlin.gradle.dsl.jvm.JvmTargetValidationMode
78
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -106,6 +107,19 @@ tasks {
106107
}
107108
}
108109

110+
withType<Jar>().configureEach {
111+
manifest {
112+
attributes(
113+
"Automatic-Module-Name" to project.group,
114+
"Built-By" to System.getProperty("user.name"),
115+
"Built-JDK" to System.getProperty("java.runtime.version"),
116+
Attributes.Name.IMPLEMENTATION_TITLE.toString() to project.name,
117+
Attributes.Name.IMPLEMENTATION_VERSION.toString() to project.version,
118+
)
119+
}
120+
duplicatesStrategy = DuplicatesStrategy.WARN
121+
}
122+
109123
// Javadoc
110124
javadoc {
111125
isFailOnError = true

gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.mpp.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,14 @@ kotlinMultiplatform.apply {
173173
dependencies {
174174
implementation(project.dependencies.platform(libs.junit.bom))
175175
implementation(kotlin("test-junit5"))
176+
implementation(libs.slf4j.simple)
176177
implementation(libs.mockk)
177178
}
178179
}
179180

180181
val jsMain by getting {
181182
dependencies {
182183
implementation(kotlinw("browser"))
183-
// implementation(kotlinw("web"))
184184
// kspDependency("CommonMainMetadata", project(":meta:ksp:processor"))
185185
// kspDependency("Js", project(":meta:ksp:processor"))
186186
}

gradle/build-logic/common-plugins/src/main/kotlin/plugins/misc.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ tasks {
7878
withType<AbstractArchiveTask>().configureEach {
7979
isPreserveFileTimestamps = false
8080
isReproducibleFileOrder = true
81+
// val `rw-r--r--` = 0b110100100
82+
// val `rwxr-xr-x` = 0b111101101
83+
// fileMode = `rw-r--r--`
84+
// dirMode = `rwxr-xr-x`
85+
// filesMatching("**/bin/*") { mode = `rwxr-xr-x` }
86+
// filesMatching("**/bin/*.bat") { mode = `rw-r--r--` }
8187
}
8288

8389
// Run the checkBestPractices check for build-logic included builds.

0 commit comments

Comments
 (0)