diff --git a/build.gradle b/build.gradle index b5835339..c549815d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ plugins { id 'org.jetbrains.dokka' version '1.8.10' apply false id 'org.jlleitschuh.gradle.ktlint' version '12.1.1' apply false id 'com.gradle.plugin-publish' version '0.21.0' apply false + id 'com.google.devtools.ksp' version '2.0.0-1.0.23' apply false id 'java-gradle-plugin' id 'java-library' id 'groovy' @@ -17,12 +18,6 @@ allprojects { preferProjectModules() enableDependencyVerification() - - eachDependency { details -> - if (details.requested.group == "org.jetbrains.kotlin") { - details.useVersion("2.0.0") - } - } } } } diff --git a/gradle-versions-plugin/build.gradle b/gradle-versions-plugin/build.gradle index 4f96a634..fdc563b5 100644 --- a/gradle-versions-plugin/build.gradle +++ b/gradle-versions-plugin/build.gradle @@ -3,6 +3,7 @@ plugins { id 'org.jetbrains.dokka' id 'org.jlleitschuh.gradle.ktlint' id 'com.gradle.plugin-publish' + id 'com.google.devtools.ksp' id 'maven-publish' id 'java-gradle-plugin' id 'java-library' @@ -25,14 +26,21 @@ tasks.register('createClasspathManifest') { } } +ktlint { + ignoreFailures = true + filter { + exclude("**/build/generated/**") + } +} + dependencies { compileOnly gradleApi() implementation localGroovy() implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.0' - implementation 'org.jetbrains.kotlin:kotlin-reflect:2.0.0' implementation 'com.squareup.okhttp3:okhttp:4.12.0' - implementation 'com.squareup.moshi:moshi-kotlin:1.12.0' + implementation 'com.squareup.moshi:moshi-kotlin:1.15.1' + ksp 'com.squareup.moshi:moshi-kotlin-codegen:1.15.1' testRuntimeOnly files(createClasspathManifest) diff --git a/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/reporter/JsonReporter.kt b/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/reporter/JsonReporter.kt index 5564cfb0..1f9df47b 100644 --- a/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/reporter/JsonReporter.kt +++ b/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/reporter/JsonReporter.kt @@ -2,7 +2,6 @@ package com.github.benmanes.gradle.versions.reporter import com.github.benmanes.gradle.versions.reporter.result.Result import com.squareup.moshi.Moshi -import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import org.gradle.api.Project import java.io.OutputStream @@ -34,7 +33,6 @@ class JsonReporter( companion object { private val moshi = Moshi.Builder() - .addLast(KotlinJsonAdapterFactory()) .build() } } diff --git a/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/updates/gradle/GradleUpdateChecker.kt b/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/updates/gradle/GradleUpdateChecker.kt index 2e909cd2..a482708f 100644 --- a/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/updates/gradle/GradleUpdateChecker.kt +++ b/gradle-versions-plugin/src/main/kotlin/com/github/benmanes/gradle/versions/updates/gradle/GradleUpdateChecker.kt @@ -1,7 +1,7 @@ package com.github.benmanes.gradle.versions.updates.gradle +import com.squareup.moshi.JsonClass import com.squareup.moshi.Moshi -import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import okhttp3.OkHttpClient import okhttp3.Request import org.gradle.util.GradleVersion @@ -94,11 +94,11 @@ class GradleUpdateChecker( .build() private val moshi = Moshi.Builder() - .addLast(KotlinJsonAdapterFactory()) .build() /** Represents the XML from [gradleVersionsApiBaseUrl] */ - private class VersionSite { + @JsonClass(generateAdapter = true) + internal class VersionSite { var version: String? = null }