Skip to content

Commit 0c29637

Browse files
05nelsonm05nelsonm
authored
Update dependencies (#597)
1 parent 783e035 commit 0c29637

File tree

23 files changed

+69
-88
lines changed

23 files changed

+69
-88
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
strategy:
8080
fail-fast: false
8181
matrix:
82-
api-level: [ 21, 24, 29, 33 ]
82+
api-level: [ 21, 24, 29, 33, 34, 35 ]
8383
runs-on: ubuntu-latest
8484
steps:
8585
- name: Checkout Repository

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

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ color-name@~1.1.4:
116116
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
117117

118118
debug@^4.3.5:
119-
version "4.4.0"
120-
resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
121-
integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
119+
version "4.4.1"
120+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
121+
integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
122122
dependencies:
123123
ms "^2.1.3"
124124

@@ -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.1:
278-
version "408.16.1"
279-
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.all/-/kmp-tor.resource-exec-tor.all-408.16.1.tgz#bdc84861f1651c74cd1990ff4a49de7dc6a20f4f"
280-
integrity sha512-AepGIGoUS3YhakZJzlm9+87rls2AqqjM0PmLq83h+sSYEbMteWQIm02ac+6OzVkAQfC56nLdtYL93N6zXG8szA==
281-
dependencies:
282-
kmp-tor.resource-exec-tor.linux-android "408.16.1"
283-
kmp-tor.resource-exec-tor.linux-libc "408.16.1"
284-
kmp-tor.resource-exec-tor.macos "408.16.1"
285-
kmp-tor.resource-exec-tor.mingw "408.16.1"
286-
287-
kmp-tor.resource-exec-tor.linux-android@408.16.1:
288-
version "408.16.1"
289-
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.linux-android/-/kmp-tor.resource-exec-tor.linux-android-408.16.1.tgz#a7fbc5c2a144fa03f86872a4c5d86dc95ff94ab2"
290-
integrity sha512-Lx8Lq2AQwjsIwXgb2UDibhk73t/eSVNk4jNjk+fSmW3C+d6Rt9pX1yxH/UqLkwIB6cAKkRorttvD1F1BmvvP8g==
291-
292-
kmp-tor.resource-exec-tor.linux-libc@408.16.1:
293-
version "408.16.1"
294-
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.linux-libc/-/kmp-tor.resource-exec-tor.linux-libc-408.16.1.tgz#90ae992b915c3145021447a060538b3fed85e384"
295-
integrity sha512-wBLj3+ATORrD5cZqOdBZ+olrvm8ElvKASb3n38Q3ekS9/FbVzf7mJHa4rdR1hhZEUBZ6RqyWnfVKrDtPCeXK5A==
296-
297-
kmp-tor.resource-exec-tor.macos@408.16.1:
298-
version "408.16.1"
299-
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.macos/-/kmp-tor.resource-exec-tor.macos-408.16.1.tgz#8ec23ae3c4b2a0a775bc6aeeca53bf2a28e486e9"
300-
integrity sha512-Wx5eXJKqst3SJ2T2N3JZ/ZLnvef+IGhYu60kXnMQdbQeJAJARX8wIkDvBpiB0y8IjsL/fY4tcZS9DX6ewdoIcg==
301-
302-
kmp-tor.resource-exec-tor.mingw@408.16.1:
303-
version "408.16.1"
304-
resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.mingw/-/kmp-tor.resource-exec-tor.mingw-408.16.1.tgz#2d0eed2da543695a0c692be6607b5ebb63dc3818"
305-
integrity sha512-Wb7yAv1cUtZLLvOPajuEKhKHqrtCQxX0rNZIg3cZtTA+kMe+9y4R1WI2VqSnFoOg1gO7wWd6Tnuuv4gOzpOuSw==
306-
307-
kmp-tor.resource-geoip@408.16.1:
308-
version "408.16.1"
309-
resolved "https://registry.yarnpkg.com/kmp-tor.resource-geoip/-/kmp-tor.resource-geoip-408.16.1.tgz#759d308a58042e5ffa65d20f471409851687fdfd"
310-
integrity sha512-JiNkSOZsQRHfy7VJzy/ofIx2hCPzspgNpWjrOComG5JgwPm/vWq9oG6vZoYashvZMJRN34/iluIBPVY1AYOaWw==
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==
311311

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

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ runtime.enqueue(
9797
- Add runtime dependency
9898
```kotlin
9999
dependencies {
100-
implementation("io.matthewnelson.kmp-tor:runtime:2.3.0")
100+
implementation("io.matthewnelson.kmp-tor:runtime:2.4.0-SNAPSHOT")
101101
}
102102
```
103103

@@ -120,19 +120,19 @@ runtime.enqueue(
120120
See [kmp-tor-samples][url-kmp-tor-samples]
121121

122122
<!-- TAG_VERSION -->
123-
[badge-latest-release]: https://img.shields.io/badge/latest--release-2.3.0-5d2f68.svg?logo=torproject&style=flat&logoColor=5d2f68
123+
[badge-latest-release]: https://img.shields.io/badge/latest--release-2.4.0--SNAPSHOT-5d2f68.svg?logo=torproject&style=flat&logoColor=5d2f68
124124
[badge-license]: https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat
125125

126126
<!-- TAG_DEPENDENCIES -->
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.2.1-blue.svg?style=flat
131-
[badge-kmp-tor-common]: https://img.shields.io/badge/kmp--tor--common-2.2.0-blue.svg?style=flat
132-
[badge-kotlin]: https://img.shields.io/badge/kotlin-2.1.10-blue.svg?logo=kotlin
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
132+
[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
135-
[badge-kotlincrypto-random]: https://img.shields.io/badge/kotlincrypto.random-0.5.0-blue.svg?style=flat
135+
[badge-kotlincrypto-random]: https://img.shields.io/badge/kotlincrypto.random-0.5.1-blue.svg?style=flat
136136

137137
<!-- TAG_PLATFORMS -->
138138
[badge-platform-android]: https://img.shields.io/badge/-android-6EDB8D.svg?style=flat

‎build-logic/src/main/kotlin/-KmpConfigurationExtension.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ fun KmpConfigurationExtension.configureShared(
9090

9191
fun KmpConfigurationContainerDsl.androidLibrary(
9292
namespace: String,
93-
buildTools: String? = "34.0.0",
94-
compileSdk: Int = 34,
93+
buildTools: String? = "35.0.1",
94+
compileSdk: Int = 35,
9595
minSdk: Int = 16,
9696
javaVersion: JavaVersion = JavaVersion.VERSION_1_8,
9797
action: (Action<TargetAndroidContainer.Library>)? = null,

‎build-logic/src/main/kotlin/publication.gradle.kts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
**/
16-
import org.gradle.plugins.signing.SigningExtension
17-
1816
plugins {
1917
id("com.vanniktech.maven.publish")
2018
}
2119

22-
if (!version.toString().endsWith("-SNAPSHOT")) {
23-
extensions.configure<SigningExtension>("signing") {
24-
// useGpgCmd()
25-
}
26-
}
27-
2820
tasks.withType<AbstractArchiveTask>().configureEach {
2921
isPreserveFileTimestamps = false
3022
isReproducibleFileOrder = true

‎gh-pages/publish.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ cd ..
3030
cp -aR build/dokka/html/* gh-pages/$REPO_NAME
3131

3232
cd "$DIR_SCRIPT/$REPO_NAME"
33-
sed -i "s|module:|module:library/|g" "package-list"
33+
PACKAGE_LIST="$(sed "s|module:|module:library/|g" "package-list")"
34+
echo "$PACKAGE_LIST" > "package-list"
3435

3536
git add --all
3637
git commit -S --message "Update dokka docs"

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ POM_DEVELOPER_ID=05nelsonm
3535
POM_DEVELOPER_NAME=Matthew Nelson
3636
POM_DEVELOPER_URL=https://github.com/05nelsonm/
3737

38-
VERSION_NAME=2.3.1-SNAPSHOT
38+
VERSION_NAME=2.4.0-SNAPSHOT
3939
# 0.1.0-alpha01 = 00 01 00 11
4040
# 0.1.0-beta01 = 00 01 00 21
4141
# 0.1.0-rc01 = 00 01 00 31
4242
# 0.1.0 = 00 01 00 99
4343
# 1.1.0 = 01 01 00 99
44-
VERSION_CODE=02030199
44+
VERSION_CODE=02040099

‎gradle/libs.versions.toml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,26 @@ bouncy-castle = "1.80"
1111

1212
encoding = "2.4.0"
1313

14-
gradle-android = "8.7.3"
14+
gradle-android = "8.9.3"
1515
gradle-binary-compat = "0.17.0"
1616
gradle-dokka = "2.0.0"
17-
gradle-kmp-configuration = "0.4.0"
18-
gradle-kotlin = "2.1.10"
19-
gradle-publish-maven = "0.30.0"
17+
gradle-kmp-configuration = "0.4.1"
18+
gradle-kotlin = "2.1.21"
19+
gradle-publish-maven = "0.32.0"
2020

2121
immutable = "0.2.0"
2222

2323
jetbrains-skiko = "0.9.4.2"
2424

25-
kmp-process = "0.2.1"
26-
kmp-tor-common = "2.2.0"
27-
kmp-tor-resource = "408.16.1" # Upgrade yarn.lock when updating via `./gradlew kotlinUpgradeYarnLock`
28-
kotlincrypto-catalog = "0.7.0" # Utilized from settings.gradle.kts
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]
29+
kotlincrypto-catalog = "0.7.1" # Utilized from settings.gradle.kts
2930
kotlinx-coroutines = "1.10.2"
30-
ktor = "3.1.0"
31+
ktor = "3.1.3"
3132

32-
okio = "3.10.2"
33+
okio = "3.11.0"
3334

3435
[libraries]
3536
androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version.ref = "androidx-startup" }

‎library/runtime-core/src/jsMain/kotlin/io/matthewnelson/kmp/tor/runtime/core/internal/JsOnEventExecutors.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package io.matthewnelson.kmp.tor.runtime.core.internal
1919

2020
import io.matthewnelson.kmp.tor.runtime.core.OnEvent
2121

22-
@Suppress("ACTUAL_WITHOUT_EXPECT")
2322
internal actual typealias ExecutorMainInternal = OnEvent.Executor.Immediate
2423

2524
internal actual inline fun OnEvent.Executor.isImmediate(): Boolean = when (this) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ kmpConfiguration {
2525
js {
2626
sourceSetTest {
2727
dependencies {
28-
implementation(npm("kmp-tor.resource-exec-tor.all", libs.versions.kmp.tor.resource.get()))
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"))
2930
}
3031
}
3132
}

0 commit comments

Comments
 (0)