Skip to content

Commit 2416259

Browse files
committed
bump dependencies and prepare snapshot release
1 parent 8658968 commit 2416259

10 files changed

Lines changed: 32 additions & 50 deletions

File tree

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ plugins {
1313
alias(libs.plugins.ksp) apply false
1414
alias(libs.plugins.ktorfit) apply false
1515
alias(libs.plugins.multiplatform) apply false
16-
alias(libs.plugins.native.coroutines) apply false
1716
alias(libs.plugins.serialization) apply false
1817
alias(libs.plugins.vanniktech.publish) apply false
1918
alias(libs.plugins.versions)

buildSrc/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,3 @@ plugins {
55
`kotlin-dsl`
66
`kotlin-dsl-precompiled-script-plugins`
77
}
8-
9-
kotlin {
10-
jvmToolchain(17)
11-
}
12-

compiler-plugin/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import com.vanniktech.maven.publish.SonatypeHost
2-
31
plugins {
42
kotlin("jvm")
53
kotlin("kapt")
@@ -33,7 +31,7 @@ dependencies {
3331
}
3432

3533
mavenPublishing {
36-
publishToMavenCentral(host = SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
34+
publishToMavenCentral(automaticRelease = true)
3735
signAllPublications()
3836

3937
coordinates(

compose/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import com.vanniktech.maven.publish.SonatypeHost
21
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
32
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
43

@@ -88,7 +87,7 @@ android {
8887
}
8988

9089
mavenPublishing {
91-
publishToMavenCentral(host = SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
90+
publishToMavenCentral(automaticRelease = true)
9291
signAllPublications()
9392

9493
coordinates(

core/Tolgee.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = 'Tolgee'
3-
spec.version = '1.0.0-alpha01'
3+
spec.version = '1.0.0-SNAPSHOT'
44
spec.homepage = 'https://github.com/tolgee/tolgee-mobile-kotlin-sdk'
55
spec.source = { :http=> ''}
66
spec.authors = ''

core/build.gradle.kts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import com.vanniktech.maven.publish.SonatypeHost
21
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
32
import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework
43

54
plugins {
65
alias(libs.plugins.android.library)
76
alias(libs.plugins.atomicfu)
87
alias(libs.plugins.multiplatform)
9-
alias(libs.plugins.native.coroutines)
108
alias(libs.plugins.cocoapods)
119
alias(libs.plugins.dokka)
1210
alias(libs.plugins.serialization)
@@ -32,10 +30,6 @@ dokka {
3230
}
3331
}
3432

35-
nativeCoroutines {
36-
k2Mode = true
37-
}
38-
3933
kotlin {
4034
androidTarget {
4135
publishAllLibraryVariants()
@@ -197,12 +191,14 @@ kotlin {
197191
api(libs.i18n4k)
198192
implementation(libs.i18n4k.plural)
199193
implementation(libs.datetime)
194+
implementation(libs.coroutines)
200195
}
201196

202197
androidMain.dependencies {
203198
implementation(libs.android)
204199

205200
implementation(libs.ktor.android)
201+
implementation(libs.coroutines.android)
206202
}
207203

208204
jvmMain.dependencies {
@@ -246,7 +242,7 @@ android {
246242
}
247243

248244
mavenPublishing {
249-
publishToMavenCentral(host = SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
245+
publishToMavenCentral(automaticRelease = true)
250246
signAllPublications()
251247

252248
coordinates(

core/src/commonMain/kotlin/io/tolgee/Tolgee.kt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.tolgee
22

3-
import com.rickclephas.kmp.nativecoroutines.NativeCoroutines
43
import de.comahe.i18n4k.Locale
54
import de.comahe.i18n4k.forLocaleTag
65
import de.comahe.i18n4k.language
@@ -18,6 +17,7 @@ import io.tolgee.model.TolgeeMessageParams
1817
import io.tolgee.model.TolgeeTranslation
1918
import io.tolgee.storage.TolgeeStorageProvider
2019
import kotlinx.atomicfu.atomic
20+
import kotlinx.coroutines.Dispatchers
2121
import kotlinx.coroutines.ExperimentalCoroutinesApi
2222
import kotlinx.coroutines.flow.Flow
2323
import kotlinx.coroutines.flow.MutableSharedFlow
@@ -165,8 +165,10 @@ open class Tolgee(
165165
).also {
166166
cachedTranslation.value = it
167167
changeFlow.emit(Unit)
168-
changeListeners.forEach { listener ->
169-
listener.onTranslationsChanged()
168+
withContext(Dispatchers.Main) {
169+
changeListeners.forEach { listener ->
170+
listener.onTranslationsChanged()
171+
}
170172
}
171173
}
172174
}
@@ -198,7 +200,6 @@ open class Tolgee(
198200
*/
199201
@JvmOverloads
200202
@OptIn(ExperimentalCoroutinesApi::class)
201-
@NativeCoroutines
202203
open fun tFlow(
203204
key: String,
204205
parameters: TolgeeMessageParams = TolgeeMessageParams.None
@@ -211,7 +212,6 @@ open class Tolgee(
211212
}.filterNotNull()
212213

213214
@OptIn(ExperimentalCoroutinesApi::class)
214-
@NativeCoroutines
215215
open fun tArrayFlow(
216216
key: String
217217
): Flow<List<String>> = localeFlow.mapLatest { locale ->
@@ -261,7 +261,6 @@ open class Tolgee(
261261
* This method is coroutine-safe and utilizes structured concurrency to manage asynchronous
262262
* operations.
263263
*/
264-
@NativeCoroutines
265264
open suspend fun preload() {
266265
suspendCatching { loadTranslations() }
267266
}
@@ -745,7 +744,7 @@ open class Tolgee(
745744
* Used for tracking plugin/integration usage.
746745
*/
747746
internal const val TYPE_HEADER = "Compose Multiplatform"
748-
internal const val VERSION_HEADER = "1.0.0-alpha01"
747+
internal const val VERSION_HEADER = "1.0.0-SNAPSHOT"
749748

750749
/**
751750
* Provides the locale of the system where the application is running.

gradle-plugin/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import com.vanniktech.maven.publish.SonatypeHost
2-
31
plugins {
42
`kotlin-dsl`
53
kotlin("jvm")
@@ -70,7 +68,7 @@ gradlePlugin {
7068
}
7169

7270
mavenPublishing {
73-
publishToMavenCentral(host = SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
71+
publishToMavenCentral(automaticRelease = true)
7472
signAllPublications()
7573

7674
coordinates(

gradle-plugin/src/main/java/io/tolgee/TolgeePlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ open class TolgeePlugin : Plugin<Project> {
1313

1414
companion object {
1515
// Separate variable so it can easily be replaced by sed in CI/CD
16-
private const val PACKAGE_VERSION = "1.0.0-alpha01"
16+
private const val PACKAGE_VERSION = "1.0.0-SNAPSHOT"
1717

1818
val version: String
1919
get() = this::class.java.`package`?.implementationVersion?.ifBlank { null }

gradle/libs.versions.toml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,33 @@
33
# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
44

55
[versions]
6-
library = "1.0.0-alpha01"
6+
library = "1.0.0-SNAPSHOT"
77
activity = "1.10.1"
88
android-core = "1.16.0"
9-
android-tools = "8.10.1"
10-
atomicfu = "0.27.0"
9+
android-tools = "8.12.0"
10+
atomicfu = "0.29.0"
1111
auto-service = "1.1.1"
12-
binary-compatibility = "0.17.0"
13-
compose = "1.7.3"
12+
binary-compatibility = "0.18.1"
13+
compose = "1.8.2"
1414
coroutines = "1.10.2"
15-
datetime = "0.6.2"
15+
datetime = "0.7.1"
1616
dokka = "2.0.0"
17-
i18n4k = "0.10.0"
18-
immutable = "0.3.8"
19-
kaml = "0.77.1"
20-
kctfork = "0.7.0"
17+
i18n4k = "0.11.0"
18+
immutable = "0.4.0"
19+
kaml = "0.85.0"
20+
kctfork = "0.8.0"
2121
kommand = "2.3.0"
22-
kotlin = "2.1.20"
23-
ksp = "2.1.20-2.0.1"
24-
ktor = "3.1.3"
25-
ktorfit = "2.5.1"
26-
native-coroutines = "1.0.0-ALPHA-42"
27-
publish = "0.31.0"
22+
kotlin = "2.2.0"
23+
ksp = "2.2.0-2.0.2"
24+
ktor = "3.2.3"
25+
ktorfit = "2.6.4"
26+
publish = "0.34.0"
2827
semver = "3.0.0"
29-
serialization = "1.8.1"
28+
serialization = "1.9.0"
3029
tooling = "1.7.0"
3130
versions = "0.52.0"
32-
lifecycle-runtime-ktx = "2.6.1"
33-
compose-bom = "2024.09.00"
31+
lifecycle-runtime-ktx = "2.9.2"
32+
compose-bom = "2025.07.00"
3433

3534
[libraries]
3635
activity = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity" }
@@ -86,7 +85,6 @@ dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
8685
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
8786
ktorfit = { id = "de.jensklingenberg.ktorfit", version.ref = "ktorfit" }
8887
multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
89-
native-coroutines = { id = "com.rickclephas.kmp.nativecoroutines", version.ref = "native-coroutines" }
9088
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
9189
vanniktech-publish = { id = "com.vanniktech.maven.publish", version.ref = "publish" }
9290
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }

0 commit comments

Comments
 (0)