Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion agent/agent-for-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ tasks {
dependsOn(relocateJavaagentLibs)
isolateClasses(relocateJavaagentLibs.get().outputs.files)

into("$buildDir/isolated/javaagentLibs")
into("${layout.buildDirectory.get()}/isolated/javaagentLibs")
}

// 3. the relocated and isolated javaagent libs are merged together with the bootstrap libs (which undergo relocation
Expand Down
2 changes: 1 addition & 1 deletion agent/agent/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ tasks {
dependsOn(relocateJavaagentLibs)
isolateClasses(relocateJavaagentLibs.get().outputs.files)

into("$buildDir/isolated/javaagentLibs")
into("${layout.buildDirectory.get()}/isolated/javaagentLibs")
}

// 3. the relocated and isolated javaagent libs are merged together with the bootstrap libs (which undergo relocation
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ dependencies {
implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")

// earlier versions aren't compatible with Gradle 8.1.1
implementation("org.springframework.boot:spring-boot-gradle-plugin:2.5.12")
implementation("org.springframework.boot:spring-boot-gradle-plugin:2.7.18")
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ tasks.withType<Test>().configureEach {
// The sources are packaged into the testing jar so we need to make sure to exclude from the test
// classpath, which automatically inherits them, to ensure our shaded versions are used.
classpath = classpath.filter {
if (file("$buildDir/resources/main") == it || file("$buildDir/classes/java/main") == it) {
if (file("${layout.buildDirectory.get()}/resources/main") == it || file("${layout.buildDirectory.get()}/classes/java/main") == it) {
return@filter false
}
return@filter true
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
`java-library`
}

val sdkVersionDir = "${buildDir}/generated/resources/sdk-version"
val sdkVersionDir = "${layout.buildDirectory.get()}/generated/resources/sdk-version"

abstract class GenerateVersionResourceTask : DefaultTask() {
@get:Input
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ configurations.all {
}

tasks {
task<Test>("smokeTest") {
tasks.register<Test>("smokeTest") {
useJUnitPlatform()

// this is just to force building the agent first
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spotless {
"docs/**/*.md",
"*.sh",
"src/**/*.properties")
indentWithSpaces()
leadingTabsToSpaces()
trimTrailingWhitespace()
endWithNewline()
}
Expand Down
2 changes: 1 addition & 1 deletion etw/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ sourceSets {
}
}

archivesBaseName = "applicationinsights-java-etw-provider"
base.archivesName = "applicationinsights-java-etw-provider"

logger.info "project ${project.path} prop: ai.etw.native.build=${System.properties['ai.etw.native.build']}"

Expand Down
5 changes: 2 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
# org.gradle.warning.mode=fail

# To allow caching more tasks in buildSrc project
# This property is not mentioned in Gradle documentation
# See https://github.com/gradle/gradle/issues/15214 for background info
systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true
# The system property org.gradle.kotlin.dsl.precompiled.accessors.strict
# is now deprecated and defaults to true, so no longer needed

# Workaround https://youtrack.jetbrains.com/issue/KT-34862
kotlin.incremental=false
2 changes: 1 addition & 1 deletion smoke-tests/apps/gRPC/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import com.google.protobuf.gradle.*

plugins {
id("ai.smoke-test-jar")
id("com.google.protobuf") version "0.8.19"
id("com.google.protobuf") version "0.9.4"
}

val grpcVersion = "1.26.0" // first version with support for arm64
Expand Down