Set Snapshot version

Foso · Apr 27, 2024 · 56adf91 · 56adf91
1 parent ce3ef2e
commit 56adf91
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/ktorfit-annotations/build.gradle.kts b/ktorfit-annotations/build.gradle.kts
@@ -47,8 +47,6 @@ kotlin {
     tvosArm64()
     tvosX64()
     tvosSimulatorArm64()
-    @OptIn(ExperimentalWasmDsl::class)
-    wasmJs()
     macosX64()
     macosArm64()
     linuxX64 {

diff --git a/...gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitCompilerSubPlugin.kt b/...gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitCompilerSubPlugin.kt
@@ -32,8 +32,8 @@ internal class KtorfitCompilerSubPlugin : KotlinCompilerPluginSupportPlugin {
     private fun Project.getKtorfitConfig() =
         this.extensions.findByType(KtorfitGradleConfiguration::class.java) ?: KtorfitGradleConfiguration()
 
-    override fun apply(project: Project) {
-        myproject = project
+    override fun apply(target: Project) {
+        myproject = target
     }
 
     override fun getCompilerPluginId(): String = COMPILER_PLUGIN_ID
@@ -43,10 +43,11 @@ internal class KtorfitCompilerSubPlugin : KotlinCompilerPluginSupportPlugin {
     }
 
     override fun getPluginArtifact(): SubpluginArtifact {
+        myproject.getKtorfitConfig()
         return SubpluginArtifact(
             groupId = SERIALIZATION_GROUP_NAME,
             artifactId = ARTIFACT_NAME,
-            version = myproject.getKtorfitConfig().version
+            version = "2.0.0-SNAPSHOT" // remember to bump this version before any release!
         )
     }
 }
diff --git a/...adle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleConfiguration.kt b/...adle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleConfiguration.kt
@@ -6,11 +6,6 @@ open class KtorfitGradleConfiguration {
      */
     internal var enabled: Boolean = true
 
-    /**
-     * version number of the compiler plugin
-     */
-    internal var version: String = "2.0.0-SNAPSHOT" // remember to bump this version before any release!
-
     /**
      * used to get debug information from the compiler plugin
      */

diff --git a/ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradlePlugin.kt b/ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradlePlugin.kt
@@ -2,20 +2,12 @@ package de.jensklingenberg.ktorfit.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.findByType
-import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 
 class KtorfitGradlePlugin : Plugin<Project> {
     companion object {
         const val GRADLE_TASKNAME = "ktorfit"
     }
 
-    private val Project.kotlinExtension: KotlinProjectExtension?
-        get() = this.extensions.findByType<KotlinProjectExtension>()
-
-    private fun Project.getKtorfitConfig() =
-        this.extensions.findByType(KtorfitGradleConfiguration::class.java) ?: KtorfitGradleConfiguration()
-
     override fun apply(project: Project) {
         project.pluginManager.apply(KtorfitCompilerSubPlugin::class.java)
     }

diff --git a/sandbox/src/commonMain/kotlin/com/example/UserFactory.kt b/sandbox/src/commonMain/kotlin/com/example/UserFactory.kt
@@ -6,6 +6,7 @@ import de.jensklingenberg.ktorfit.Ktorfit
 import de.jensklingenberg.ktorfit.converter.Converter
 import de.jensklingenberg.ktorfit.converter.KtorfitResult
 import de.jensklingenberg.ktorfit.converter.TypeData
+import de.jensklingenberg.ktorfit.internal.KtorfitConverterHelper
 import io.ktor.client.call.*
 import io.ktor.client.statement.*
 
@@ -19,7 +20,7 @@ class UserFactory : Converter.Factory {
             return object : Converter.SuspendResponseConverter<HttpResponse, Any> {
 
                 override suspend fun convert(result: KtorfitResult): Any {
-                    return when (result) {
+                     when (result) {
                         is KtorfitResult.Success -> {
                             val response = result.response
                             val envelope = response.body<Envelope>()