Skip to content

Commit 7c9f1d9

Browse files
sureshgsureshg
committed
chore: dep updates & build plugin refactorings
1 parent 2372123 commit 7c9f1d9

20 files changed

+496
-501
lines changed

‎backend/agent/otel/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ dependencies {
7272
implementation(platform(libs.otel.instr.bom))
7373
compileOnly(libs.bundles.otel.agent.extn)
7474
compileOnly(libs.google.auto.annotations)
75-
implementation(libs.otel.samplers)
7675
annotationProcessor(libs.google.auto.service.apt)
7776

7877
testImplementation(platform(libs.junit.bom))

‎backend/agent/otel/src/main/java/io/opentelemetry/extensions/DropSpansExtension.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎backend/data/build.gradle.kts

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
1+
import common.jvmTarget
2+
13
plugins {
24
dev.suresh.plugin.kotlin.mpp
35
dev.suresh.plugin.publishing
46
}
57

68
description = "Kotlin Data Science!"
79

8-
kotlin.sourceSets {
9-
commonMain { dependencies { implementation(projects.shared) } }
10+
kotlin {
11+
jvmTarget(project)
1012

11-
jvmMain {
12-
dependencies {
13-
implementation(libs.pty4j)
14-
// implementation(libs.graal.polyglot)
15-
// implementation(libs.graal.wasm)
16-
// implementation(fileTree("lib") { include("*.jar") })
17-
}
13+
sourceSets {
14+
commonMain { dependencies { implementation(projects.shared) } }
1815

19-
kotlin.srcDir("src/main/kotlin")
20-
resources.srcDir("src/main/resources")
21-
}
16+
jvmMain {
17+
dependencies {
18+
implementation(libs.pty4j)
19+
// implementation(libs.graal.polyglot)
20+
// implementation(libs.graal.wasm)
21+
// implementation(fileTree("lib") { include("*.jar") })
22+
}
2223

23-
jvmTest {
24-
kotlin.srcDir("src/test/kotlin")
25-
resources.srcDir("src/test/resources")
24+
kotlin.srcDir("src/main/kotlin")
25+
resources.srcDir("src/main/resources")
26+
}
27+
28+
jvmTest {
29+
kotlin.srcDir("src/test/kotlin")
30+
resources.srcDir("src/test/resources")
31+
}
2632
}
2733
}

‎backend/native/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
import com.github.ajalt.mordant.rendering.TextColors
44
import com.google.cloud.tools.jib.api.buildplan.ImageFormat
55
import com.google.cloud.tools.jib.gradle.extension.nativeimage.JibNativeImageExtension
6+
import common.*
67
import common.Platform
7-
import common.githubRepo
8-
import common.githubUser
98
import org.gradle.internal.os.OperatingSystem
109
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
1110
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
@@ -22,6 +21,8 @@ val appBinName = "app"
2221
description = "Ktor native application"
2322

2423
kotlin {
24+
allNativeTargets()
25+
2526
targets.withType<KotlinNativeTarget>().configureEach {
2627
binaries {
2728
executable(setOf(RELEASE)) {

‎backend/profiling/build.gradle.kts

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,32 @@
1+
import common.jvmTarget
2+
13
plugins {
24
dev.suresh.plugin.kotlin.mpp
35
dev.suresh.plugin.publishing
46
}
57

68
description = "JVM Profiling and Monitoring!"
79

8-
kotlin.sourceSets {
9-
commonMain { dependencies { implementation(projects.shared) } }
10+
kotlin {
11+
jvmTarget(project)
12+
13+
sourceSets {
14+
commonMain { dependencies { implementation(projects.shared) } }
1015

11-
jvmMain {
12-
dependencies {
13-
implementation(libs.jmc.common)
14-
implementation(libs.jmc.jfr)
15-
implementation(libs.ap.converter)
16-
// implementation(libs.ap.loader.all)
16+
jvmMain {
17+
dependencies {
18+
implementation(libs.jmc.common)
19+
implementation(libs.jmc.jfr)
20+
implementation(libs.ap.converter)
21+
// implementation(libs.ap.loader.all)
22+
}
23+
kotlin.srcDir("src/main/kotlin")
24+
resources.srcDir("src/main/resources")
1725
}
18-
kotlin.srcDir("src/main/kotlin")
19-
resources.srcDir("src/main/resources")
20-
}
2126

22-
jvmTest {
23-
kotlin.srcDir("src/test/kotlin")
24-
resources.srcDir("src/test/resources")
27+
jvmTest {
28+
kotlin.srcDir("src/test/kotlin")
29+
resources.srcDir("src/test/resources")
30+
}
2531
}
2632
}

‎backend/security/build.gradle.kts

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import common.jvmTarget
2+
13
plugins {
24
dev.suresh.plugin.kotlin.mpp
35
dev.suresh.plugin.publishing
@@ -6,16 +8,20 @@ plugins {
68

79
description = "Certificate and Security!"
810

9-
kotlin.sourceSets {
10-
commonMain { dependencies { implementation(projects.shared) } }
11+
kotlin {
12+
jvmTarget(project)
1113

12-
jvmMain {
13-
kotlin.srcDir("src/main/kotlin")
14-
resources.srcDir("src/main/resources")
15-
}
14+
sourceSets {
15+
commonMain { dependencies { implementation(projects.shared) } }
16+
17+
jvmMain {
18+
kotlin.srcDir("src/main/kotlin")
19+
resources.srcDir("src/main/resources")
20+
}
1621

17-
jvmTest {
18-
kotlin.srcDir("src/test/kotlin")
19-
resources.srcDir("src/test/resources")
22+
jvmTest {
23+
kotlin.srcDir("src/test/kotlin")
24+
resources.srcDir("src/test/resources")
25+
}
2026
}
2127
}

‎compose/cli/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ plugins {
1212
description = "Compose mosaic CLI app!"
1313

1414
kotlin {
15+
jvmTarget(project)
16+
1517
sourceSets {
1618
commonMain.dependencies {
1719
implementation(projects.shared)

‎compose/cmp/build.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@file:OptIn(ExperimentalComposeLibrary::class)
22
@file:Suppress("UnstableApiUsage")
33

4+
import common.*
45
import common.Platform
5-
import common.jvmArguments
66
import java.time.Year
77
import kotlin.io.path.listDirectoryEntries
88
import org.jetbrains.compose.ExperimentalComposeLibrary
@@ -20,6 +20,9 @@ plugins {
2020
description = "Compose Desktop App!"
2121

2222
kotlin {
23+
jvmTarget(project)
24+
wasmJsTarget(project)
25+
2326
sourceSets {
2427
commonMain.dependencies {
2528
implementation(projects.shared)
@@ -179,5 +182,5 @@ tasks {
179182

180183
artifacts {
181184
val composeWebApp by configurations.consumable("composeWebApp")
182-
add(composeWebApp.name, tasks.wasmJsBrowserDistribution)
185+
add(composeWebApp.name, tasks.named("wasmJsBrowserDistribution"))
183186
}

‎compose/html/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ description = "Compose HTML App"
1111
kobweb { app { index { description = "Powered by Kobweb (${libs.versions.kobweb})" } } }
1212

1313
kotlin {
14+
jsTarget(project)
15+
1416
// configAsKobwebApplication(moduleName = project.name)
1517

1618
sourceSets {

‎gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ kotlin.daemon.jvmargs=-Xmx4096m --enable-native-access=ALL-UNNAMED
2020
kotlin.jvm.target.validation.mode=warning
2121
kotlin.build.report.output=build_scan
2222
kotlinx.atomicfu.enableJvmIrTransformation=true
23+
kotlinx.atomicfu.enableNativeIrTransformation=true
2324
kotlinx.atomicfu.enableJsIrTransformation=true
24-
kotlinx.atomicfu.enableNativeIrTransformations=true
25-
kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning
2625

2726
## Kotlin/JS
2827
kotlin.js.yarn=false

0 commit comments

Comments
 (0)