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

Release 2.0.0-beta1 #543

Merged
merged 2 commits into from
Apr 28, 2024
Merged

Release 2.0.0-beta1 #543

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
f4a4269
Release 2.0.0-beta1
Foso Apr 28, 2024
dd87722
Release 2.0.0-beta1
Foso Apr 28, 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
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,30 +32,30 @@ build.gradle.kts:

```kotlin
plugins {
id("de.jensklingenberg.ktorfit") version "1.14.0"
id("de.jensklingenberg.ktorfit") version "2.0.0-beta1"
}
```

build.gradle

```kotlin
plugins {
id("de.jensklingenberg.ktorfit") version "1.14.0"
id("de.jensklingenberg.ktorfit") version "2.0.0-beta1"
}
```

KSP:

```kotlin
de.jensklingenberg.ktorfit:ktorfit-ksp:1.14.0
de.jensklingenberg.ktorfit:ktorfit-ksp:2.0.0-beta1
```

Ktorfit-lib/-light:

```kotlin
implementation("de.jensklingenberg.ktorfit:ktorfit-lib:1.14.0")
implementation("de.jensklingenberg.ktorfit:ktorfit-lib:2.0.0-beta1")
or
implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:1.14.0")
implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:2.0.0-beta1")
```

## 👷 Project Structure
Expand Down
2 changes: 1 addition & 1 deletion docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ and this project orients towards [Semantic Versioning](http://semver.org/spec/v2
Note: This project needs KSP to work and every new Ktorfit with an update of the KSP version is technically a breaking change.
But there is no intent to bump the Ktorfit major version for every KSP update.

2.0.0-beta1 - Unreleased
2.0.0-beta1 - 2024-04-28
========================================
### Breaking Changes

Expand Down
19 changes: 10 additions & 9 deletions docs/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ inspired by [Retrofit](https://square.github.io/retrofit/)

## Compatibility

| Ktorfit-version | Kotlin | KSP | Ktor |
|--------------------------|:-------------------------:|:-----------------------:|:----------:|
| **_1.14.0_** | **2.0.0-RC1** | **1.0.20** | **2.3.10** |
| **_1.13.0_** | **1.9.23** | **1.0.20** | **2.3.10** |
| **_1.12.0_** | **1.9.22** | **1.0.16** | **2.3.6** |
| **_1.11.0_** | **1.9.21** | **1.0.15** | **2.3.6** |
| **_1.10.2_** | **1.9.20** | **1.0.14** | **2.3.6** |
| **_1.10.1_** | **1.9.20** | **1.0.14** | **2.3.4** |
| **_1.10.0_** | **1.9.20** | **1.0.14** | **2.3.4** |
| Ktorfit-version | Kotlin | KSP | Ktor |
|-------------------|:-------------:|:----------:|:----------:|
| **_2.0.0-beta1_** | **2.0.0-RC1** | **1.0.20** | **2.3.10** |
| **_1.14.0_** | **2.0.0-RC1** | **1.0.20** | **2.3.10** |
| **_1.13.0_** | **1.9.23** | **1.0.20** | **2.3.10** |
| **_1.12.0_** | **1.9.22** | **1.0.16** | **2.3.6** |
| **_1.11.0_** | **1.9.21** | **1.0.15** | **2.3.6** |
| **_1.10.2_** | **1.9.20** | **1.0.14** | **2.3.6** |
| **_1.10.1_** | **1.9.20** | **1.0.14** | **2.3.4** |
| **_1.10.0_** | **1.9.20** | **1.0.14** | **2.3.4** |


# Installation
Expand Down
4 changes: 2 additions & 2 deletions example/AndroidOnlyExample/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id("org.jetbrains.kotlin.android")
id("com.google.devtools.ksp") version "1.9.23-1.0.20"
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.23"
id("de.jensklingenberg.ktorfit") version "2.0.0-beta1-SNAPSHOT"
id("de.jensklingenberg.ktorfit") version "2.0.0-beta1"
}


Expand Down Expand Up @@ -51,7 +51,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
}
}

val ktorfit = "2.0.0-beta1-SNAPSHOT"
val ktorfit = "2.0.0-beta1"
val ktor = "2.3.10"
val compose_ui_version = "1.5.1"
dependencies {
Expand Down
7 changes: 3 additions & 4 deletions ...ndroidOnlyExample/app/src/main/java/de/jensklingenberg/androidonlyexample/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package de.jensklingenberg.androidonlyexample

import android.os.Bundle
import android.util.Log
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.fillMaxSize
Expand All @@ -12,9 +11,9 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.ui.Modifier
import androidx.lifecycle.lifecycleScope
import de.jensklingenberg.androidonlyexample.ui.theme.AndroidOnlyExampleTheme
import de.jensklingenberg.ktorfit.converter.builtin.CallConverterFactory
import de.jensklingenberg.ktorfit.converter.builtin.FlowConverterFactory
import de.jensklingenberg.ktorfit.converter.builtin.ResponseConverterFactory
import de.jensklingenberg.ktorfit.converter.CallConverterFactory
import de.jensklingenberg.ktorfit.converter.FlowConverterFactory
import de.jensklingenberg.ktorfit.converter.ResponseConverterFactory
import de.jensklingenberg.ktorfit.ktorfit
import io.ktor.client.HttpClient
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
Expand Down
7 changes: 5 additions & 2 deletions example/MultiplatformExample/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ plugins {
id("com.android.library")
id("com.google.devtools.ksp") version "1.9.23-1.0.20"
id("kotlinx-serialization")
id("de.jensklingenberg.ktorfit") version "1.14.0"
id("de.jensklingenberg.ktorfit") version "2.0.0-beta1"
}

version = "1.0"
val ktorVersion = "2.3.10"
val ktorfitVersion = "1.14.0"
val ktorfitVersion = "2.0.0-beta1"

kotlin {
jvmToolchain(8)
Expand Down Expand Up @@ -41,6 +41,9 @@ kotlin {
implementation("de.jensklingenberg.ktorfit:ktorfit-lib:$ktorfitVersion")
//implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:$ktorfitVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
implementation("de.jensklingenberg.ktorfit:ktorfit-converters-response:$ktorfitVersion")
implementation("de.jensklingenberg.ktorfit:ktorfit-converters-call:$ktorfitVersion")
implementation("de.jensklingenberg.ktorfit:ktorfit-converters-flow:$ktorfitVersion")

//Only needed when you want to use Kotlin Serialization
implementation("io.ktor:ktor-client-serialization:$ktorVersion")
Expand Down
5 changes: 3 additions & 2 deletions ...ple/MultiplatformExample/shared/src/commonMain/kotlin/com/example/ktorfittest/Greeting.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.example.ktorfittest

import de.jensklingenberg.ktorfit.converter.builtin.CallConverterFactory
import de.jensklingenberg.ktorfit.converter.builtin.FlowConverterFactory

import de.jensklingenberg.ktorfit.converter.CallConverterFactory
import de.jensklingenberg.ktorfit.converter.FlowConverterFactory
import de.jensklingenberg.ktorfit.ktorfit
import io.ktor.client.HttpClient
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ kctfork = "0.4.1"
kotlin = "2.0.0-RC1"
kotlinPoet = "1.16.0"
kspVersion = "2.0.0-RC1-1.0.20"
ktorfit = "2.0.0-beta1-SNAPSHOT"
ktorfit = "2.0.0-beta1"
ktorfitGradlePlugin = "1.14.0"
ktorVersion = "2.3.10"
mockk = "1.13.8"
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -47,7 +47,7 @@ internal class KtorfitCompilerSubPlugin : KotlinCompilerPluginSupportPlugin {
return SubpluginArtifact(
groupId = SERIALIZATION_GROUP_NAME,
artifactId = ARTIFACT_NAME,
version = "2.0.0-beta1-SNAPSHOT" // remember to bump this version before any release!
version = "2.0.0-beta1" // remember to bump this version before any release!
)
}
}
2 changes: 1 addition & 1 deletion mkdocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extra:
site:
images: '../../images'
ktorfit:
release: "1.14.0"
release: "2.0.0-beta1"
ktor:
release: "2.3.10"
social:
Expand Down
Loading