diff --git a/build.gradle.kts b/build.gradle.kts index 6263a5ba..6afe256a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -127,14 +127,28 @@ tasks { } withType { - kotlinOptions { + compilerOptions { allWarningsAsErrors = true } } } +// declare dependencies used in integration tests so that dependabot picks them up +val integrationTestingDependencies = configurations.create("integrationTestingDependencies") +dependencies { + integrationTestingDependencies(libs.androidGradlePlugin) + integrationTestingDependencies(libs.protobufGradlePlugin) +} + buildConfig { useKotlinOutput { topLevelConstants = true } packageName.set("build.buf.gradle") - buildConfigField("String", "DEFAULT_BUF_VERSION", "\"${libs.bufbuild.get().version}\"") + buildConfigField("String", "DEFAULT_BUF_VERSION", "\"${libs.versions.bufbuild.get()}\"") + + sourceSets.getByName("test") { + buildConfigField("String", "PROTOBUF_VERSION", "\"${libs.versions.protoc.get()}\"") + buildConfigField("String", "KOTLIN_VERSION", "\"${libs.versions.kotlin.get()}\"") + buildConfigField("String", "PROTOBUF_GRADLE_PLUGIN_VERSION", "\"${libs.versions.protobufGradlePlugin.get()}\"") + buildConfigField("String", "ANDROID_GRADLE_PLUGIN_VERSION", "\"${libs.versions.androidGradlePlugin.get()}\"") + } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2ecbf73d..ee46bf4c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,9 @@ protoc = "4.29.3" versioncompare = "1.5.0" # test +androidGradlePlugin = "7.3.1" junit = "5.11.4" +protobufGradlePlugin = "0.9.3" truth = "1.4.4" [plugins] @@ -34,5 +36,7 @@ protoc = { module = "com.google.protobuf:protoc", version.ref = "protoc" } versioncompare = { module = "io.github.g00fy2:versioncompare", version.ref = "versioncompare" } # test +androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" } junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" } +protobufGradlePlugin = { module = "com.google.protobuf:protobuf-gradle-plugin", version.ref = "protobufGradlePlugin" } truth = { module = "com.google.truth:truth", version.ref = "truth" } diff --git a/src/test/kotlin/build/buf/gradle/AbstractBufIntegrationTest.kt b/src/test/kotlin/build/buf/gradle/AbstractBufIntegrationTest.kt index d86d7f28..97a69c6a 100644 --- a/src/test/kotlin/build/buf/gradle/AbstractBufIntegrationTest.kt +++ b/src/test/kotlin/build/buf/gradle/AbstractBufIntegrationTest.kt @@ -70,10 +70,10 @@ abstract class AbstractBufIntegrationTest : IntegrationTest { .withProjectDir(projectDir) .withPluginClasspath() .withArguments( - "-PprotobufGradleVersion=0.9.3", - "-PprotobufVersion=3.23.4", - "-PkotlinVersion=1.7.20", - "-PandroidGradleVersion=7.3.0", + "-PprotobufGradleVersion=$PROTOBUF_GRADLE_PLUGIN_VERSION", + "-PprotobufVersion=$PROTOBUF_VERSION", + "-PkotlinVersion=$KOTLIN_VERSION", + "-PandroidGradleVersion=$ANDROID_GRADLE_PLUGIN_VERSION", "--configuration-cache", ).withDebug(false) // Enable for interactive debugging .let { WrappedRunner(it) }