Skip to content
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

Decouple Kotlin plugin version from Ktorfit version #732

Merged
merged 2 commits into from
Nov 10, 2024
Merged

Decouple Kotlin plugin version from Ktorfit version #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb6e32d
Decouple Kotlin plugin version from Ktorfit version
Foso Nov 10, 2024
2f67832
Decouple Kotlin plugin version from Ktorfit version
Foso Nov 10, 2024
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 ...gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitCompilerSubPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package de.jensklingenberg.ktorfit.gradle
import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.ARTIFACT_NAME
import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.COMPILER_PLUGIN_ID
import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.GROUP_NAME
import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.KTORFIT_VERSION
import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.KTORFIT_COMPILER_PLUGIN_VERSION
import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.MIN_KOTLIN_VERSION
import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.SNAPSHOT
import org.gradle.api.Project
Expand Down Expand Up @@ -46,7 +46,7 @@ internal class KtorfitCompilerSubPlugin : KotlinCompilerPluginSupportPlugin {
return SubpluginArtifact(
groupId = GROUP_NAME,
artifactId = ARTIFACT_NAME,
version = "${KTORFIT_VERSION}-${myproject.kotlinExtension.compilerVersion.get()}$SNAPSHOT",
version = "${KTORFIT_COMPILER_PLUGIN_VERSION}-${myproject.kotlinExtension.compilerVersion.get()}$SNAPSHOT",
)
}

Expand Down
5 changes: 3 additions & 2 deletions ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradlePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ class KtorfitGradlePlugin : Plugin<Project> {
const val GROUP_NAME = "de.jensklingenberg.ktorfit"
const val ARTIFACT_NAME = "compiler-plugin"
const val COMPILER_PLUGIN_ID = "ktorfitPlugin"
const val KTORFIT_VERSION = "2.1.0" // remember to bump this version before any release!
const val KTORFIT_KSP_PLUGIN_VERSION = "2.1.0" // remember to bump this version before any release!
const val KTORFIT_COMPILER_PLUGIN_VERSION = "2.1.0"
const val SNAPSHOT = ""
const val MIN_KSP_VERSION = "1.0.24"
const val MIN_KOTLIN_VERSION = "2.0.0"
Expand Down Expand Up @@ -78,7 +79,7 @@ class KtorfitGradlePlugin : Plugin<Project> {
}
}
}
val dependency = "$ktorfitKsp:$KTORFIT_VERSION-$kspVersion$SNAPSHOT"
val dependency = "$ktorfitKsp:$KTORFIT_KSP_PLUGIN_VERSION-$kspVersion$SNAPSHOT"

when (val kotlinExtension = kotlinExtension) {
is KotlinSingleTargetExtension<*> -> {
Expand Down
Loading