From f6be89cedbac356332cae10b6dcf07091f710832 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 25 Jun 2023 20:26:33 +0200 Subject: [PATCH] (release) v1.4.2 (#352) * (release) v1.4.2 --- docs/CHANGELOG.md | 12 ++++ .../AndroidOnlyExample/app/build.gradle.kts | 64 +++++++++---------- example/AndroidOnlyExample/build.gradle | 2 +- example/MultiplatformExample/build.gradle.kts | 4 +- .../shared/build.gradle.kts | 4 +- gradle/libs.versions.toml | 8 +-- mkdocs.yml | 2 +- 7 files changed, 54 insertions(+), 42 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 24d10a7e0..7dc6f7f83 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -16,6 +16,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Security +1.4.2 - 2023-06-25 +======================================== + +### Added +### Changed +### Deprecated +### Removed +### Fixed +#323 Code generation issue for @Multipart / @FormUrlEncoded by @Ph1ll1pp + +### Security + 1.4.1 - 2023-06-03 ======================================== diff --git a/example/AndroidOnlyExample/app/build.gradle.kts b/example/AndroidOnlyExample/app/build.gradle.kts index 067b3b349..9133ab7e1 100644 --- a/example/AndroidOnlyExample/app/build.gradle.kts +++ b/example/AndroidOnlyExample/app/build.gradle.kts @@ -1,51 +1,51 @@ plugins { - id ("com.android.application") - id ("org.jetbrains.kotlin.android") - id ("com.google.devtools.ksp") version "1.8.22-1.0.11" - id ("org.jetbrains.kotlin.plugin.serialization") version "1.8.22" - id ("de.jensklingenberg.ktorfit") version "1.0.0" + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("com.google.devtools.ksp") version "1.8.21-1.0.11" + id("org.jetbrains.kotlin.plugin.serialization") version "1.8.21" + id("de.jensklingenberg.ktorfit") version "1.0.0" } -val ktorfit = "1.4.1" +val ktorfit = "1.4.2" configure { version = ktorfit } android { - namespace= "de.jensklingenberg.androidonlyexample" - compileSdk= 33 + namespace = "de.jensklingenberg.androidonlyexample" + compileSdk = 33 defaultConfig { - applicationId= ("de.jensklingenberg.androidonlyexample") - minSdk= 21 - targetSdk =33 - versionCode= 1 - versionName= "1.0" + applicationId = ("de.jensklingenberg.androidonlyexample") + minSdk = 21 + targetSdk = 33 + versionCode = 1 + versionName = "1.0" - testInstrumentationRunner= "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { - useSupportLibrary= true + useSupportLibrary = true } } buildTypes { release { //minifyEnabled=( false) - // proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + // proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } compileOptions { - sourceCompatibility (JavaVersion.VERSION_1_8) - targetCompatibility (JavaVersion.VERSION_1_8) + sourceCompatibility(JavaVersion.VERSION_1_8) + targetCompatibility(JavaVersion.VERSION_1_8) } kotlinOptions { jvmTarget = "1.8" } buildFeatures { - compose= (true) + compose = (true) } composeOptions { - kotlinCompilerExtensionVersion= "1.4.7" + kotlinCompilerExtensionVersion = "1.4.7" } } @@ -60,18 +60,18 @@ dependencies { ksp("de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfit") implementation("de.jensklingenberg.ktorfit:ktorfit-lib:$ktorfit") - implementation ("androidx.core:core-ktx:1.10.1") - implementation ("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") - implementation ("androidx.activity:activity-compose:1.7.2") - implementation ("androidx.compose.ui:ui:$compose_ui_version") - implementation ("androidx.compose.ui:ui-tooling-preview:$compose_ui_version") - implementation ("androidx.compose.material:material:1.4.3") - testImplementation ("junit:junit:4.13.2") - androidTestImplementation ("androidx.test.ext:junit:1.1.5") - androidTestImplementation ("androidx.test.espresso:espresso-core:3.5.1") - androidTestImplementation ("androidx.compose.ui:ui-test-junit4:$compose_ui_version") - debugImplementation ("androidx.compose.ui:ui-tooling:$compose_ui_version") - debugImplementation ("androidx.compose.ui:ui-test-manifest:$compose_ui_version") + implementation("androidx.core:core-ktx:1.10.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") + implementation("androidx.activity:activity-compose:1.7.2") + implementation("androidx.compose.ui:ui:$compose_ui_version") + implementation("androidx.compose.ui:ui-tooling-preview:$compose_ui_version") + implementation("androidx.compose.material:material:1.4.3") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation("androidx.compose.ui:ui-test-junit4:$compose_ui_version") + debugImplementation("androidx.compose.ui:ui-tooling:$compose_ui_version") + debugImplementation("androidx.compose.ui:ui-test-manifest:$compose_ui_version") implementation("io.ktor:ktor-client-serialization:$ktor") implementation("io.ktor:ktor-client-content-negotiation:$ktor") implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor") diff --git a/example/AndroidOnlyExample/build.gradle b/example/AndroidOnlyExample/build.gradle index 2b3ae7380..46cc1142b 100644 --- a/example/AndroidOnlyExample/build.gradle +++ b/example/AndroidOnlyExample/build.gradle @@ -2,5 +2,5 @@ plugins { id 'com.android.application' version '8.0.2' apply false id 'com.android.library' version '8.0.2' apply false - id 'org.jetbrains.kotlin.android' version '1.8.22' apply false + id 'org.jetbrains.kotlin.android' version '1.8.21' apply false } \ No newline at end of file diff --git a/example/MultiplatformExample/build.gradle.kts b/example/MultiplatformExample/build.gradle.kts index ef86f3545..1ffe1cd79 100644 --- a/example/MultiplatformExample/build.gradle.kts +++ b/example/MultiplatformExample/build.gradle.kts @@ -6,9 +6,9 @@ buildscript { mavenCentral() } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21") classpath("com.android.tools.build:gradle:7.3.1") - classpath("org.jetbrains.kotlin:kotlin-serialization:1.8.22") + classpath("org.jetbrains.kotlin:kotlin-serialization:1.8.21") } } diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts index 014a2b562..ad5d7323d 100644 --- a/example/MultiplatformExample/shared/build.gradle.kts +++ b/example/MultiplatformExample/shared/build.gradle.kts @@ -2,14 +2,14 @@ plugins { kotlin("multiplatform") kotlin("native.cocoapods") id("com.android.library") - id("com.google.devtools.ksp") version "1.8.22-1.0.11" + id("com.google.devtools.ksp") version "1.8.21-1.0.11" id("kotlinx-serialization") id("de.jensklingenberg.ktorfit") version "1.0.0" } version = "1.0" val ktorVersion = "2.3.1" -val ktorfitVersion = "1.4.1" +val ktorfitVersion = "1.4.2" configure { version = ktorfitVersion diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 913c60e70..0a7273f56 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,11 +3,11 @@ autoService = "1.1.1" coroutines = "1.6.4" detekt = "1.23.0" kctfork = "0.2.1" -kotlin = "1.8.21" +kotlin = "1.8.22" kotlinPoet = "1.14.2" -kspVersion = "1.8.21-1.0.11" -ktorfit = "1.4.1" -ktorfit-lib = "1.4.1" +kspVersion = "1.8.22-1.0.11" +ktorfit = "1.4.2" +ktorfit-lib = "1.4.2" ktorVersion = "2.3.1" dokkaVersion = "1.8.20" gradleMavenPublishPlugin = "0.24.0" diff --git a/mkdocs.yml b/mkdocs.yml index 9dcab5030..5194794fb 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -13,7 +13,7 @@ extra: site: images: '../../images' ktorfit: - release: "1.4.1" + release: "1.4.2" ktor: release: "2.3.1" social: