diff --git a/build.gradle.kts b/build.gradle.kts index 339664556..29e57bc34 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,8 +6,6 @@ import org.gradle.api.plugins.JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME import org.gradle.api.plugins.JavaPlugin.SOURCES_ELEMENTS_CONFIGURATION_NAME import org.gradle.plugin.compatibility.compatibility import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode -import org.jetbrains.kotlin.gradle.dsl.JvmTarget -import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation plugins { @@ -17,6 +15,7 @@ plugins { alias(libs.plugins.mavenPublish) alias(libs.plugins.pluginPublish) alias(libs.plugins.spotless) + alias(libs.plugins.tapmoc) } version = providers.gradleProperty("VERSION_NAME").get() @@ -30,18 +29,9 @@ dokka { dokkaPublications.html { outputDirectory = rootDir.resolve("docs/api") } kotlin { explicitApi() @OptIn(ExperimentalAbiValidation::class) abiValidation { enabled = true } - val jdkRelease = "17" compilerOptions { allWarningsAsErrors = true - // https://docs.gradle.org/current/userguide/compatibility.html#kotlin - apiVersion = KotlinVersion.KOTLIN_2_2 - languageVersion = apiVersion - jvmTarget = JvmTarget.fromTarget(jdkRelease) jvmDefault = JvmDefaultMode.NO_COMPATIBILITY - freeCompilerArgs.add("-Xjdk-release=$jdkRelease") - } - target.compilations.configureEach { - compileJavaTaskProvider { options.release = jdkRelease.toInt() } } } @@ -60,6 +50,13 @@ spotless { kotlinGradle { ktfmt(libs.ktfmt.get().version).googleStyle() } } +tapmoc { + gradle("9.0.0") + java(17) + // https://docs.gradle.org/current/userguide/compatibility.html#kotlin + kotlin("2.2.0") +} + val testPluginClasspath by configurations.registering { isCanBeResolved = true @@ -97,14 +94,6 @@ publishing.publications.withType().configureEach { suppressPomMetadataWarningsFor(SOURCES_ELEMENTS_CONFIGURATION_NAME) } -configurations.named(API_ELEMENTS_CONFIGURATION_NAME) { - attributes.attribute( - // TODO: https://github.com/gradle/gradle/issues/24608 - GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, - objects.named(libs.versions.minGradle.get()), - ) -} - val testGradleVersion: String = providers.gradleProperty("testGradleVersion").orNull.let { val value = if (it == null || it == "current") GradleVersion.current().version else it diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 65ff22f83..5f3e42f5a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,4 @@ [versions] -minGradle = "9.0.0" kotlin = "2.3.20" moshi = "1.15.2" pluginPublish = "2.1.0" @@ -39,3 +38,4 @@ jetbrains-dokka = "org.jetbrains.dokka:2.1.0" mavenPublish = "com.vanniktech.maven.publish:0.36.0" pluginPublish = { id = "com.gradle.plugin-publish", version.ref = "pluginPublish" } spotless = "com.diffplug.spotless:8.3.0" +tapmoc = "com.gradleup.tapmoc:0.4.0"