Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update koin to v3.5.6 #60

Merged
merged 4 commits into from
Sep 28, 2024
Merged

Update koin to v3.5.6 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9ef1bb
Update koin to v3.5.6
renovate[bot] Sep 28, 2024
87f9e7f
Update yarn.lock
subroh0508 Sep 28, 2024
608b5f5
Update Kotlin -> 2.0.10
subroh0508 Sep 28, 2024
9b5a7b6
Fix
subroh0508 Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/web-build-and-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
with:
distribution: zulu
java-version: 17
- run: './gradlew :web:app:jsBrowserProductionWebpack --stacktrace'
- run: './gradlew :web:app:jsBrowserDistribution --stacktrace'
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
Expand Down
1 change: 1 addition & 0 deletions android/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
id("android-application")
alias(libs.plugins.kotlin.android)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.google.services)
}

Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.kotlin.mpp) apply false
alias(libs.plugins.jetbrains.compose) apply false
alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.kotlinx.serialization) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.android.application) apply false
Expand Down
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[versions]
kotlin = "1.9.24"
compose = "1.7.0-dev1686"
kotlin = "2.0.10"
compose = "1.7.0-alpha03"

agp = "8.6.1"
google-services-plugin = "4.4.2"

kotlinx-coroutines = "1.6.4"
kotlinx-serialization = "1.4.1"
kotlinx-coroutines = "1.8.1"
kotlinx-serialization = "1.7.1"

ktor = "2.1.3"
ktor = "2.3.12"

decompose = "1.0.0"

koin = "3.2.2"
koin = "3.5.6"

androidx-core = "1.13.1"
androidx-annotation = "1.8.2"
Expand All @@ -28,7 +28,7 @@ okhttp3 = "4.9.3"
kotlin-wrappers = "1.0.0-pre.426"

mockk = "1.13.2"
kotest = "5.5.4"
kotest = "5.9.1"

npm-firebase = "8.7.1"
npm-material-component-web = "^14.0.0"
Expand All @@ -39,7 +39,7 @@ npm-i18next-http-backend = "^2.0.1"
kotlin-mpp = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose" }
# compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
Expand Down
891 changes: 613 additions & 278 deletions kotlin-js-store/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions shared/components/core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id("shared")
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}

kotlin {
Expand Down
1 change: 1 addition & 0 deletions shared/features/home/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id("shared-features")
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}

kotlin {
Expand Down
1 change: 1 addition & 0 deletions shared/features/myidols/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id("shared-features")
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}

kotlin {
Expand Down
1 change: 1 addition & 0 deletions shared/features/preview/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id("shared-features")
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}

kotlin {
Expand Down
1 change: 1 addition & 0 deletions shared/features/search/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id("shared-features")
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}

kotlin {
Expand Down
8 changes: 5 additions & 3 deletions web/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
plugins {
alias(libs.plugins.kotlin.mpp)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}

kotlin {
Expand Down Expand Up @@ -75,7 +76,7 @@ kotlin {
}
}

val jsBrowserWebpack = tasks.getByName("jsBrowserProductionWebpack")
val jsBrowserDistribution = tasks.getByName("jsBrowserDistribution")

val copyDistributions by tasks.registering {
doLast {
Expand All @@ -84,11 +85,12 @@ val copyDistributions by tasks.registering {
if (!destinationDir.exists()) {
destinationDir.mkdir()
}
val distributions = File("$buildDir/dist/js/productionExecutable")
val distributions =
File("${layout.buildDirectory.asFile.get().absoluteFile}/dist/js/productionExecutable/")
from(distributions)
into(destinationDir)
}
}
}

jsBrowserWebpack.finalizedBy(copyDistributions)
jsBrowserDistribution.finalizedBy(copyDistributions)
1 change: 1 addition & 0 deletions web/catalog/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
plugins {
alias(libs.plugins.kotlin.mpp)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}

kotlin {
Expand Down
1 change: 1 addition & 0 deletions web/material/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.kotlin.mpp)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}

kotlin {
Expand Down