From 96a8b5cc7d6c3420765a0a9814db44a0a2627374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20F=C3=A3o=20Valvassori?= Date: Tue, 20 Aug 2024 18:48:24 +0200 Subject: [PATCH 01/10] Bumping patch version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 35e2f36..e074689 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ SONATYPE_HOST=DEFAULT RELEASE_SIGNING_ENABLED=true GROUP=co.touchlab -VERSION_NAME=2.0.7 +VERSION_NAME=2.0.8 POM_NAME=Stately POM_DESCRIPTION=Multithreaded Kotlin Multiplatform Utilities From 6d16364c89e6e345a3220af85de538e90979f8e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20F=C3=A3o=20Valvassori?= Date: Tue, 20 Aug 2024 19:00:29 +0200 Subject: [PATCH 02/10] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e074689..d0c5364 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ SONATYPE_HOST=DEFAULT RELEASE_SIGNING_ENABLED=true GROUP=co.touchlab -VERSION_NAME=2.0.8 +VERSION_NAME=2.1.0 POM_NAME=Stately POM_DESCRIPTION=Multithreaded Kotlin Multiplatform Utilities From 02bbdf3058bc8c46cb90cf1049b109f587dd7cfb Mon Sep 17 00:00:00 2001 From: Gustavo Fao Valvassori Date: Tue, 20 Aug 2024 16:33:29 -0300 Subject: [PATCH 03/10] browser test timeout --- .../src/main/kotlin/kmp-setup.gradle.kts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts b/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts index bc463e3..a421ece 100644 --- a/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts +++ b/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts @@ -1,5 +1,6 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import java.time.Duration plugins { kotlin("multiplatform") @@ -20,7 +21,15 @@ kotlin { } } } - browser() + browser { + testTask { + useKarma { + useChromeHeadless() + // Override default timeout (needed for stress tests) + timeout.set(Duration.ofSeconds(120)) + } + } + } } @OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class) wasmJs { From bc1298a8a15466fb9d7c1b6a8581e9728255364e Mon Sep 17 00:00:00 2001 From: Gustavo Fao Valvassori Date: Wed, 21 Aug 2024 09:24:17 -0300 Subject: [PATCH 04/10] uploading test results --- .github/workflows/build.yml | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b45038b..b26d25e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,15 +45,40 @@ jobs: ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.SIGNING_KEY }} ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }} - - name: Zip Stately Collections Build Results + - name: Zip Stately Build Results if: always() - run: zip stately-connections-bulid.zip deprecated/stately-collections/build/reports/tests/* -r + run: | + zip stately-collections-build.zip deprecated/stately-collections/build/reports/tests/* -r + zip stately-common-build.zip deprecated/stately-common/build/reports/tests/* -r + zip stately-iso-collections.zip deprecated/stately-iso-collections/build/reports/tests/* -r + zip stately-isolate.zip deprecated/stately-isolate/build/reports/tests/* -r - name: Upload Stately Collections Build Results if: always() uses: actions/upload-artifact@v2 with: - name: stately-connections-bulid - path: stately-connections-bulid.zip + name: stately-collections-build + path: stately-collections-build.zip + + - name: Upload Stately Common Build Results + if: always() + uses: actions/upload-artifact@v2 + with: + name: stately-common-build + path: stately-common-build.zip + + - name: Upload Stately Iso Collections Build Results + if: always() + uses: actions/upload-artifact@v2 + with: + name: stately-iso-collections + path: stately-iso-collections.zip + + - name: Upload Stately Isolate Build Results + if: always() + uses: actions/upload-artifact@v2 + with: + name: stately-isolate + path: stately-isolate.zip env: GRADLE_OPTS: -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m" From 52be66bd03d3171b04a6ec8b3dbd2246293dc26b Mon Sep 17 00:00:00 2001 From: Gustavo Fao Valvassori Date: Wed, 21 Aug 2024 10:16:52 -0300 Subject: [PATCH 05/10] updated zip command --- .github/workflows/build.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b26d25e..fded1b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,6 @@ jobs: if: always() run: | zip stately-collections-build.zip deprecated/stately-collections/build/reports/tests/* -r - zip stately-common-build.zip deprecated/stately-common/build/reports/tests/* -r zip stately-iso-collections.zip deprecated/stately-iso-collections/build/reports/tests/* -r zip stately-isolate.zip deprecated/stately-isolate/build/reports/tests/* -r @@ -60,13 +59,6 @@ jobs: name: stately-collections-build path: stately-collections-build.zip - - name: Upload Stately Common Build Results - if: always() - uses: actions/upload-artifact@v2 - with: - name: stately-common-build - path: stately-common-build.zip - - name: Upload Stately Iso Collections Build Results if: always() uses: actions/upload-artifact@v2 From ca30b808080185275b53b181bc18501290f3b60e Mon Sep 17 00:00:00 2001 From: Gustavo Fao Valvassori Date: Wed, 21 Aug 2024 14:29:10 -0300 Subject: [PATCH 06/10] updated upload command --- .github/workflows/build.yml | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fded1b4..482c298 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,32 +45,11 @@ jobs: ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.SIGNING_KEY }} ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }} - - name: Zip Stately Build Results - if: always() - run: | - zip stately-collections-build.zip deprecated/stately-collections/build/reports/tests/* -r - zip stately-iso-collections.zip deprecated/stately-iso-collections/build/reports/tests/* -r - zip stately-isolate.zip deprecated/stately-isolate/build/reports/tests/* -r - - name: Upload Stately Collections Build Results if: always() uses: actions/upload-artifact@v2 with: - name: stately-collections-build - path: stately-collections-build.zip - - - name: Upload Stately Iso Collections Build Results - if: always() - uses: actions/upload-artifact@v2 - with: - name: stately-iso-collections - path: stately-iso-collections.zip - - - name: Upload Stately Isolate Build Results - if: always() - uses: actions/upload-artifact@v2 - with: - name: stately-isolate - path: stately-isolate.zip + name: deprecated-test-results + path: deprecated/**/build/reports/tests/ env: GRADLE_OPTS: -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m" From 7e87e687979f5b746395b7b16ae18127a876fd55 Mon Sep 17 00:00:00 2001 From: Gustavo Fao Valvassori Date: Wed, 21 Aug 2024 15:01:21 -0300 Subject: [PATCH 07/10] reverting timeout --- .../src/main/kotlin/kmp-setup.gradle.kts | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts b/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts index a421ece..a20620b 100644 --- a/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts +++ b/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts @@ -21,15 +21,7 @@ kotlin { } } } - browser { - testTask { - useKarma { - useChromeHeadless() - // Override default timeout (needed for stress tests) - timeout.set(Duration.ofSeconds(120)) - } - } - } + browser() } @OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class) wasmJs { From 1f4e826af9c0a8bf7eacce37471c950a7eed64a7 Mon Sep 17 00:00:00 2001 From: Gustavo Fao Valvassori Date: Wed, 21 Aug 2024 15:01:48 -0300 Subject: [PATCH 08/10] removed import --- convention-plugins/src/main/kotlin/kmp-setup.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts b/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts index a20620b..bc463e3 100644 --- a/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts +++ b/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts @@ -1,6 +1,5 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -import java.time.Duration plugins { kotlin("multiplatform") From 0a4643c068d352ebd408f790ac34822a0a3244f4 Mon Sep 17 00:00:00 2001 From: Gustavo Fao Valvassori Date: Wed, 21 Aug 2024 15:52:49 -0300 Subject: [PATCH 09/10] reducing loops --- .../co/touchlab/stately/collections/SharedLinkedListTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedLinkedListTest.kt b/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedLinkedListTest.kt index bb37727..9c48794 100644 --- a/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedLinkedListTest.kt +++ b/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedLinkedListTest.kt @@ -443,7 +443,7 @@ class LinkedListTest { */ @Test fun testBasicThreads() { - val LOOPS = 2500 + val LOOPS = 500 val ops = ThreadOperations { SharedLinkedList() } val ll = SharedLinkedList().freeze() From effe7c70d04fe1f0d103e82fa35b00be34f712c5 Mon Sep 17 00:00:00 2001 From: Gustavo Fao Valvassori Date: Wed, 21 Aug 2024 17:13:39 -0300 Subject: [PATCH 10/10] reducing loops again --- .../kotlin/co/touchlab/stately/isolate/IsoStateTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deprecated/stately-isolate/src/commonTest/kotlin/co/touchlab/stately/isolate/IsoStateTest.kt b/deprecated/stately-isolate/src/commonTest/kotlin/co/touchlab/stately/isolate/IsoStateTest.kt index 47473c3..444edda 100644 --- a/deprecated/stately-isolate/src/commonTest/kotlin/co/touchlab/stately/isolate/IsoStateTest.kt +++ b/deprecated/stately-isolate/src/commonTest/kotlin/co/touchlab/stately/isolate/IsoStateTest.kt @@ -17,7 +17,7 @@ class IsoStateTest { val ops = ThreadOperations {} val isoList = IsolateState { mutableListOf() } - repeat(100_000) { rcount -> + repeat(5_000) { rcount -> ops.exe { isoList.access { l -> l.add(SomeData("arst $rcount")) @@ -31,7 +31,7 @@ class IsoStateTest { l.size } - assertEquals(100_000, lsize) + assertEquals(5_000, lsize) }