Skip to content

Commit 59d0ea4

Browse files
authored
Update dependencies (#133)
1 parent a6319c8 commit 59d0ea4

File tree

19 files changed

+267
-305
lines changed

19 files changed

+267
-305
lines changed

.gitignore

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,9 @@
1-
# Gradle files
21
.gradle/
3-
.kotlin/
42
build/
5-
6-
# Local configuration file (sdk path, etc)
7-
local.properties
8-
9-
# Log/OS Files
10-
*.log
11-
12-
# Android Studio generated files and folders
13-
captures/
14-
.externalNativeBuild/
15-
.cxx/
16-
*.apk
17-
output.json
18-
19-
# IntelliJ
203
*.iml
214
.idea/
22-
misc.xml
23-
deploymentTargetDropDown.xml
24-
render.experimental.xml
25-
26-
# Keystore files
27-
*.jks
28-
*.keystore
29-
30-
# Google Services (e.g. APIs or Firebase)
31-
google-services.json
32-
33-
# Android Profiling
34-
*.hprof
5+
local.properties
6+
.kotlin/
357

368
gh-pages/*
379
!gh-pages/publish.sh

.kotlin-js-store/yarn.lock

Lines changed: 123 additions & 158 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[![badge-kotlin]][url-kotlin]
66
[![badge-coroutines]][url-coroutines]
7-
[![badge-endians]][url-endians]
7+
[![badge-bitops]][url-bitops]
88
[![badge-immutable]][url-immutable]
99
[![badge-kmp-file]][url-kmp-file]
1010

@@ -227,11 +227,11 @@ dependencies {
227227
[badge-license]: https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat
228228

229229
<!-- TAG_DEPENDENCIES -->
230-
[badge-coroutines]: https://img.shields.io/badge/kotlinx.coroutines-1.8.1-blue.svg?logo=kotlin
231-
[badge-endians]: https://img.shields.io/badge/kotlincrypto.endians-0.3.1-blue.svg?style=flat
232-
[badge-immutable]: https://img.shields.io/badge/immutable-0.1.4-blue.svg?style=flat
233-
[badge-kmp-file]: https://img.shields.io/badge/kmp--file-0.1.1-blue.svg?style=flat
234-
[badge-kotlin]: https://img.shields.io/badge/kotlin-1.9.24-blue.svg?logo=kotlin
230+
[badge-coroutines]: https://img.shields.io/badge/kotlinx.coroutines-1.10.1-blue.svg?logo=kotlin
231+
[badge-bitops]: https://img.shields.io/badge/kotlincrypto.bitops-0.1.2-blue.svg?style=flat
232+
[badge-immutable]: https://img.shields.io/badge/immutable-0.2.0-blue.svg?style=flat
233+
[badge-kmp-file]: https://img.shields.io/badge/kmp--file-0.2.0-blue.svg?style=flat
234+
[badge-kotlin]: https://img.shields.io/badge/kotlin-2.1.10-blue.svg?logo=kotlin
235235

236236
<!-- TAG_PLATFORMS -->
237237
[badge-platform-android]: http://img.shields.io/badge/-android-6EDB8D.svg?style=flat
@@ -254,7 +254,7 @@ dependencies {
254254
[url-latest-release]: https://github.com/05nelsonm/kmp-process/releases/latest
255255
[url-license]: https://www.apache.org/licenses/LICENSE-2.0
256256
[url-coroutines]: https://github.com/Kotlin/kotlinx.coroutines
257-
[url-endians]: https://github.com/KotlinCrypto/endians
257+
[url-bitops]: https://github.com/KotlinCrypto/bitops
258258
[url-immutable]: https://github.com/05nelsonm/immutable
259259
[url-kmp-file]: https://github.com/05nelsonm/kmp-file
260260
[url-kotlin]: https://kotlinlang.org

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
**/
16-
import io.matthewnelson.kmp.configuration.ExperimentalKmpConfigurationApi
1716
import io.matthewnelson.kmp.configuration.extension.KmpConfigurationExtension
1817
import io.matthewnelson.kmp.configuration.extension.container.target.KmpConfigurationContainerDsl
1918
import org.gradle.api.Action
@@ -41,10 +40,9 @@ fun KmpConfigurationExtension.configureShared(
4140
compileTargetCompatibility = JavaVersion.VERSION_1_8
4241

4342
// windows always throws a fit if not using Java 11. This disables
44-
// compilations of module-info.java. Nobody deploys from Windows
43+
// compilation of module-info.java. Nobody deploys from Windows
4544
// anyway...
4645
if (!HostManager.hostIsMingw) {
47-
@OptIn(ExperimentalKmpConfigurationApi::class)
4846
java9ModuleInfoName = java9ModuleName
4947
}
5048
}

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

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,38 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
**/
16-
import org.jetbrains.dokka.DokkaConfiguration.Visibility
17-
import org.jetbrains.dokka.gradle.DokkaTaskPartial
16+
import org.jetbrains.dokka.gradle.DokkaExtension
17+
import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
1818
import java.net.URI
1919

2020
plugins {
2121
id("org.jetbrains.dokka")
2222
}
2323

24-
tasks.withType<DokkaTaskPartial>().configureEach {
25-
suppressInheritedMembers = true
24+
rootProject.dependencies { dokka(project(project.path)) }
25+
26+
extensions.configure<DokkaExtension> {
27+
dokkaPublications.configureEach {
28+
suppressInheritedMembers.set(true)
29+
}
2630

2731
dokkaSourceSets.configureEach {
2832
includes.from("README.md")
29-
noStdlibLink = true
33+
enableKotlinStdLibDocumentationLink.set(false)
3034

31-
externalDocumentationLink {
32-
url = URI("https://kmp-file.matthewnelson.io/").toURL()
35+
externalDocumentationLinks.create("kmp-file") {
36+
url.set(URI("https://kmp-file.matthewnelson.io/"))
3337
}
3438

3539
sourceLink {
36-
localDirectory = rootDir
37-
remoteUrl = URI("https://github.com/05nelsonm/kmp-process/tree/master").toURL()
38-
remoteLineSuffix = "#L"
40+
localDirectory.set(rootDir)
41+
remoteUrl.set(URI("https://github.com/05nelsonm/kmp-process/tree/master"))
42+
remoteLineSuffix.set("#L")
3943
}
4044

41-
documentedVisibilities.set(setOf(
42-
Visibility.PUBLIC,
43-
Visibility.PROTECTED,
44-
))
45+
documentedVisibilities(
46+
VisibilityModifier.Public,
47+
VisibilityModifier.Protected,
48+
)
4549
}
4650
}

gh-pages/publish.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,22 @@
1515
set -e
1616

1717
readonly DIR_SCRIPT="$( cd "$( dirname "$0" )" >/dev/null && pwd )"
18+
readonly REPO_NAME="kmp-process"
1819

19-
trap 'rm -rf "$DIR_SCRIPT/kmp-process"' EXIT
20+
trap 'rm -rf "$DIR_SCRIPT/$REPO_NAME"' EXIT
2021

2122
cd "$DIR_SCRIPT"
22-
git clone -b gh-pages --single-branch https://github.com/05nelsonm/kmp-process.git
23-
rm -rf "$DIR_SCRIPT/kmp-process/"*
24-
echo "kmp-process.matthewnelson.io" > "$DIR_SCRIPT/kmp-process/CNAME"
23+
git clone -b gh-pages --single-branch https://github.com/05nelsonm/$REPO_NAME.git
24+
rm -rf "$DIR_SCRIPT/$REPO_NAME/"*
25+
echo "$REPO_NAME.matthewnelson.io" > "$DIR_SCRIPT/$REPO_NAME/CNAME"
2526

2627
cd ..
2728
./gradlew clean -DKMP_TARGETS_ALL
28-
./gradlew dokkaHtmlMultiModule --no-build-cache -DKMP_TARGETS_ALL
29-
cp -aR build/dokka/htmlMultiModule/* gh-pages/kmp-process
29+
./gradlew dokkaGenerate --no-build-cache -DKMP_TARGETS_ALL
30+
cp -aR build/dokka/html/* gh-pages/$REPO_NAME
3031

31-
cd "$DIR_SCRIPT/kmp-process"
32-
sed -i "s|module:process|module:library/process|g" "package-list"
32+
cd "$DIR_SCRIPT/$REPO_NAME"
33+
sed -i "s|module:|module:library/|g" "package-list"
3334

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

gradle.properties

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ kotlin.mpp.applyDefaultHierarchyTemplate=false
1111
kotlin.mpp.enableCInteropCommonization=true
1212
kotlin.mpp.stability.nowarn=true
1313
kotlin.native.ignoreDisabledTargets=true
14-
kotlin.native.ignoreIncorrectDependencies=true
14+
kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning
15+
16+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
17+
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
1518

1619
SONATYPE_HOST=S01
1720
RELEASE_SIGNING_ENABLED=true
@@ -33,10 +36,10 @@ POM_DEVELOPER_ID=05nelsonm
3336
POM_DEVELOPER_NAME=Matthew Nelson
3437
POM_DEVELOPER_URL=https://github.com/05nelsonm/
3538

36-
VERSION_NAME=0.1.3-SNAPSHOT
39+
VERSION_NAME=0.2.0-SNAPSHOT
3740
# 0.1.0-alpha01 = 00 01 00 11
3841
# 0.1.0-beta01 = 00 01 00 41
3942
# 0.1.0-rc01 = 00 01 00 71
4043
# 0.1.0 = 00 01 00 99
4144
# 1.1.0 = 01 01 00 99
42-
VERSION_CODE=00010399
45+
VERSION_CODE=00020099

gradle/libs.versions.toml

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,44 @@
11
[versions]
2-
androidx-test-core = "1.5.0"
3-
androidx-test-runner = "1.5.2"
2+
#noinspection GradleDependency
3+
androidx-test-core = "1.5.0" # Do not upgrade. Tests run for API 15+, where next version requires minSdk 19+
4+
#noinspection GradleDependency
5+
androidx-test-runner = "1.5.2" # Do not upgrade. Tests run for API 15+, where next version requires minSdk 19+
46

5-
gradle-android = "8.2.2"
6-
gradle-binary-compat = "0.16.3"
7-
gradle-dokka = "1.9.20"
8-
gradle-kmp-configuration = "0.3.2"
9-
gradle-kotlin = "1.9.24"
10-
gradle-publish-maven = "0.29.0"
7+
gradle-android = "8.7.3"
8+
gradle-binary-compat = "0.17.0"
9+
gradle-dokka = "2.0.0"
10+
gradle-kmp-configuration = "0.4.0"
11+
gradle-kotlin = "2.1.10"
12+
gradle-publish-maven = "0.30.0"
1113

12-
immutable = "0.1.4"
14+
immutable = "0.2.0-SNAPSHOT"
1315

14-
kmp-file = "0.1.1"
15-
kmp-tor-resource = "408.13.0"
16-
kotlincrypto-endians = "0.3.1"
17-
kotlinx-coroutines = "1.8.1"
16+
kmp-file = "0.2.0-SNAPSHOT"
17+
kmp-tor-resource = "408.13.1"
18+
kotlincrypto-catalog = "0.6.1" # Utilized from settings.gradle.kts
19+
kotlinx-coroutines = "1.10.1"
1820

1921
[libraries]
20-
gradle-android = { module = "com.android.tools.build:gradle", version.ref = "gradle-android" }
21-
gradle-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradle-dokka" }
22-
gradle-kmp-configuration = { module = "io.matthewnelson:gradle-kmp-configuration-plugin", version.ref = "gradle-kmp-configuration" }
23-
gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "gradle-kotlin" }
24-
gradle-publish-maven = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradle-publish-maven" }
22+
gradle-android = { module = "com.android.tools.build:gradle", version.ref = "gradle-android" }
23+
gradle-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradle-dokka" }
24+
gradle-kmp-configuration = { module = "io.matthewnelson:gradle-kmp-configuration-plugin", version.ref = "gradle-kmp-configuration" }
25+
gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "gradle-kotlin" }
26+
gradle-publish-maven = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradle-publish-maven" }
2527

26-
immutable-collections = { module = "io.matthewnelson.immutable:collections", version.ref = "immutable" }
28+
immutable-collections = { module = "io.matthewnelson.immutable:collections", version.ref = "immutable" }
2729

28-
kmp-file = { module = "io.matthewnelson.kmp-file:file", version.ref = "kmp-file" }
29-
kotlincrypto-endians = { module = "org.kotlincrypto.endians:endians", version.ref = "kotlincrypto-endians" }
30-
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
30+
kmp-file = { module = "io.matthewnelson.kmp-file:file", version.ref = "kmp-file" }
31+
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
3132

3233
# tests
33-
androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test-core" }
34-
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" }
34+
androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test-core" }
35+
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" }
3536
kmp-tor-resource-android-unit-test-tor = { module = "io.matthewnelson.kmp-tor:resource-android-unit-test-tor", version.ref = "kmp-tor-resource" }
36-
kmp-tor-resource-exec-tor = { module = "io.matthewnelson.kmp-tor:resource-exec-tor", version.ref = "kmp-tor-resource" }
37-
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
37+
kmp-tor-resource-exec-tor = { module = "io.matthewnelson.kmp-tor:resource-exec-tor", version.ref = "kmp-tor-resource" }
38+
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
3839

3940
[plugins]
40-
android-library = { id = "com.android.library", version.ref = "gradle-android" }
41-
binary-compat = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "gradle-binary-compat" }
42-
dokka = { id = "org.jetbrains.dokka", version.ref = "gradle-dokka" }
43-
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "gradle-kotlin" }
41+
android-library = { id = "com.android.library", version.ref = "gradle-android" }
42+
binary-compat = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "gradle-binary-compat" }
43+
dokka = { id = "org.jetbrains.dokka", version.ref = "gradle-dokka" }
44+
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "gradle-kotlin" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ zipStorePath=wrapper/dists
55
zipStoreBase=GRADLE_USER_HOME
66

77
# https://gradle.org/release-checksums/
8-
distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
9-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
8+
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
9+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip

library/process-testing/src/commonTest/kotlin/io/matthewnelson/kmp/process/testing/ProcessBaseTest.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import kotlin.time.Duration
3232
import kotlin.time.Duration.Companion.milliseconds
3333
import kotlin.time.Duration.Companion.seconds
3434

35-
@Suppress("DEPRECATION")
35+
@Suppress("DEPRECATION", "UnusedReceiverParameter")
3636
abstract class ProcessBaseTest {
3737

3838
protected open val IsAndroidInstrumentTest: Boolean = false
@@ -213,6 +213,11 @@ abstract class ProcessBaseTest {
213213

214214
@Test
215215
fun givenFeed_whenExceptionHandler_thenNotifies() = runTest(timeout = 5.seconds) {
216+
if (IsWindows) {
217+
println("Skipping...")
218+
return@runTest
219+
}
220+
216221
val shouldThrow = !IsAndroidInstrumentTest && !IsNodeJs
217222

218223
var invocationError = 0
@@ -233,7 +238,7 @@ abstract class ProcessBaseTest {
233238
.stderr(Stdio.Pipe)
234239
.spawn()
235240
} catch (e: IOException) {
236-
if (IsDarwinMobile || IsWindows) {
241+
if (IsDarwinMobile) {
237242
println("Skipping...")
238243
return@runTest
239244
}

0 commit comments

Comments
 (0)