Skip to content

Commit d97867e

Browse files
committed
1.4.51 Bug fix
1 parent 57c22e2 commit d97867e

File tree

10 files changed

+17
-11
lines changed

10 files changed

+17
-11
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Kotlin Simple Architecture
22
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
33
[![Download](https://api.bintray.com/packages/hyun/kotlin-simple-architecture/kotlin-simple-architecture-client/images/download.svg) ](https://bintray.com/hyun/kotlin-simple-architecture/kotlin-simple-architecture-client/_latestVersion)
4-
4+
![kotlin-version](https://img.shields.io/badge/kotlin-1.4.21-orange)
55
Kotlin Simple Architecture is a library for simple and easy development in Kotlin Multiplatform
66

7-
# Index
7+
# Table of Contents
88
- [Features](https://github.com/dss99911/kotlin-simple-architecture#features)
99
- [Dependency](https://github.com/dss99911/kotlin-simple-architecture#dependency)
1010
- [Introduction](https://github.com/dss99911/kotlin-simple-architecture#introduction)

api/plugin/kotlin-simple-api-gradle-service-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/generator/ApiGenerator.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ class ApiGenerator(
243243
import io.ktor.client.HttpClient
244244
import kim.jeonghyeon.net.*
245245
246-
expect inline fun <reified T> HttpClient.create${pluginOptions.postFix.capitalize()}(baseUrl: String, requestResponseAdapter: RequestResponseAdapter? = SimpleApiCustom.run { client.getAdapter() }): T
246+
expect inline fun <reified T> HttpClient.create${pluginOptions.postFix.capitalize()}(baseUrl: String, requestResponseAdapter: RequestResponseAdapter? = SimpleApiCustom.run { getAdapter() }): T
247247
248248
""".trimIndent()
249249
)
@@ -272,7 +272,7 @@ class ApiGenerator(
272272
|${joinToString("\n") { "import ${if (it.packageName.isEmpty()) "" else "${it.packageName}."}${it.name}" }}
273273
|${joinToString("\n") { "import ${if (it.packageName.isEmpty()) "" else "${it.packageName}."}${it.name}Impl" }}
274274
|
275-
|${if (pluginOptions.isMultiplatform) "actual " else ""}inline fun <reified T> HttpClient.create${pluginOptions.postFix.capitalize()}(baseUrl: String, requestResponseAdapter: RequestResponseAdapter?${if (pluginOptions.isMultiplatform) "" else " = SimpleApiCustom.run { client.getAdapter() }"}): T {
275+
|${if (pluginOptions.isMultiplatform) "actual " else ""}inline fun <reified T> HttpClient.create${pluginOptions.postFix.capitalize()}(baseUrl: String, requestResponseAdapter: RequestResponseAdapter?${if (pluginOptions.isMultiplatform) "" else " = SimpleApiCustom.run { getAdapter() }"}): T {
276276
|
277277
| return when (T::class) {
278278
|${joinToString("\n") { "${it.name}::class -> ${it.name}Impl(this, baseUrl, requestResponseAdapter) as T" }.prependIndent(" ")}

buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ object deps {
8282
const val uiTest = "androidx.compose.ui:ui-test-junit4:${versions.android.compose}"
8383
}
8484

85-
85+
object accompanist {
86+
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:${versions.android.accompanist}"
87+
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:${versions.android.accompanist}"
88+
}
8689
}
8790

8891
object simpleArch {

buildSrc/src/main/kotlin/DependencyVersion.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
object versions {
2-
const val simpleArch = "1.4.5"
2+
const val simpleArch = "1.4.51"
33

44
object kotlin {
55
const val version = "1.4.21"
@@ -14,6 +14,7 @@ object versions {
1414
const val xTest = "1.2.0"
1515
const val material = "1.1.0"
1616
const val compose = "1.0.0-alpha08"
17+
const val accompanist = "0.4.1"
1718
}
1819

1920
const val shadow = "5.1.0"

framework/kotlin-simple-architecture-client/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ kotlin {
9898

9999
api(deps.sqldelight.android)
100100
api(deps.android.timber)
101+
api(deps.android.accompanist.coil)
102+
api(deps.android.accompanist.insets)
101103
}
102104
}
103105

initializer/android-backend-api-only/buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
object versions {
2-
const val simpleArch = "1.4.5"
2+
const val simpleArch = "1.4.51"
33

44
object kotlin {
55
const val version = "1.4.20"

initializer/android-ios-backend/buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
object versions {
2-
const val simpleArch = "1.4.5"
2+
const val simpleArch = "1.4.51"
33

44
object kotlin {
55
const val version = "1.4.20"

initializer/android-ios/buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
object versions {
2-
const val simpleArch = "1.4.5"
2+
const val simpleArch = "1.4.51"
33

44
object kotlin {
55
const val version = "1.4.20"

initializer/android/buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
object versions {
2-
const val simpleArch = "1.4.5"
2+
const val simpleArch = "1.4.51"
33

44
object kotlin {
55
const val version = "1.4.20"

sample/buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
object versions {
2-
const val simpleArch = "1.4.5"
2+
const val simpleArch = "1.4.51"
33

44
object kotlin {
55
const val version = "1.4.20"

0 commit comments

Comments
 (0)