Skip to content

Commit 857bcf3

Browse files
committed
1.3.1 remove fixed codes
1 parent f6a52e6 commit 857bcf3

File tree

22 files changed

+5
-133
lines changed

22 files changed

+5
-133
lines changed

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,7 @@ scope.launch {
128128
- Retry on Error
129129
- `Resource` contains `retry()`
130130
- Default error ui(snackbar) shows retry button and user can retry by the button without additional implementation
131-
- This provides common functions on ViewModel and Screen
132-
- `goBack()` : You can return response, it's explained on [Navigate to the deeplink from Client / Server](https://github.com/dss99911/kotlin-simple-architecture#navigate-to-the-deeplink-from-client--server)
133-
- `navigateToDeeplink()`
131+
- This provides common functions on ViewModel
134132
- `loadInIdle()` : For example, in case of clicking button two times quickly. 2nd time click is ignored.
135133
- `loadBounce()` : For example, searching with keyword. and if searching takes time(like api call is required), in that case, delay the api call and if next input comes, cancel previous call
136134

buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ object deps {
102102
val pluginApiNative = depSimpleArchitecture("gradle-plugin-api-native", versions.simpleArch)
103103
val pluginGradle = depSimpleArchitecture("gradle-plugin", versions.simpleArch)
104104
val annotation = depSimpleArchitecture("annotation", versions.simpleArch)
105-
val annotationJvm = depSimpleArchitecture("annotation-jvm", versions.simpleArch)
106105
}
107106

108107
object plugin {

buildSrc/src/main/kotlin/DependencyVersion.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.3.0"
2+
const val simpleArch = "1.3.1"
33

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

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ dependencies {
2121
compileOnly(deps.plugin.compilerEmbeddable)
2222
compileOnly(deps.plugin.auto)
2323
kapt(deps.plugin.auto)
24-
// todo this is not working as it's multiplatform. check the reason and solve
25-
// api(deps.simpleArch.annotationJvm)
24+
api(deps.simpleArch.annotation)
2625
}
2726

2827
publishJvm()

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/Api.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/ApiParameterType.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/Authenticate.kt

Lines changed: 0 additions & 12 deletions
This file was deleted.

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/Body.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/Delete.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/Get.kt

Lines changed: 0 additions & 12 deletions
This file was deleted.

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/Head.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/Header.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/Options.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/Patch.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/Path.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/Post.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/Put.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

gradle-plugin/kotlin-simple-architecture-gradle-plugin-api-shared/src/main/kotlin/kim/jeonghyeon/simplearchitecture/plugin/external/Query.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins {
2-
id("com.android.library")
32
kotlin("multiplatform")
43
}
54

@@ -11,23 +10,9 @@ kotlin {
1110

1211
//if this multiplatform doesn't include any platform that your project is using, then your project won't recognize this library
1312
jvm()
14-
js().browser()
13+
js()/*.browser()*/
1514

1615
ios()
17-
//todo is this required? try to remove
18-
android {
19-
publishLibraryVariants("release", "debug")
20-
}
21-
}
22-
23-
android {
24-
compileSdkVersion(config.compileSdkVersion)
25-
buildToolsVersion(config.buildToolVersion)
26-
defaultConfig {
27-
minSdkVersion(config.minSdkVersion)
28-
targetSdkVersion(config.targetSdkVersion)
29-
30-
}
3116
}
3217

3318
publishMPP()

kotlin-simple-architecture/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ kotlin {
5555
api(deps.ktor.clientSerialization)
5656
api(deps.ktor.clientLogging)
5757
api(deps.sqldelight.runtime)
58-
//todo this is not working, try after coroutin mt released. https://github.com/cashapp/sqldelight/issues/1917
59-
//api(deps.sqldelight.coroutine)
58+
api(deps.sqldelight.coroutine)
6059
api(deps.simpleArch.annotation)
6160
api(deps.ktor.clientAuth)
6261
api(deps.krypto)

sample/sample-base/build.gradle.kts

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -79,21 +79,7 @@ kotlin {
7979
sourceSets {
8080
val commonMain by getting {
8181
dependencies {
82-
// api(project(":${deps.simpleArch.common.getArtifactId()}"))
8382
api(deps.simpleArch.common)
84-
85-
//todo START there is error on android studio sync. after it's fixed, remove this
86-
// it's working fine on template project. check the difference
87-
// https://kotlinlang.slack.com/archives/C3PQML5NU/p1598833788027800
88-
api(deps.kotlin.coroutineCore)
89-
api(deps.kotlin.serializationCore)
90-
api(deps.ktor.clientCore)
91-
api(deps.ktor.clientSerialization)
92-
api(deps.ktor.clientLogging)
93-
api(deps.sqldelight.runtime)
94-
api(deps.simpleArch.annotation)
95-
api(deps.ktor.clientAuth)
96-
//todo END there is error on android studio sync. after it's fixed, remove this
9783
}
9884
}
9985
//TODO HYUN [multi-platform2] : consider to change to clientMain. as front end also may be included to here
@@ -107,14 +93,6 @@ kotlin {
10793

10894
val iosMain by getting {
10995
dependsOn(mobileMain)
110-
111-
dependencies {
112-
//todo START there is error on android studio sync. after it's fixed, remove this
113-
// https://kotlinlang.slack.com/archives/C3PQML5NU/p1598833788027800
114-
implementation(deps.sqldelight.native)
115-
implementation(deps.ktor.clientIos)
116-
//todo END there is error on android studio sync. after it's fixed, remove this
117-
}
11896
}
11997
}
12098

0 commit comments

Comments
 (0)