Skip to content

Commit 151bbdd

Browse files
Refactor: Move buildSrc to convention-plugin-ai
1 parent fbbae40 commit 151bbdd

21 files changed

+15
-5
lines changed

build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,16 @@ version = run {
7979

8080
buildscript {
8181
dependencies {
82-
classpath("com.squareup.okhttp3:okhttp:5.1.0")
82+
classpath(libs.okhttp)
8383
}
8484
}
8585

8686
plugins {
8787
id("ai.kotlin.dokka")
8888
alias(libs.plugins.kotlinx.kover)
8989
alias(libs.plugins.ktlint)
90+
alias(libs.plugins.android.application).apply(false)
91+
alias(libs.plugins.multiplatform).apply(false)
9092
}
9193

9294
allprojects {
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ plugins {
99
}
1010

1111
dependencies {
12+
compileOnly(libs.android.tools.gradle)
13+
runtimeOnly(libs.android.tools.gradle)
1214
implementation(libs.kotlin.gradle.plugin)
1315
implementation(libs.dokka.gradle.plugin)
1416
implementation(libs.jetsign.gradle.plugin)
15-
implementation(libs.android.tools.gradle)
1617

1718
// Somewhat hacky way to access libs.version.toml in convention plugins.
1819
// IntelliJ can mark this code red, but it actually compiles.
@@ -21,7 +22,7 @@ dependencies {
2122
}
2223

2324
kotlin {
24-
jvmToolchain(17)
25+
jvmToolchain(libs.versions.jdkVersion.get().toInt())
2526
}
2627

2728
gradlePlugin {

buildSrc/src/main/kotlin/ai.kotlin.configuration.gradle.kts renamed to convention-plugin-ai/src/main/kotlin/ai.kotlin.configuration.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ val kotlinBomVersion = requireNotNull(libs.kotlin.bom.get().version)
1818

1919
extensions.getByType<KotlinProjectExtension>().apply {
2020
jvmToolchain {
21-
languageVersion.set(JavaLanguageVersion.of(17))
21+
languageVersion.set(JavaLanguageVersion.of(libs.versions.jdkVersion.get().toInt()))
2222
}
2323

2424
sourceSets.all {

buildSrc/src/main/kotlin/ai.kotlin.dokka.gradle.kts renamed to convention-plugin-ai/src/main/kotlin/ai.kotlin.dokka.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/ai.kotlin.jvm.gradle.kts renamed to convention-plugin-ai/src/main/kotlin/ai.kotlin.jvm.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/ai.kotlin.jvm.publish.gradle.kts renamed to convention-plugin-ai/src/main/kotlin/ai.kotlin.jvm.publish.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/ai.kotlin.multiplatform.gradle.kts renamed to convention-plugin-ai/src/main/kotlin/ai.kotlin.multiplatform.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/ai.kotlin.multiplatform.server.gradle.kts renamed to convention-plugin-ai/src/main/kotlin/ai.kotlin.multiplatform.server.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/ai/koog/gradle/plugins/CheckSplitPackagesPlugin.kt renamed to convention-plugin-ai/src/main/kotlin/ai/koog/gradle/fixups/CheckSplitPackagesPlugin.kt

File renamed without changes.

0 commit comments

Comments
 (0)