From fd36717a3fb3a5b36175cc906a28ff47177c0cf7 Mon Sep 17 00:00:00 2001 From: Piotr Krzeminski Date: Fri, 22 May 2026 13:09:03 +0200 Subject: [PATCH] Move src/main/ to src/jsMain/ across web, worker, serviceworker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a pure structural move — no code changes. The old Kotlin 1.x source layout (src/main/kotlin) is replaced with the Kotlin 2.x layout (src/jsMain/kotlin). Temporary source dir overrides are added to build.gradle.kts files so the project still compiles on Kotlin 1.5.10. --- web/build.gradle.kts | 2 ++ web/serviceworker/build.gradle.kts | 1 + .../kotlin/it/krzeminski/fsynth/web/serviceworker/main.kt | 0 .../kotlin/it/krzeminski/fsynth/PlaybackCustomization.kt | 0 web/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/Player.kt | 0 .../kotlin/it/krzeminski/fsynth/SynthesisWorkerProxy.kt | 0 .../{main => jsMain}/kotlin/it/krzeminski/fsynth/VersionInfo.kt | 0 .../{main => jsMain}/kotlin/it/krzeminski/fsynth/Wavesurfer.kt | 0 web/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/main.kt | 0 .../kotlin/it/krzeminski/fsynth/typings/AudioBufferToWav.kt | 0 .../kotlin/it/krzeminski/fsynth/typings/AudioRelatedClasses.kt | 0 .../kotlin/it/krzeminski/fsynth/typings/WaveSurfer.kt | 0 .../kotlin/it/krzeminski/testutils/TimeMeasurement.kt | 0 web/src/{main => jsMain}/resources/Logo.svg | 0 web/src/{main => jsMain}/resources/index.html | 0 web/src/{main => jsMain}/resources/manifest.webmanifest | 0 web/worker/build.gradle.kts | 1 + .../kotlin/it/krzeminski/fsynth/web/worker/WebSoundRendering.kt | 0 .../kotlin/it/krzeminski/fsynth/web/worker/main.kt | 0 .../krzeminski/fsynth/web/worker/testutils/TimeMeasurement.kt | 0 .../krzeminski/fsynth/web/worker/typings/AudioRelatedClasses.kt | 0 21 files changed, 4 insertions(+) rename web/serviceworker/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/web/serviceworker/main.kt (100%) rename web/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/PlaybackCustomization.kt (100%) rename web/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/Player.kt (100%) rename web/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/SynthesisWorkerProxy.kt (100%) rename web/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/VersionInfo.kt (100%) rename web/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/Wavesurfer.kt (100%) rename web/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/main.kt (100%) rename web/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/typings/AudioBufferToWav.kt (100%) rename web/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/typings/AudioRelatedClasses.kt (100%) rename web/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/typings/WaveSurfer.kt (100%) rename web/src/{main => jsMain}/kotlin/it/krzeminski/testutils/TimeMeasurement.kt (100%) rename web/src/{main => jsMain}/resources/Logo.svg (100%) rename web/src/{main => jsMain}/resources/index.html (100%) rename web/src/{main => jsMain}/resources/manifest.webmanifest (100%) rename web/worker/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/web/worker/WebSoundRendering.kt (100%) rename web/worker/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/web/worker/main.kt (100%) rename web/worker/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/web/worker/testutils/TimeMeasurement.kt (100%) rename web/worker/src/{main => jsMain}/kotlin/it/krzeminski/fsynth/web/worker/typings/AudioRelatedClasses.kt (100%) diff --git a/web/build.gradle.kts b/web/build.gradle.kts index 3d41adc..b82b201 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -27,6 +27,8 @@ kotlin { sourceSets { val main by getting { + kotlin.srcDirs("src/jsMain/kotlin") + resources.srcDirs("src/jsMain/resources") dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion") implementation("org.jetbrains.kotlin-wrappers:kotlin-react:$reactVersion-$jsWrappersVersion-kotlin-$kotlinVersion") diff --git a/web/serviceworker/build.gradle.kts b/web/serviceworker/build.gradle.kts index c1a7891..ce46e6a 100644 --- a/web/serviceworker/build.gradle.kts +++ b/web/serviceworker/build.gradle.kts @@ -17,6 +17,7 @@ kotlin { sourceSets { val main by getting { + kotlin.srcDirs("src/jsMain/kotlin") dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion") } diff --git a/web/serviceworker/src/main/kotlin/it/krzeminski/fsynth/web/serviceworker/main.kt b/web/serviceworker/src/jsMain/kotlin/it/krzeminski/fsynth/web/serviceworker/main.kt similarity index 100% rename from web/serviceworker/src/main/kotlin/it/krzeminski/fsynth/web/serviceworker/main.kt rename to web/serviceworker/src/jsMain/kotlin/it/krzeminski/fsynth/web/serviceworker/main.kt diff --git a/web/src/main/kotlin/it/krzeminski/fsynth/PlaybackCustomization.kt b/web/src/jsMain/kotlin/it/krzeminski/fsynth/PlaybackCustomization.kt similarity index 100% rename from web/src/main/kotlin/it/krzeminski/fsynth/PlaybackCustomization.kt rename to web/src/jsMain/kotlin/it/krzeminski/fsynth/PlaybackCustomization.kt diff --git a/web/src/main/kotlin/it/krzeminski/fsynth/Player.kt b/web/src/jsMain/kotlin/it/krzeminski/fsynth/Player.kt similarity index 100% rename from web/src/main/kotlin/it/krzeminski/fsynth/Player.kt rename to web/src/jsMain/kotlin/it/krzeminski/fsynth/Player.kt diff --git a/web/src/main/kotlin/it/krzeminski/fsynth/SynthesisWorkerProxy.kt b/web/src/jsMain/kotlin/it/krzeminski/fsynth/SynthesisWorkerProxy.kt similarity index 100% rename from web/src/main/kotlin/it/krzeminski/fsynth/SynthesisWorkerProxy.kt rename to web/src/jsMain/kotlin/it/krzeminski/fsynth/SynthesisWorkerProxy.kt diff --git a/web/src/main/kotlin/it/krzeminski/fsynth/VersionInfo.kt b/web/src/jsMain/kotlin/it/krzeminski/fsynth/VersionInfo.kt similarity index 100% rename from web/src/main/kotlin/it/krzeminski/fsynth/VersionInfo.kt rename to web/src/jsMain/kotlin/it/krzeminski/fsynth/VersionInfo.kt diff --git a/web/src/main/kotlin/it/krzeminski/fsynth/Wavesurfer.kt b/web/src/jsMain/kotlin/it/krzeminski/fsynth/Wavesurfer.kt similarity index 100% rename from web/src/main/kotlin/it/krzeminski/fsynth/Wavesurfer.kt rename to web/src/jsMain/kotlin/it/krzeminski/fsynth/Wavesurfer.kt diff --git a/web/src/main/kotlin/it/krzeminski/fsynth/main.kt b/web/src/jsMain/kotlin/it/krzeminski/fsynth/main.kt similarity index 100% rename from web/src/main/kotlin/it/krzeminski/fsynth/main.kt rename to web/src/jsMain/kotlin/it/krzeminski/fsynth/main.kt diff --git a/web/src/main/kotlin/it/krzeminski/fsynth/typings/AudioBufferToWav.kt b/web/src/jsMain/kotlin/it/krzeminski/fsynth/typings/AudioBufferToWav.kt similarity index 100% rename from web/src/main/kotlin/it/krzeminski/fsynth/typings/AudioBufferToWav.kt rename to web/src/jsMain/kotlin/it/krzeminski/fsynth/typings/AudioBufferToWav.kt diff --git a/web/src/main/kotlin/it/krzeminski/fsynth/typings/AudioRelatedClasses.kt b/web/src/jsMain/kotlin/it/krzeminski/fsynth/typings/AudioRelatedClasses.kt similarity index 100% rename from web/src/main/kotlin/it/krzeminski/fsynth/typings/AudioRelatedClasses.kt rename to web/src/jsMain/kotlin/it/krzeminski/fsynth/typings/AudioRelatedClasses.kt diff --git a/web/src/main/kotlin/it/krzeminski/fsynth/typings/WaveSurfer.kt b/web/src/jsMain/kotlin/it/krzeminski/fsynth/typings/WaveSurfer.kt similarity index 100% rename from web/src/main/kotlin/it/krzeminski/fsynth/typings/WaveSurfer.kt rename to web/src/jsMain/kotlin/it/krzeminski/fsynth/typings/WaveSurfer.kt diff --git a/web/src/main/kotlin/it/krzeminski/testutils/TimeMeasurement.kt b/web/src/jsMain/kotlin/it/krzeminski/testutils/TimeMeasurement.kt similarity index 100% rename from web/src/main/kotlin/it/krzeminski/testutils/TimeMeasurement.kt rename to web/src/jsMain/kotlin/it/krzeminski/testutils/TimeMeasurement.kt diff --git a/web/src/main/resources/Logo.svg b/web/src/jsMain/resources/Logo.svg similarity index 100% rename from web/src/main/resources/Logo.svg rename to web/src/jsMain/resources/Logo.svg diff --git a/web/src/main/resources/index.html b/web/src/jsMain/resources/index.html similarity index 100% rename from web/src/main/resources/index.html rename to web/src/jsMain/resources/index.html diff --git a/web/src/main/resources/manifest.webmanifest b/web/src/jsMain/resources/manifest.webmanifest similarity index 100% rename from web/src/main/resources/manifest.webmanifest rename to web/src/jsMain/resources/manifest.webmanifest diff --git a/web/worker/build.gradle.kts b/web/worker/build.gradle.kts index 67ae00a..86ac9d0 100644 --- a/web/worker/build.gradle.kts +++ b/web/worker/build.gradle.kts @@ -17,6 +17,7 @@ kotlin { sourceSets { val main by getting { + kotlin.srcDirs("src/jsMain/kotlin") dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.4.3-native-mt") diff --git a/web/worker/src/main/kotlin/it/krzeminski/fsynth/web/worker/WebSoundRendering.kt b/web/worker/src/jsMain/kotlin/it/krzeminski/fsynth/web/worker/WebSoundRendering.kt similarity index 100% rename from web/worker/src/main/kotlin/it/krzeminski/fsynth/web/worker/WebSoundRendering.kt rename to web/worker/src/jsMain/kotlin/it/krzeminski/fsynth/web/worker/WebSoundRendering.kt diff --git a/web/worker/src/main/kotlin/it/krzeminski/fsynth/web/worker/main.kt b/web/worker/src/jsMain/kotlin/it/krzeminski/fsynth/web/worker/main.kt similarity index 100% rename from web/worker/src/main/kotlin/it/krzeminski/fsynth/web/worker/main.kt rename to web/worker/src/jsMain/kotlin/it/krzeminski/fsynth/web/worker/main.kt diff --git a/web/worker/src/main/kotlin/it/krzeminski/fsynth/web/worker/testutils/TimeMeasurement.kt b/web/worker/src/jsMain/kotlin/it/krzeminski/fsynth/web/worker/testutils/TimeMeasurement.kt similarity index 100% rename from web/worker/src/main/kotlin/it/krzeminski/fsynth/web/worker/testutils/TimeMeasurement.kt rename to web/worker/src/jsMain/kotlin/it/krzeminski/fsynth/web/worker/testutils/TimeMeasurement.kt diff --git a/web/worker/src/main/kotlin/it/krzeminski/fsynth/web/worker/typings/AudioRelatedClasses.kt b/web/worker/src/jsMain/kotlin/it/krzeminski/fsynth/web/worker/typings/AudioRelatedClasses.kt similarity index 100% rename from web/worker/src/main/kotlin/it/krzeminski/fsynth/web/worker/typings/AudioRelatedClasses.kt rename to web/worker/src/jsMain/kotlin/it/krzeminski/fsynth/web/worker/typings/AudioRelatedClasses.kt