Merge 2.4.0 to master (#600)

Author: 05nelsonm

.github/workflows/CI.yml

@@ -69,7 +69,7 @@ jobs:
 
       - name: Upload Test Reports
         uses: actions/upload-artifact@v4
-        if: ${{ always() }}
+        if: always()
         with:
           name: test-report-${{ matrix.os }}-java${{ matrix.java-version }}
           path: '**/build/reports/tests/**'
@@ -79,7 +79,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        api-level: [ 21, 24, 29, 33 ]
+        api-level: [ 21, 24, 29, 33, 34, 35 ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
@@ -106,12 +106,14 @@ jobs:
           emulator-boot-timeout: 300 # 5 minutes
           api-level: ${{ matrix.api-level }}
           arch: x86_64
-          script: ./gradlew connectedCheck -PKMP_TARGETS="ANDROID,JVM"
+          script: ./gradlew connectedCheck -PKMP_TARGETS="ANDROID,ANDROID_ARM32,ANDROID_ARM64,ANDROID_X64,ANDROID_X86,JVM"
 
       - name: Upload Test Reports
         uses: actions/upload-artifact@v4
-        if: ${{ always() }}
+        if: always()
         with:
           name: test-report-android-${{ matrix.api-level }}
-          path: '**/build/reports/androidTests/**'
+          path: |
+            **/build/reports/androidTests/**
+            **/build/outputs/androidTest-results/connected/debug/*/logcat-*.txt
           retention-days: 1

.kotlin-js-store/yarn.lock

@@ -116,9 +116,9 @@ color-name@~1.1.4:
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 debug@^4.3.5:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
-  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
+  integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
   dependencies:
     ms "^2.1.3"
 
@@ -274,40 +274,40 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-kmp-tor.resource-exec-tor.all@408.16.1:
-  version "408.16.1"
-  resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.all/-/kmp-tor.resource-exec-tor.all-408.16.1.tgz#bdc84861f1651c74cd1990ff4a49de7dc6a20f4f"
-  integrity sha512-AepGIGoUS3YhakZJzlm9+87rls2AqqjM0PmLq83h+sSYEbMteWQIm02ac+6OzVkAQfC56nLdtYL93N6zXG8szA==
-  dependencies:
-    kmp-tor.resource-exec-tor.linux-android "408.16.1"
-    kmp-tor.resource-exec-tor.linux-libc "408.16.1"
-    kmp-tor.resource-exec-tor.macos "408.16.1"
-    kmp-tor.resource-exec-tor.mingw "408.16.1"
-
-kmp-tor.resource-exec-tor.linux-android@408.16.1:
-  version "408.16.1"
-  resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.linux-android/-/kmp-tor.resource-exec-tor.linux-android-408.16.1.tgz#a7fbc5c2a144fa03f86872a4c5d86dc95ff94ab2"
-  integrity sha512-Lx8Lq2AQwjsIwXgb2UDibhk73t/eSVNk4jNjk+fSmW3C+d6Rt9pX1yxH/UqLkwIB6cAKkRorttvD1F1BmvvP8g==
-
-kmp-tor.resource-exec-tor.linux-libc@408.16.1:
-  version "408.16.1"
-  resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.linux-libc/-/kmp-tor.resource-exec-tor.linux-libc-408.16.1.tgz#90ae992b915c3145021447a060538b3fed85e384"
-  integrity sha512-wBLj3+ATORrD5cZqOdBZ+olrvm8ElvKASb3n38Q3ekS9/FbVzf7mJHa4rdR1hhZEUBZ6RqyWnfVKrDtPCeXK5A==
-
-kmp-tor.resource-exec-tor.macos@408.16.1:
-  version "408.16.1"
-  resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.macos/-/kmp-tor.resource-exec-tor.macos-408.16.1.tgz#8ec23ae3c4b2a0a775bc6aeeca53bf2a28e486e9"
-  integrity sha512-Wx5eXJKqst3SJ2T2N3JZ/ZLnvef+IGhYu60kXnMQdbQeJAJARX8wIkDvBpiB0y8IjsL/fY4tcZS9DX6ewdoIcg==
-
-kmp-tor.resource-exec-tor.mingw@408.16.1:
-  version "408.16.1"
-  resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.mingw/-/kmp-tor.resource-exec-tor.mingw-408.16.1.tgz#2d0eed2da543695a0c692be6607b5ebb63dc3818"
-  integrity sha512-Wb7yAv1cUtZLLvOPajuEKhKHqrtCQxX0rNZIg3cZtTA+kMe+9y4R1WI2VqSnFoOg1gO7wWd6Tnuuv4gOzpOuSw==
-
-kmp-tor.resource-geoip@408.16.1:
-  version "408.16.1"
-  resolved "https://registry.yarnpkg.com/kmp-tor.resource-geoip/-/kmp-tor.resource-geoip-408.16.1.tgz#759d308a58042e5ffa65d20f471409851687fdfd"
-  integrity sha512-JiNkSOZsQRHfy7VJzy/ofIx2hCPzspgNpWjrOComG5JgwPm/vWq9oG6vZoYashvZMJRN34/iluIBPVY1AYOaWw==
+kmp-tor.resource-exec-tor.all@408.16.4:
+  version "408.16.4"
+  resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.all/-/kmp-tor.resource-exec-tor.all-408.16.4.tgz#07bc82b12d93e8d42f0fb0fcc653bb9c38eb1e45"
+  integrity sha512-OpgOs2V4eCfSsHjWv9zvfAs6X5Faqj7rGuMFTBRA7xJv8I5Zh1XO/uq6yK+fhPOSI6+6BPxlspAXAAi4yOPbZA==
+  dependencies:
+    kmp-tor.resource-exec-tor.linux-android "408.16.4"
+    kmp-tor.resource-exec-tor.linux-libc "408.16.4"
+    kmp-tor.resource-exec-tor.macos "408.16.4"
+    kmp-tor.resource-exec-tor.mingw "408.16.4"
+
+kmp-tor.resource-exec-tor.linux-android@408.16.4:
+  version "408.16.4"
+  resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.linux-android/-/kmp-tor.resource-exec-tor.linux-android-408.16.4.tgz#b2da022942cafd8aa8a486edaf7f455e8f6a231d"
+  integrity sha512-067ppCwcgUf/g5bbQmUytBOKTJRY6oABHab1BbK8Jr4g1lO76RjxrZfkobghncW7Dx/v+dw8UJQwoDXzNRXjsg==
+
+kmp-tor.resource-exec-tor.linux-libc@408.16.4:
+  version "408.16.4"
+  resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.linux-libc/-/kmp-tor.resource-exec-tor.linux-libc-408.16.4.tgz#95313918f1db3849049ac692593a35ad28bd5097"
+  integrity sha512-CsaE5YvZrpQC8hsl9uSKuH1Imjz6R0WVkgLGZNwcEjXZpKx3h0kU8ECu8tjtS/FJ3SkMgaNHTI4tYSekB1bkgw==
+
+kmp-tor.resource-exec-tor.macos@408.16.4:
+  version "408.16.4"
+  resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.macos/-/kmp-tor.resource-exec-tor.macos-408.16.4.tgz#eb4b4c634a4c30f36a75533d8fd1f461b149851b"
+  integrity sha512-mUBxHBknKLs0FEGVDKGQNqdRB4rRdrp6ruknzWZ8chz61fvW9Vv/oaJ0TAl2WFGo3HVztu+tCBL9JQJjk+Ho5g==
+
+kmp-tor.resource-exec-tor.mingw@408.16.4:
+  version "408.16.4"
+  resolved "https://registry.yarnpkg.com/kmp-tor.resource-exec-tor.mingw/-/kmp-tor.resource-exec-tor.mingw-408.16.4.tgz#2857507726ac9f8e63fdb675f0c76cf6f351e3e7"
+  integrity sha512-xmf0PGnjrjD2UqlLAKRL+dNS7RG6yWuvImam1mns2xhpm099smiPS6F6v6V6Fws4KpXlPiDiM692eGSFaSUdPA==
+
+kmp-tor.resource-geoip@408.16.4:
+  version "408.16.4"
+  resolved "https://registry.yarnpkg.com/kmp-tor.resource-geoip/-/kmp-tor.resource-geoip-408.16.4.tgz#2769a048174dd7a43dae22628da237908e7754c1"
+  integrity sha512-1ERUhik4veZlpA8A11Z/pi3M/biwpSZke2zo/UGVTfBFortt35GICvP84qrHKBdePu37CH9nZ861QEtb1ueGAA==
 
 kotlin-web-helpers@2.0.0:
   version "2.0.0"

README.md

@@ -97,7 +97,7 @@ runtime.enqueue(
 - Add runtime dependency
   ```kotlin
   dependencies {
-      implementation("io.matthewnelson.kmp-tor:runtime:2.3.0")
+      implementation("io.matthewnelson.kmp-tor:runtime:2.4.0-SNAPSHOT")
   }
   ```
 
@@ -120,19 +120,19 @@ runtime.enqueue(
 See [kmp-tor-samples][url-kmp-tor-samples]
 
 <!-- TAG_VERSION -->
-[badge-latest-release]: https://img.shields.io/badge/latest--release-2.3.0-5d2f68.svg?logo=torproject&style=flat&logoColor=5d2f68
+[badge-latest-release]: https://img.shields.io/badge/latest--release-2.4.0--SNAPSHOT-5d2f68.svg?logo=torproject&style=flat&logoColor=5d2f68
 [badge-license]: https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat
 
 <!-- TAG_DEPENDENCIES -->
 [badge-androidx-startup]: https://img.shields.io/badge/androidx.startup-1.1.1-6EDB8D.svg?logo=android
 [badge-coroutines]: https://img.shields.io/badge/kotlinx.coroutines-1.10.2-blue.svg?logo=kotlin
 [badge-encoding]: https://img.shields.io/badge/encoding-2.4.0-blue.svg?style=flat
-[badge-kmp-process]: https://img.shields.io/badge/kmp--process-0.2.1-blue.svg?style=flat
-[badge-kmp-tor-common]: https://img.shields.io/badge/kmp--tor--common-2.2.0-blue.svg?style=flat
-[badge-kotlin]: https://img.shields.io/badge/kotlin-2.1.10-blue.svg?logo=kotlin
+[badge-kmp-process]: https://img.shields.io/badge/kmp--process-0.3.0-blue.svg?style=flat
+[badge-kmp-tor-common]: https://img.shields.io/badge/kmp--tor--common-2.3.0-blue.svg?style=flat
+[badge-kotlin]: https://img.shields.io/badge/kotlin-2.1.21-blue.svg?logo=kotlin
 [badge-kotlincrypto-bitops]: https://img.shields.io/badge/kotlincrypto.bitops-0.2.0-blue.svg?style=flat
 [badge-kotlincrypto-hash]: https://img.shields.io/badge/kotlincrypto.hash-0.7.0-blue.svg?style=flat
-[badge-kotlincrypto-random]: https://img.shields.io/badge/kotlincrypto.random-0.5.0-blue.svg?style=flat
+[badge-kotlincrypto-random]: https://img.shields.io/badge/kotlincrypto.random-0.5.1-blue.svg?style=flat
 
 <!-- TAG_PLATFORMS -->
 [badge-platform-android]: https://img.shields.io/badge/-android-6EDB8D.svg?style=flat

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

@@ -65,6 +65,7 @@ fun KmpConfigurationExtension.configureShared(
             }
         }
 
+        androidNativeAll()
         iosAll()
         linuxAll()
         macosAll()
@@ -90,8 +91,8 @@ fun KmpConfigurationExtension.configureShared(
 
 fun KmpConfigurationContainerDsl.androidLibrary(
     namespace: String,
-    buildTools: String? = "34.0.0",
-    compileSdk: Int = 34,
+    buildTools: String? = "35.0.1",
+    compileSdk: Int = 35,
     minSdk: Int = 16,
     javaVersion: JavaVersion = JavaVersion.VERSION_1_8,
     action: (Action<TargetAndroidContainer.Library>)? = null,

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

@@ -13,18 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-import org.gradle.plugins.signing.SigningExtension
-
 plugins {
     id("com.vanniktech.maven.publish")
 }
 
-if (!version.toString().endsWith("-SNAPSHOT")) {
-    extensions.configure<SigningExtension>("signing") {
-//        useGpgCmd()
-    }
-}
-
 tasks.withType<AbstractArchiveTask>().configureEach {
     isPreserveFileTimestamps = false
     isReproducibleFileOrder = true

gh-pages/publish.sh

@@ -30,7 +30,8 @@ cd ..
 cp -aR build/dokka/html/* gh-pages/$REPO_NAME
 
 cd "$DIR_SCRIPT/$REPO_NAME"
-sed -i "s|module:|module:library/|g" "package-list"
+PACKAGE_LIST="$(sed "s|module:|module:library/|g" "package-list")"
+echo "$PACKAGE_LIST" > "package-list"
 
 git add --all
 git commit -S --message "Update dokka docs"

gradle.properties

@@ -35,10 +35,10 @@ POM_DEVELOPER_ID=05nelsonm
 POM_DEVELOPER_NAME=Matthew Nelson
 POM_DEVELOPER_URL=https://github.com/05nelsonm/
 
-VERSION_NAME=2.3.1-SNAPSHOT
+VERSION_NAME=2.4.0-SNAPSHOT
 # 0.1.0-alpha01 = 00 01 00 11
 # 0.1.0-beta01  = 00 01 00 21
 # 0.1.0-rc01    = 00 01 00 31
 # 0.1.0         = 00 01 00 99
 # 1.1.0         = 01 01 00 99
-VERSION_CODE=02030199
+VERSION_CODE=02040099

gradle/libs.versions.toml

@@ -11,25 +11,23 @@ bouncy-castle               = "1.80"
 
 encoding                    = "2.4.0"
 
-gradle-android              = "8.7.3"
+gradle-android              = "8.9.3"
 gradle-binary-compat        = "0.17.0"
 gradle-dokka                = "2.0.0"
-gradle-kmp-configuration    = "0.4.0"
-gradle-kotlin               = "2.1.10"
-gradle-publish-maven        = "0.30.0"
+gradle-kmp-configuration    = "0.4.1"
+gradle-kotlin               = "2.1.21"
+gradle-publish-maven        = "0.32.0"
 
 immutable                   = "0.2.0"
 
 jetbrains-skiko             = "0.9.4.2"
 
-kmp-process                 = "0.2.1"
-kmp-tor-common              = "2.2.0"
-kmp-tor-resource            = "408.16.1" # Upgrade yarn.lock when updating via `./gradlew kotlinUpgradeYarnLock`
-kotlincrypto-catalog        = "0.7.0" # Utilized from settings.gradle.kts
+kmp-process                 = "0.3.0"
+kmp-tor-common              = "2.3.0"
+kmp-tor-resource            = "408.16.4" # Upgrade yarn.lock when updating via `./gradlew kotlinUpgradeYarnLock`
+kotlincrypto-catalog        = "0.7.1" # Utilized from settings.gradle.kts
 kotlinx-coroutines          = "1.10.2"
-ktor                        = "3.1.0"
-
-okio                        = "3.10.2"
+ktor                        = "3.1.3"
 
 [libraries]
 androidx-startup-runtime    = { module = "androidx.startup:startup-runtime", version.ref = "androidx-startup" }
@@ -60,15 +58,13 @@ bouncy-castle               = { module = "org.bouncycastle:bcprov-jdk18on", vers
 
 jetbrains-skiko             = { module = "org.jetbrains.skiko:skiko-awt", version.ref = "jetbrains-skiko" }
 
+kmp-tor-resource-android-unit-test-tor = { module = "io.matthewnelson.kmp-tor:resource-android-unit-test-tor", version.ref = "kmp-tor-resource" }
+kmp-tor-resource-compilation-exec-tor = { module = "io.matthewnelson.kmp-tor:resource-compilation-exec-tor", version.ref = "kmp-tor-resource" }
 kmp-tor-resource-exec-tor   = { module = "io.matthewnelson.kmp-tor:resource-exec-tor", version.ref = "kmp-tor-resource" }
 kmp-tor-resource-noexec-tor = { module = "io.matthewnelson.kmp-tor:resource-noexec-tor", version.ref = "kmp-tor-resource" }
-kmp-tor-resource-android-unit-test-tor = { module = "io.matthewnelson.kmp-tor:resource-android-unit-test-tor", version.ref = "kmp-tor-resource" }
 kotlinx-coroutines-test     = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 ktor-network                = { module = "io.ktor:ktor-network", version.ref = "ktor" }
 
-okio-okio                   = { module = "com.squareup.okio:okio", version.ref = "okio" }
-okio-node                   = { module = "com.squareup.okio:okio-nodefilesystem", version.ref = "okio" }
-
 [plugins]
 android-library             = { id = "com.android.library", version.ref = "gradle-android" }
 binary-compat               = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "gradle-binary-compat" }

library/runtime-core/api/runtime-core.klib.api

@@ -1,6 +1,6 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64]
-// Alias: native => [iosArm64, iosSimulatorArm64, iosX64, linuxArm64, linuxX64, macosArm64, macosX64]
+// Targets: [androidNativeArm32, androidNativeArm64, androidNativeX64, androidNativeX86, iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64]
+// Alias: native => [androidNativeArm32, androidNativeArm64, androidNativeX64, androidNativeX86, iosArm64, iosSimulatorArm64, iosX64, linuxArm64, linuxX64, macosArm64, macosX64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true

library/runtime-core/build.gradle.kts

@@ -13,6 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.konan.target.Family
+
 plugins {
     id("configuration")
 }
@@ -87,5 +90,32 @@ kmpConfiguration {
                 }
             }
         }
+
+        kotlin {
+            val cInteropDir = projectDir
+                .resolve("src")
+                .resolve("nativeInterop")
+                .resolve("cinterop")
+
+            targets.filterIsInstance<KotlinNativeTarget>().forEach target@ { target ->
+                when (target.konanTarget.family) {
+                    Family.ANDROID, Family.IOS, Family.TVOS, Family.WATCHOS -> {}
+                    else -> return@target
+                }
+
+                target.compilations["main"].cinterops.create("network") {
+                    definitionFile.set(cInteropDir.resolve("$name.def"))
+                }
+            }
+
+            project.afterEvaluate {
+                val commonizeTask = project.tasks.findByName("commonizeCInterop") ?: return@afterEvaluate
+
+                project.tasks.all {
+                    if (!name.endsWith("MetadataElements")) return@all
+                    dependsOn(commonizeTask)
+                }
+            }
+        }
     }
 }