Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
9 changes: 9 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,12 @@ plugins {
alias(libs.plugins.kotlinCocoapods).apply(false)
id("com.google.gms.google-services") version "4.4.2" apply false
}

allprojects {
configurations.all {
resolutionStrategy {
force("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
force("org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0")
}
}
}
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[versions]

kotlin = "2.1.0"
agp = "8.6.1"
kotlinx-coroutines = "1.10.1"
agp = "8.13.0"
kotlinx-coroutines = "1.10.2"
kotlinx-serialization = "1.7.3"
ktor = "3.1.1"
compose = "1.7.1"
androidx-activityCompose = "1.9.3"
kotlinx-datetime = "0.6.2"
ktor = "3.3.0"
compose = "1.8.0"
androidx-activityCompose = "1.11.0"
kotlinx-datetime = "0.6.1"

[libraries]

Expand Down
3 changes: 1 addition & 2 deletions jsonBuilderWeb/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ plugins {
kotlin {
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
moduleName = "jsonBuilderWeb"
browser {
val rootDirPath = project.rootDir.path
val projectDirPath = project.projectDir.path
Expand Down Expand Up @@ -64,7 +63,7 @@ tasks.register<Copy>("copyWasmJsToRoot") {
}

println("Copying wasmJs build output to wasmJsDist directory ...")
from("$buildDir/dist/wasmJs/developmentExecutable")
from("${layout.buildDirectory.get().asFile}/dist/wasmJs/developmentExecutable")
into("${project.rootDir}/wasmJsDist")
}

Expand Down
2 changes: 1 addition & 1 deletion samples/firebaseApp/composeApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ kotlin {
androidMain.dependencies {
implementation(libs.androidx.activityCompose)

implementation(platform("com.google.firebase:firebase-bom:33.9.0"))
implementation(project.dependencies.platform("com.google.firebase:firebase-bom:33.9.0"))
implementation("com.google.firebase:firebase-config")
implementation("com.google.firebase:firebase-analytics")
}
Expand Down
3 changes: 3 additions & 0 deletions samples/firebaseApp/iosApp/Podfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
source 'https://cdn.cocoapods.org'

# Uncomment the next line to define a global platform for your project
platform :ios, '17.0'

Expand All @@ -8,6 +10,7 @@ target 'iosApp' do
# Pods for iosApp
pod 'FirebaseAnalytics'
pod 'FirebaseCore'
pod 'FirebaseCoreInternal'
pod 'FirebaseRemoteConfig'
pod 'ComposeAppFirebase', :path => '../composeApp'

Expand Down
3 changes: 1 addition & 2 deletions samples/routerApp/composeApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ kotlin {
jvm()
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
moduleName = "sampleRouterApp"
browser {
val rootDirPath = project.rootDir.path
val projectDirPath = project.projectDir.path
Expand Down Expand Up @@ -106,7 +105,7 @@ tasks.register<Copy>("copyWasmJsToRoot") {
}

println("Copying wasmJs build output to wasmJsDist directory ...")
from("$buildDir/dist/wasmJs/developmentExecutable")
from("${layout.buildDirectory.get().asFile}/dist/wasmJs/developmentExecutable")
into(destFolder)
}

Expand Down
1 change: 0 additions & 1 deletion samples/sharedCompose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ kotlin {
js { browser() }
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
moduleName = "sharedCompose"
browser {
val rootDirPath = project.rootDir.path
val projectDirPath = project.projectDir.path
Expand Down