Release 1.0.0

Foso · Mar 2, 2023 · f3f488c · f3f488c
1 parent d37bab8
commit f3f488c
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 22 deletions.
diff --git a/compiler-plugin/build.gradle.kts b/compiler-plugin/build.gradle.kts
@@ -23,7 +23,7 @@ mavenPublishing {
 }
 
 group = "de.jensklingenberg.ktorfit"
-version = libs.versions.ktorfit.compiler.get()
+version = libs.versions.ktorfit.asProvider().get()
 
 dependencies {
     compileOnly(libs.autoService)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,8 @@
-1.0.0 (not released)
+1.0.0 (02-03-2023)
 ========================================
+This project is now following [semver](https://semver.org/)
+
+NEW:
 - internal optimizations
 - throw compile error when generated class can not be found
 

diff --git a/example/AndroidOnlyExample/app/build.gradle.kts b/example/AndroidOnlyExample/app/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
     id ("de.jensklingenberg.ktorfit") version "1.0.0"
 
 }
+val ktorfit = "1.0.0"
 
+configure<de.jensklingenberg.ktorfit.gradle.KtorfitGradleConfiguration> {
+    version = ktorfit
+}
 android {
     namespace= "de.jensklingenberg.androidonlyexample"
     compileSdk= 33
@@ -49,8 +53,7 @@ android {
         }
     }
 }
-val ktorfit = "1.0.0-beta18"
-val ktor = "2.2.3"
+val ktor = "2.2.4"
 val compose_ui_version = "1.3.3"
 dependencies {
     ksp("de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfit")

diff --git a/example/AndroidOnlyExample/build.gradle b/example/AndroidOnlyExample/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.3.1' apply false
-    id 'com.android.library' version '7.3.1' apply false
+    id 'com.android.application' version '7.4.1' apply false
+    id 'com.android.library' version '7.4.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
 }
diff --git a/example/MultiplatformExample/androidApp/build.gradle.kts b/example/MultiplatformExample/androidApp/build.gradle.kts
@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
     defaultConfig {
         applicationId = "com.example.myapplication.android"
         minSdk = 21
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts
@@ -2,21 +2,39 @@ plugins {
     kotlin("multiplatform")
     kotlin("native.cocoapods")
     id("com.android.library")
-    id("com.google.devtools.ksp") version "1.8.0-1.0.8"
+    id("com.google.devtools.ksp") version "1.8.0-1.0.9"
     id("kotlinx-serialization")
     id("de.jensklingenberg.ktorfit") version "1.0.0"
 }
 
 version = "1.0"
-val ktorVersion = "2.2.3"
-val ktorfitVersion = "1.0.0-beta18"
+val ktorVersion = "2.2.4"
+val ktorfitVersion = "1.0.0"
 
+configure<de.jensklingenberg.ktorfit.gradle.KtorfitGradleConfiguration> {
+    enabled = true
+    version = ktorfitVersion
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
 kotlin {
     android()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
-    jvm()
+    jvm(){
+        compilations.all {
+            kotlinOptions.jvmTarget = "1.8"
+        }
+    }
     macosX64()
     js(IR) {
         this.nodejs()

diff --git a/gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleSubPlugin.kt b/gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleSubPlugin.kt
@@ -16,7 +16,7 @@ open class KtorfitGradleConfiguration {
     /**
      * version number of the compiler plugin
      */
-    var version: String = "1.0.0-beta17" // remember to bump this version before any release!
+    var version: String = "1.0.0" // remember to bump this version before any release!
 
     /**
      * used to get debug information from the compiler plugin

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,10 +6,10 @@ kctfork = "0.2.1"
 kotlin = "1.8.0"
 kotlinPoet = "1.12.0"
 kspVersion = "1.8.0-1.0.8"
-ktorfit = "1.0.0-SNAPSHOT"
-ktorfit-compiler = "1.0.0-SNAPSHOT"
-ktorfit-ksp = "1.0.0-SNAPSHOT"
-ktorfit-lib = "1.0.0-SNAPSHOT"
+ktorfit = "1.0.0"
+ktorfit-compiler = "1.0.0"
+ktorfit-ksp = "1.0.0"
+ktorfit-lib = "1.0.0"
 ktorVersion = "2.2.4"
 
 [libraries]

diff --git a/ktorfit-annotations/build.gradle.kts b/ktorfit-annotations/build.gradle.kts
@@ -18,7 +18,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions.jvmTarget = "1.8"
 }
 
-version = libs.versions.ktorfit.ksp.get()
+version = libs.versions.ktorfit.asProvider().get()
 
 kotlin {
 

diff --git a/ktorfit-ksp/build.gradle.kts b/ktorfit-ksp/build.gradle.kts
@@ -30,7 +30,7 @@ mavenPublishing {
 }
 
 group = "de.jensklingenberg.ktorfit"
-version = libs.versions.ktorfit.ksp.get()
+version = libs.versions.ktorfit.asProvider().get()
 
 dependencies {
     implementation(projects.ktorfitAnnotations)

diff --git a/ktorfit-lib/build.gradle.kts b/ktorfit-lib/build.gradle.kts
@@ -35,7 +35,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions.jvmTarget = "1.8"
 }
 
-version = libs.versions.ktorfit.lib.get()
+version = libs.versions.ktorfit.asProvider().get()
 
 kotlin {
     explicitApi()

diff --git a/ktorfit-lib/src/commonMain/kotlin/de/jensklingenberg/ktorfit/internal/KtorfitClient.kt b/ktorfit-lib/src/commonMain/kotlin/de/jensklingenberg/ktorfit/internal/KtorfitClient.kt
@@ -116,7 +116,7 @@ internal class KtorfitClient(private val ktorfit: Ktorfit) : Client {
         val requestConverter = ktorfit.requestConverters.firstOrNull {
             it.supportedType(parameterType, requestType)
         }
-            ?: throw IllegalArgumentException("No RequestConverter found to convert ${parameterType.qualifiedName} to ${requestType.qualifiedName}")
+            ?: throw IllegalArgumentException("No RequestConverter found to convert ${parameterType.simpleName} to ${requestType.simpleName}")
         return requestType.cast(requestConverter.convert(data))
     }
 

diff --git a/sandbox/build.gradle.kts b/sandbox/build.gradle.kts
@@ -8,7 +8,7 @@ version = "1.0-SNAPSHOT"
 
 configure<de.jensklingenberg.ktorfit.gradle.KtorfitGradleConfiguration> {
     enabled = true
-    version = libs.versions.ktorfit.compiler.get()
+    version = libs.versions.ktorfit.asProvider().get()
 }
 ksp {
     arg("Ktorfit_Errors", "1")