Skip to content

Align Gradle with upstream: Migrate buildSrc to conventions directory #4611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
trask wants to merge 1 commit into from
+4 −7
Closed

Align Gradle with upstream: Migrate buildSrc to conventions directory #4611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Gradle
/.gradle/
/buildSrc/.gradle/
/conventions/.gradle/
/conventions/.kotlin/
/perf-tests/.gradle/
/buildSrc/.kotlin/
build/

# Intellij
Expand Down
5 changes: 0 additions & 5 deletions buildSrc/build.gradle.kts → conventions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
plugins {
`java-gradle-plugin`
`kotlin-dsl`
// When updating, update below in dependencies too
id("com.diffplug.spotless") version "8.2.0"
Expand All @@ -22,10 +21,6 @@ repositories {
gradlePluginPortal()
}

tasks.withType<Test>().configureEach {
useJUnitPlatform()
}

dependencies {
implementation(gradleApi())

Expand Down
1 change: 1 addition & 0 deletions conventions/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "conventions"
0 ...tlin/ai.errorprone-conventions.gradle.kts → ...tlin/ai.errorprone-conventions.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...ain/kotlin/ai.java-conventions.gradle.kts → ...ain/kotlin/ai.java-conventions.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...n/ai.javaagent-instrumentation.gradle.kts → ...n/ai.javaagent-instrumentation.gradle.kts
View file
Open in desktop
File renamed without changes.
0 .../kotlin/ai.publish-conventions.gradle.kts → .../kotlin/ai.publish-conventions.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...ain/kotlin/ai.sdk-version-file.gradle.kts → ...ain/kotlin/ai.sdk-version-file.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...n/kotlin/ai.shadow-conventions.gradle.kts → ...n/kotlin/ai.shadow-conventions.gradle.kts
View file
Open in desktop
File renamed without changes.
0 .../main/kotlin/ai.smoke-test-jar.gradle.kts → .../main/kotlin/ai.smoke-test-jar.gradle.kts
View file
Open in desktop
File renamed without changes.
0 .../main/kotlin/ai.smoke-test-war.gradle.kts → .../main/kotlin/ai.smoke-test-war.gradle.kts
View file
Open in desktop
File renamed without changes.
0 .../src/main/kotlin/ai.smoke-test.gradle.kts → .../src/main/kotlin/ai.smoke-test.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...kotlin/ai.spotbugs-conventions.gradle.kts → ...kotlin/ai.spotbugs-conventions.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...kotlin/ai.spotless-conventions.gradle.kts → ...kotlin/ai.spotless-conventions.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...oninsights/gradle/AiSmokeTestExtension.kt → ...oninsights/gradle/AiSmokeTestExtension.kt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import org.apache.tools.ant.taskdefs.condition.Os

pluginManagement {
includeBuild("conventions")
plugins {
id("com.github.jk1.dependency-license-report") version "3.0.1"
id("me.champeau.jmh") version "0.7.3"
Expand Down