Skip to content

Commit ca119e9

Browse files
committed
Migrate buildSrc to conventions directory
- Migrate all convention plugins from buildSrc/ to conventions/ - Remove buildSrc directory to align with upstream OpenTelemetry - Update settings.gradle.kts to use includeBuild("conventions") - Update .gitignore to ignore conventions/.gradle and .kotlin - Add Gradle alignment plan documentation This follows the upstream pattern of separating pure build logic (conventions/) from compiled plugins (gradle-plugins/ - to be added in future PR). Conventions are included as a composite build.
1 parent cbafd8d commit ca119e9

16 files changed

Lines changed: 4 additions & 7 deletions

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Gradle
22
/.gradle/
3-
/buildSrc/.gradle/
3+
/conventions/.gradle/
4+
/conventions/.kotlin/
45
/perf-tests/.gradle/
5-
/buildSrc/.kotlin/
66
build/
77

88
# Intellij
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins {
2-
`java-gradle-plugin`
32
`kotlin-dsl`
43
// When updating, update below in dependencies too
54
id("com.diffplug.spotless") version "8.2.0"
@@ -22,10 +21,6 @@ repositories {
2221
gradlePluginPortal()
2322
}
2423

25-
tasks.withType<Test>().configureEach {
26-
useJUnitPlatform()
27-
}
28-
2924
dependencies {
3025
implementation(gradleApi())
3126

conventions/settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rootProject.name = "conventions"

buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts renamed to conventions/src/main/kotlin/ai.errorprone-conventions.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/ai.java-conventions.gradle.kts renamed to conventions/src/main/kotlin/ai.java-conventions.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts renamed to conventions/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/ai.publish-conventions.gradle.kts renamed to conventions/src/main/kotlin/ai.publish-conventions.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts renamed to conventions/src/main/kotlin/ai.sdk-version-file.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/ai.shadow-conventions.gradle.kts renamed to conventions/src/main/kotlin/ai.shadow-conventions.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/ai.smoke-test-jar.gradle.kts renamed to conventions/src/main/kotlin/ai.smoke-test-jar.gradle.kts

File renamed without changes.

0 commit comments

Comments
 (0)