Skip to content

Commit bc1fb0d

Browse files
05nelsonm05nelsonm
committed
Update dependencies to release versions
1 parent 7b0c238 commit bc1fb0d

File tree

9 files changed

+49
-57
lines changed

9 files changed

+49
-57
lines changed

‎.kotlin-js-store/yarn.lock‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -274,40 +274,40 @@ js-yaml@^4.1.0:
274274
dependencies:
275275
argparse "^2.0.1"
276276

277-
kmp-tor.resource-exec-tor.all@408.16.4-SNAPSHOT.0:
278-
version "408.16.4-SNAPSHOT.0"
279-
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.all/-/kmp-tor.resource-exec-tor.all-408.16.4-SNAPSHOT.0.tgz#a7fd289a7dcdd687a06556b8b0ce0a6110427d63"
280-
integrity sha512-Hcy8KNyGbn9UV3WNjzSmEY9JgsQsUSS/ZPVvqFUCUNiWCVptX0zNKXA/AV1jLfeUc+UfveAPTSVjzO97z3awEQ==
281-
dependencies:
282-
kmp-tor.resource-exec-tor.linux-android "408.16.4-SNAPSHOT.0"
283-
kmp-tor.resource-exec-tor.linux-libc "408.16.4-SNAPSHOT.0"
284-
kmp-tor.resource-exec-tor.macos "408.16.4-SNAPSHOT.0"
285-
kmp-tor.resource-exec-tor.mingw "408.16.4-SNAPSHOT.0"
286-
287-
kmp-tor.resource-exec-tor.linux-android@408.16.4-SNAPSHOT.0:
288-
version "408.16.4-SNAPSHOT.0"
289-
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.linux-android/-/kmp-tor.resource-exec-tor.linux-android-408.16.4-SNAPSHOT.0.tgz#1ba1f18f48f4e38691ee1344ef79094e3fa737b0"
290-
integrity sha512-o4Iyw1gULI2gzfXAv2WlQB+0tqtfgQewueAv84lI7VOieXAnLuCbgrOKcCYXuhqe7JzUDS/4Gcvd6vQ89p9g9g==
291-
292-
kmp-tor.resource-exec-tor.linux-libc@408.16.4-SNAPSHOT.0:
293-
version "408.16.4-SNAPSHOT.0"
294-
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.linux-libc/-/kmp-tor.resource-exec-tor.linux-libc-408.16.4-SNAPSHOT.0.tgz#935d5a2db4b97cd6d44a60d8ce6bed5ff270335f"
295-
integrity sha512-W5AcJpjnYz6LDRZt/YdaOfQNIFAnl03mHQ0etGkWZAU1RdiLzHFigxdnOp1vxR32DjBU9l8k/MzOMjAlDCkZEw==
296-
297-
kmp-tor.resource-exec-tor.macos@408.16.4-SNAPSHOT.0:
298-
version "408.16.4-SNAPSHOT.0"
299-
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.macos/-/kmp-tor.resource-exec-tor.macos-408.16.4-SNAPSHOT.0.tgz#ea76c0686b3440247149b330fa1281b808a73b54"
300-
integrity sha512-Gpyi91qyVjYO61ZfkFglEC2ZV9GNmmBcCv46F7SvF+d3PADVQOv1m91eYEoSmF7wK1KhA6I74YfE5YZ9K+ZVoA==
301-
302-
kmp-tor.resource-exec-tor.mingw@408.16.4-SNAPSHOT.0:
303-
version "408.16.4-SNAPSHOT.0"
304-
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.mingw/-/kmp-tor.resource-exec-tor.mingw-408.16.4-SNAPSHOT.0.tgz#2449dc9b85eac147f3643c887227680333a4b0cb"
305-
integrity sha512-1EO9sHWxQ0c1PktKJiDDWbWAN6b9iTJ82Np1Bbb/3yd1lKEUaZK0LwChgq1OHeARc5LiS10Xg9/YJt/aCbcaeA==
306-
307-
kmp-tor.resource-geoip@408.16.4-SNAPSHOT.0:
308-
version "408.16.4-SNAPSHOT.0"
309-
resolved "https://registry.yarnpkg.com/kmp-tor.resource-geoip/-/kmp-tor.resource-geoip-408.16.4-SNAPSHOT.0.tgz#98c5eac76f41a46891c51eba3fb0275794fe1529"
310-
integrity sha512-nhy2VJB907RGrxOHv+GzxEPzmvDYIEqAWyqHlltDi++NHsxiXgs/aG/t2a7eFZQns2JgGahuPgXGuIgxXprLpA==
277+
kmp-tor.resource-exec-tor.all@408.16.4:
278+
version "408.16.4"
279+
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.all/-/kmp-tor.resource-exec-tor.all-408.16.4.tgz#07bc82b12d93e8d42f0fb0fcc653bb9c38eb1e45"
280+
integrity sha512-OpgOs2V4eCfSsHjWv9zvfAs6X5Faqj7rGuMFTBRA7xJv8I5Zh1XO/uq6yK+fhPOSI6+6BPxlspAXAAi4yOPbZA==
281+
dependencies:
282+
kmp-tor.resource-exec-tor.linux-android "408.16.4"
283+
kmp-tor.resource-exec-tor.linux-libc "408.16.4"
284+
kmp-tor.resource-exec-tor.macos "408.16.4"
285+
kmp-tor.resource-exec-tor.mingw "408.16.4"
286+
287+
kmp-tor.resource-exec-tor.linux-android@408.16.4:
288+
version "408.16.4"
289+
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.linux-android/-/kmp-tor.resource-exec-tor.linux-android-408.16.4.tgz#b2da022942cafd8aa8a486edaf7f455e8f6a231d"
290+
integrity sha512-067ppCwcgUf/g5bbQmUytBOKTJRY6oABHab1BbK8Jr4g1lO76RjxrZfkobghncW7Dx/v+dw8UJQwoDXzNRXjsg==
291+
292+
kmp-tor.resource-exec-tor.linux-libc@408.16.4:
293+
version "408.16.4"
294+
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.linux-libc/-/kmp-tor.resource-exec-tor.linux-libc-408.16.4.tgz#95313918f1db3849049ac692593a35ad28bd5097"
295+
integrity sha512-CsaE5YvZrpQC8hsl9uSKuH1Imjz6R0WVkgLGZNwcEjXZpKx3h0kU8ECu8tjtS/FJ3SkMgaNHTI4tYSekB1bkgw==
296+
297+
kmp-tor.resource-exec-tor.macos@408.16.4:
298+
version "408.16.4"
299+
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.macos/-/kmp-tor.resource-exec-tor.macos-408.16.4.tgz#eb4b4c634a4c30f36a75533d8fd1f461b149851b"
300+
integrity sha512-mUBxHBknKLs0FEGVDKGQNqdRB4rRdrp6ruknzWZ8chz61fvW9Vv/oaJ0TAl2WFGo3HVztu+tCBL9JQJjk+Ho5g==
301+
302+
kmp-tor.resource-exec-tor.mingw@408.16.4:
303+
version "408.16.4"
304+
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.mingw/-/kmp-tor.resource-exec-tor.mingw-408.16.4.tgz#2857507726ac9f8e63fdb675f0c76cf6f351e3e7"
305+
integrity sha512-xmf0PGnjrjD2UqlLAKRL+dNS7RG6yWuvImam1mns2xhpm099smiPS6F6v6V6Fws4KpXlPiDiM692eGSFaSUdPA==
306+
307+
kmp-tor.resource-geoip@408.16.4:
308+
version "408.16.4"
309+
resolved "https://registry.yarnpkg.com/kmp-tor.resource-geoip/-/kmp-tor.resource-geoip-408.16.4.tgz#2769a048174dd7a43dae22628da237908e7754c1"
310+
integrity sha512-1ERUhik4veZlpA8A11Z/pi3M/biwpSZke2zo/UGVTfBFortt35GICvP84qrHKBdePu37CH9nZ861QEtb1ueGAA==
311311

312312
kotlin-web-helpers@2.0.0:
313313
version "2.0.0"

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ See [kmp-tor-samples][url-kmp-tor-samples]
127127
[badge-androidx-startup]: https://img.shields.io/badge/androidx.startup-1.1.1-6EDB8D.svg?logo=android
128128
[badge-coroutines]: https://img.shields.io/badge/kotlinx.coroutines-1.10.2-blue.svg?logo=kotlin
129129
[badge-encoding]: https://img.shields.io/badge/encoding-2.4.0-blue.svg?style=flat
130-
[badge-kmp-process]: https://img.shields.io/badge/kmp--process-0.3.0--SNAPSHOT-blue.svg?style=flat
131-
[badge-kmp-tor-common]: https://img.shields.io/badge/kmp--tor--common-2.3.0--SNAPSHOT-blue.svg?style=flat
130+
[badge-kmp-process]: https://img.shields.io/badge/kmp--process-0.3.0-blue.svg?style=flat
131+
[badge-kmp-tor-common]: https://img.shields.io/badge/kmp--tor--common-2.3.0-blue.svg?style=flat
132132
[badge-kotlin]: https://img.shields.io/badge/kotlin-2.1.21-blue.svg?logo=kotlin
133133
[badge-kotlincrypto-bitops]: https://img.shields.io/badge/kotlincrypto.bitops-0.2.0-blue.svg?style=flat
134134
[badge-kotlincrypto-hash]: https://img.shields.io/badge/kotlincrypto.hash-0.7.0-blue.svg?style=flat

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ immutable = "0.2.0"
2222

2323
jetbrains-skiko = "0.9.4.2"
2424

25-
kmp-process = "0.3.0-SNAPSHOT"
26-
kmp-tor-common = "2.3.0-SNAPSHOT"
27-
# Upgrade yarn.lock when updating via `./gradlew kotlinUpgradeYarnLock`
28-
kmp-tor-resource = "408.16.4-SNAPSHOT" # Once update to non-SNAPSHOT, search & execute >> TODO: REMOVE[kmp-tor-resource]
25+
kmp-process = "0.3.0"
26+
kmp-tor-common = "2.3.0"
27+
kmp-tor-resource = "408.16.4" # Upgrade yarn.lock when updating via `./gradlew kotlinUpgradeYarnLock`
2928
kotlincrypto-catalog = "0.7.1" # Utilized from settings.gradle.kts
3029
kotlinx-coroutines = "1.10.2"
3130
ktor = "3.1.3"

‎library/runtime-core/src/jvmMain/kotlin/io/matthewnelson/kmp/tor/runtime/core/internal/-JvmOnEventExecutors.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717

1818
package io.matthewnelson.kmp.tor.runtime.core.internal
1919

20-
import io.matthewnelson.kmp.tor.common.api.InternalKmpTorApi
21-
import io.matthewnelson.kmp.tor.common.core.OSInfo
20+
import io.matthewnelson.kmp.file.ANDROID
2221
import kotlinx.coroutines.CoroutineDispatcher
2322
import kotlinx.coroutines.Dispatchers
2423
import kotlin.coroutines.EmptyCoroutineContext
@@ -39,8 +38,7 @@ private val SkikoUIDispatcher: CoroutineDispatcher? by lazy {
3938
}
4039

4140
internal inline fun isComposeDesktopApplication(): Boolean {
42-
@OptIn(InternalKmpTorApi::class)
43-
if (OSInfo.INSTANCE.isAndroidRuntime()) return false
41+
if (ANDROID.SDK_INT != null) return false
4442

4543
// Compose desktop configures this property. Check for its existence before
4644
// going to reflection based retrieval of Skiko's MainUIDispatcher.

‎library/runtime-core/src/jvmMain/kotlin/io/matthewnelson/kmp/tor/runtime/core/internal/-JvmPlatform.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
**/
1616
package io.matthewnelson.kmp.tor.runtime.core.internal
1717

18+
import io.matthewnelson.kmp.file.ANDROID
1819
import io.matthewnelson.kmp.file.SysDirSep
1920
import io.matthewnelson.kmp.tor.common.api.InternalKmpTorApi
2021
import io.matthewnelson.kmp.tor.common.core.OSHost
@@ -23,7 +24,7 @@ import io.matthewnelson.kmp.tor.common.core.OSInfo
2324
@OptIn(InternalKmpTorApi::class)
2425
internal actual val UnixSocketsNotSupportedMessage: String? by lazy {
2526
// Android support via android.net.LocalSocket since API 1
26-
if (OSInfo.INSTANCE.isAndroidRuntime()) return@lazy null
27+
if (ANDROID.SDK_INT != null) return@lazy null
2728

2829
val host = OSInfo.INSTANCE.osHost
2930
if (host is OSHost.Windows) {

‎library/runtime-ctrl/build.gradle.kts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ kmpConfiguration {
2525
js {
2626
sourceSetTest {
2727
dependencies {
28-
// TODO: REMOVE[kmp-tor-resource] remove .0 snapshot version
29-
implementation(npm("kmp-tor.resource-exec-tor.all", libs.versions.kmp.tor.resource.get() + ".0"))
28+
implementation(npm("kmp-tor.resource-exec-tor.all", libs.versions.kmp.tor.resource.get()))
3029
}
3130
}
3231
}

‎library/runtime-ctrl/src/jvmMain/kotlin/io/matthewnelson/kmp/tor/runtime/ctrl/internal/-JvmPlatform.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
**/
1616
package io.matthewnelson.kmp.tor.runtime.ctrl.internal
1717

18+
import io.matthewnelson.kmp.file.ANDROID
1819
import io.matthewnelson.kmp.file.File
1920
import io.matthewnelson.kmp.file.IOException
2021
import io.matthewnelson.kmp.file.wrapIOException
2122
import io.matthewnelson.kmp.process.InternalProcessApi
2223
import io.matthewnelson.kmp.process.ReadBuffer
23-
import io.matthewnelson.kmp.tor.common.api.InternalKmpTorApi
24-
import io.matthewnelson.kmp.tor.common.core.OSInfo
2524
import io.matthewnelson.kmp.tor.runtime.core.Disposable
2625
import io.matthewnelson.kmp.tor.runtime.core.net.IPSocketAddress
2726
import io.matthewnelson.kmp.tor.runtime.core.util.toInetAddress
@@ -86,8 +85,7 @@ internal actual fun IPSocketAddress.connect(): CtrlConnection {
8685

8786
@Throws(Throwable::class)
8887
internal actual fun File.connect(): CtrlConnection = with(UnixSocketReflect) {
89-
@OptIn(InternalKmpTorApi::class)
90-
if (OSInfo.INSTANCE.isAndroidRuntime()) {
88+
if (ANDROID.SDK_INT != null) {
9189
connectAndroid()
9290
} else {
9391
connectJvm()

‎library/runtime-service/src/androidMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/TorServiceConfig.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ import android.content.res.Resources
2525
import android.os.Build
2626
import androidx.startup.AppInitializer
2727
import io.matthewnelson.kmp.file.*
28+
import io.matthewnelson.kmp.file.ANDROID
2829
import io.matthewnelson.kmp.tor.common.api.ExperimentalKmpTorApi
29-
import io.matthewnelson.kmp.tor.common.api.InternalKmpTorApi
3030
import io.matthewnelson.kmp.tor.common.api.KmpTorDsl
3131
import io.matthewnelson.kmp.tor.common.api.ResourceLoader
32-
import io.matthewnelson.kmp.tor.common.core.OSInfo
3332
import io.matthewnelson.kmp.tor.runtime.Action
3433
import io.matthewnelson.kmp.tor.runtime.NetworkObserver
3534
import io.matthewnelson.kmp.tor.runtime.RuntimeEvent
@@ -617,8 +616,7 @@ public open class TorServiceConfig private constructor(
617616

618617
if (appContext == null) {
619618
// Verify not Android runtime.
620-
@OptIn(InternalKmpTorApi::class)
621-
check(!OSInfo.INSTANCE.isAndroidRuntime()) {
619+
check(ANDROID.SDK_INT == null) {
622620
// Startup initializer failed???
623621
Initializer.errorMsg()
624622
}

‎library/runtime/build.gradle.kts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ kmpConfiguration {
3030
js {
3131
sourceSetTest {
3232
dependencies {
33-
// TODO: REMOVE[kmp-tor-resource] remove .0 snapshot version
34-
implementation(npm("kmp-tor.resource-exec-tor.all", libs.versions.kmp.tor.resource.get() + ".0"))
33+
implementation(npm("kmp-tor.resource-exec-tor.all", libs.versions.kmp.tor.resource.get()))
3534
}
3635
}
3736
}

0 commit comments

Comments
 (0)