Merge branch 'master' into renovate/composeoptions-1.x

Foso · Sep 22, 2023 · 99d7347 · 99d7347
2 parents eae3217 + 2e45bd0
commit 99d7347
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,8 @@ Please see the documentation at [https://foso.github.io/Ktorfit/](https://foso.g
 
 | Version      |   Kotlin   |    KSP     |   Ktor    |
 |--------------|:----------:|:----------:|:---------:|
-| **_latest_** | **1.9.10** | **1.0.13** | **2.3.3** |
+| **_latest_** | **1.9.10** | **1.0.13** | **2.3.4** |
+| **_1.6.0_**  | **1.9.10** | **1.0.13** | **2.3.3** |
 | **_1.5.0_**  | **1.9.0**  | **1.0.13** | **2.3.2** |
 | **_1.4.3_**  | **1.8.20** | **1.0.11** | **2.3.1** |
 
@@ -34,36 +35,27 @@ Please see the documentation at [https://foso.github.io/Ktorfit/](https://foso.g
 build.gradle.kts:
 ```kotlin
 plugins {
-  id("de.jensklingenberg.ktorfit") version "1.0.0"
-}
-
-configure<de.jensklingenberg.ktorfit.gradle.KtorfitGradleConfiguration> {
-    version = "1.6.0"
+  id("de.jensklingenberg.ktorfit") version "1.7.0"
 }
 ```
 
 build.gradle
 ```kotlin
 plugins {
-    id ("de.jensklingenberg.ktorfit") version "1.0.0"
-}
-
-ktorfit{
-    version = "1.6.0"
+    id ("de.jensklingenberg.ktorfit") version "1.7.0"
 }
 ```
 
-
 KSP:
 ```kotlin
-de.jensklingenberg.ktorfit:ktorfit-ksp:1.6.0
+de.jensklingenberg.ktorfit:ktorfit-ksp:1.7.0
 ```
 
 Ktorfit-lib/-light:
 ```kotlin
-implementation("de.jensklingenberg.ktorfit:ktorfit-lib:1.6.0")
+implementation("de.jensklingenberg.ktorfit:ktorfit-lib:1.7.0")
 or
-implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:1.6.0")
+implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:1.7.0")
 ```
 
 

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -5,12 +5,24 @@ All important changes of this project must be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+1.7.0 - 2023-09-16
+========================================
+# Gradle plugin
+From now on with every Ktorfit release there will also be a Gradle plugin with the same version.
+That means that drop you can drop the Gradle extension block where you previously set the version number and just bump the number of the Gradle plugin. https://foso.github.io/Ktorfit/installation/
+
+```kotlin
+plugins {
+id("de.jensklingenberg.ktorfit") version "1.7.0"
+}
+```
 
 ### Added
 - Added a compiler type checks if the type used for the create function is an interface
 
 ### Changed
+- Upgrade dependencies: Ktor 2.3.4
+
 ### Deprecated
 ### Removed
 ### Fixed

diff --git a/docs/installation.md b/docs/installation.md
@@ -8,11 +8,7 @@ You need to add KSP and the [Ktorfit Gradle plugin](https://plugins.gradle.org/p
 ```kotlin
 plugins {
   id("com.google.devtools.ksp") version "CURRENT_KSP_VERSION"
-  id("de.jensklingenberg.ktorfit") version "1.0.0"
-}
-
-configure<de.jensklingenberg.ktorfit.gradle.KtorfitGradleConfiguration> {
-    version = "{{ktorfit.release}}"
+  id("de.jensklingenberg.ktorfit") version "{{ktorfit.release}}"
 }
 ```
 

diff --git a/example/AndroidOnlyExample/app/build.gradle.kts b/example/AndroidOnlyExample/app/build.gradle.kts
@@ -3,14 +3,10 @@ plugins {
     id("org.jetbrains.kotlin.android")
     id("com.google.devtools.ksp") version "1.9.10-1.0.13"
     id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
-    id("de.jensklingenberg.ktorfit") version "1.0.0"
-
+    id("de.jensklingenberg.ktorfit") version "1.7.0"
 }
-val ktorfit = "1.6.0"
 
-configure<de.jensklingenberg.ktorfit.gradle.KtorfitGradleConfiguration> {
-    version = ktorfit
-}
+
 android {
     namespace = "de.jensklingenberg.androidonlyexample"
     compileSdk = 34
@@ -54,6 +50,8 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
         jvmTarget = "1.8"
     }
 }
+
+val ktorfit = "1.7.0"
 val ktor = "2.3.4"
 val compose_ui_version = "1.5.1"
 dependencies {

diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts
@@ -4,17 +4,12 @@ plugins {
     id("com.android.library")
     id("com.google.devtools.ksp") version "1.9.10-1.0.13"
     id("kotlinx-serialization")
-    id("de.jensklingenberg.ktorfit") version "1.0.0"
+    id("de.jensklingenberg.ktorfit") version "1.7.0"
 }
 
 version = "1.0"
 val ktorVersion = "2.3.4"
-val ktorfitVersion = "1.6.0"
-
-ktorfit {
-    version = ktorfitVersion
-    logging = true
-}
+val ktorfitVersion = "1.7.0"
 
 kotlin {
     jvmToolchain(8)

diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "de.jensklingenberg.ktorfit"
-version = "1.0.0"
+version = "1.7.0"
 
 
 allprojects {

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" // remember to bump this version before any release!
+    var version: String = "1.7.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
@@ -3,13 +3,13 @@ autoService = "1.1.1"
 autoServiceKsp = "1.10"
 coroutines = "1.7.3"
 detekt = "1.23.1"
-gradlePlugin = "1.0.0"
+gradlePlugin = "1.7.0"
 kctfork = "0.3.2"
 kotlin = "1.9.10"
 kotlinPoet = "1.14.2"
 kspVersion = "1.9.10-1.0.13"
-ktorfit = "1.6.0"
-ktorfit-lib = "1.6.0"
+ktorfit = "1.7.0"
+ktorfit-lib = "1.7.0"
 ktorVersion = "2.3.4"
 gradleMavenPublishPlugin = "0.25.3"
 vannikMavenPublish = "0.25.3"

diff --git a/ktorfit-ksp/build.gradle.kts b/ktorfit-ksp/build.gradle.kts
@@ -64,20 +64,10 @@ detekt {
     buildUponDefaultConfig = false
 }
 
-tasks.register("sourcesJar", Jar::class) {
-    group = "build"
-    description = "Assembles Kotlin sources"
-
-    archiveClassifier.set("sources")
-    from(sourceSets.main.get().allSource)
-    dependsOn(tasks.classes)
-}
-
 publishing {
     publications {
         create<MavenPublication>("default") {
             from(components["java"])
-            artifact(tasks["sourcesJar"])
 
             pom {
                 name.set(project.name)

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -13,9 +13,9 @@ extra:
   site:
     images: '../../images'
   ktorfit:
-    release: "1.6.0"
+    release: "1.7.0"
   ktor:
-    release: "2.3.3"
+    release: "2.3.4"
   social:
     - icon: fontawesome/brands/github-alt
       link: 'https://github.com/foso'