Skip to content

Commit

Permalink
(release) v1.4.2 (#352)
Browse files Browse the repository at this point in the history
* (release) v1.4.2
  • Loading branch information
Foso authored Jun 25, 2023
1 parent 4c3d60c commit f6be89c
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 42 deletions.
12 changes: 12 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
========================================

Expand Down
64 changes: 32 additions & 32 deletions example/AndroidOnlyExample/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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<de.jensklingenberg.ktorfit.gradle.KtorfitGradleConfiguration> {
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"
}
}

Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion example/AndroidOnlyExample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
4 changes: 2 additions & 2 deletions example/MultiplatformExample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")

}
}
Expand Down
4 changes: 2 additions & 2 deletions example/MultiplatformExample/shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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<de.jensklingenberg.ktorfit.gradle.KtorfitGradleConfiguration> {
version = ktorfitVersion
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extra:
site:
images: '../../images'
ktorfit:
release: "1.4.1"
release: "1.4.2"
ktor:
release: "2.3.1"
social:
Expand Down

0 comments on commit f6be89c

Please sign in to comment.