Skip to content

Commit

Permalink
v1.2.0 (#264)
Browse files Browse the repository at this point in the history
* (release) v1.2.0
  • Loading branch information
Foso authored May 5, 2023
1 parent a0fecf1 commit dd4bb5b
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: gradle/gradle-build-action@v2

- name: Publish release
run: ./gradlew clean :ktorfit-annotations:publishAllPublicationsToMavenCentralRepository :ktorfit-ksp:publishAllPublicationsToMavenCentralRepository :ktorfit-lib:publishAllPublicationsToMavenCentralRepository :compiler-plugin:publishAllPublicationsToMavenCentralRepository
run: ./gradlew clean :ktorfit-annotations:publishAllPublicationsToMavenCentralRepository :ktorfit-ksp:publishAllPublicationsToMavenCentralRepository :ktorfit-lib:publishAllPublicationsToMavenCentralRepository :ktorfit-lib-common:publishAllPublicationsToMavenCentralRepository :compiler-plugin:publishAllPublicationsToMavenCentralRepository
env:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ Please see the documentation at [https://foso.github.io/Ktorfit/](https://foso.g

## Compatibility

The latest version of the library uses Kotlin version `1.8.20`.

| Version | Kotlin | KSP | Ktor |
|---------------|:----------:|:----------:|:----------:|
| **_latest_** | **1.8.20** | **1.0.10** | **2.2.4** |
| Version | Kotlin | KSP | Ktor |
|--------------|:----------:|:----------:|:---------:|
| **_latest_** | **1.8.20** | **1.0.10** | **2.3.0** |
| **_1.1.0_** | **1.8.20** | **1.0.10** | **2.2.4** |

## 👷 Project Structure
* <kbd>compiler plugin</kbd> - module with source for the compiler plugin
Expand Down
18 changes: 18 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Bumped

1.2.0 - 2023-05-05
========================================

### Added

### Changed

### Deprecated

### Removed

### Fixed

### Security

### Bumped
Now based on Ktor 2.3.0

1.1.0 - 2023-04-15
========================================

Expand Down
8 changes: 4 additions & 4 deletions example/AndroidOnlyExample/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
id ("de.jensklingenberg.ktorfit") version "1.0.0"

}
val ktorfit = "1.1.0"
val ktorfit = "1.2.0"

configure<de.jensklingenberg.ktorfit.gradle.KtorfitGradleConfiguration> {
version = ktorfit
Expand Down Expand Up @@ -54,8 +54,8 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
jvmTarget = "1.8"
}
}
val ktor = "2.2.4"
val compose_ui_version = "1.4.2"
val ktor = "2.3.0"
val compose_ui_version = "1.4.3"
dependencies {
ksp("de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfit")
implementation("de.jensklingenberg.ktorfit:ktorfit-lib:$ktorfit")
Expand All @@ -65,7 +65,7 @@ dependencies {
implementation ("androidx.activity:activity-compose:1.7.1")
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.2")
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")
Expand Down
4 changes: 2 additions & 2 deletions example/AndroidOnlyExample/build.gradle
Original file line number Diff line number Diff line change
@@ -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 '8.0.0' apply false
id 'com.android.library' version '8.0.0' apply false
id 'com.android.application' version '8.0.0-alpha09' apply false
id 'com.android.library' version '8.0.0-alpha09' apply false
id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
}
2 changes: 1 addition & 1 deletion example/MultiplatformExample/androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ android {

dependencies {
implementation(project(":shared"))
implementation("com.google.android.material:material:1.8.0")
implementation("com.google.android.material:material:1.9.0")
implementation("androidx.appcompat:appcompat:1.6.1")
}
5 changes: 2 additions & 3 deletions example/MultiplatformExample/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ kotlin.code.style=official
#Android
android.useAndroidX=true
#MPP
kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.native.enableDependencyPropagation=false
kotlin.mpp.enableCInteropCommonization=true
kotlin.native.binary.memoryModel=experimental
kotlin.native.binary.memoryModel=experimental
kotlin.mpp.androidSourceSetLayoutVersion=2
5 changes: 2 additions & 3 deletions example/MultiplatformExample/shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ plugins {
}

version = "1.0"
val ktorVersion = "2.2.4"
val ktorfitVersion = "1.1.0"
val ktorVersion = "2.3.0"
val ktorfitVersion = "1.2.0"

configure<de.jensklingenberg.ktorfit.gradle.KtorfitGradleConfiguration> {
version = ktorfitVersion
Expand Down Expand Up @@ -83,7 +83,6 @@ kotlin {

}
}
val androidTest by getting
val iosX64Main by getting
val iosArm64Main by getting
val iosSimulatorArm64Main by getting
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kctfork = "0.2.1"
kotlin = "1.8.20"
kotlinPoet = "1.13.1"
kspVersion = "1.8.20-1.0.10"
ktorfit = "1.1.0"
ktorfit = "1.2.0"
ktorfit-lib = "1.1.0"
ktorVersion = "2.3.0"
dokkaVersion = "1.8.10"
Expand Down
4 changes: 1 addition & 3 deletions ktorfit-lib-common/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
kotlin("multiplatform")
id("kotlinx-serialization")
id("maven-publish")
id("signing")
id("com.vanniktech.maven.publish")
Expand All @@ -21,7 +20,7 @@ detekt {
config = files("../detekt-config.yml")
buildUponDefaultConfig = false
}
val light = false

val enableSigning = project.hasProperty("ORG_GRADLE_PROJECT_signingInMemoryKey")

mavenPublishing {
Expand Down Expand Up @@ -80,7 +79,6 @@ kotlin {
dependencies {
api(projects.ktorfitAnnotations)
api(libs.ktor.client.core)
implementation(libs.kotlinx.coroutines.core)
}
}
val linuxX64Main by getting {
Expand Down
1 change: 0 additions & 1 deletion ktorfit-lib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
// api(projects.ktorfitAnnotations)
api(projects.ktorfitLibCommon)
}
}
Expand Down
4 changes: 2 additions & 2 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ extra:
site:
images: '../../images'
ktorfit:
release: "1.1.0"
release: "1.2.0"
ktor:
release: "2.2.4"
release: "2.3.0"
social:
- icon: fontawesome/brands/github-alt
link: 'https://github.com/foso'
Expand Down
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ include(":ktorfit-lib-common")
include(":ktorfit-lib")
include(":ktorfit-annotations")

//./gradlew clean :ktorfit-annotations:publishToMavenLocal :ktorfit-ksp:publishToMavenLocal :ktorfit-lib:publishToMavenLocal :ktorfit-lib-common:publishToMavenLocal :compiler-plugin:publishToMavenLocal

0 comments on commit dd4bb5b

Please sign in to comment.