From b9d01931711b106c70d620df2f45b5908301615c Mon Sep 17 00:00:00 2001 From: Victor Kropp Date: Tue, 6 Oct 2026 13:40:17 +0200 Subject: [PATCH 1/4] convert CodeViewer example to Kotlin Toolchain --- examples/codeviewer/.gitattributes | 4 + examples/codeviewer/.gitignore | 22 +- examples/codeviewer/.run/desktopApp.run.xml | 28 -- examples/codeviewer/README.md | 27 +- .../{src/main => }/assets/data/EditorView.kt | 0 .../codeviewer/androidApp/build.gradle.kts | 35 -- examples/codeviewer/androidApp/module.yaml | 14 + .../res/drawable/ic_launcher_foreground.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../main => }/res/values-night/styles.xml | 0 .../res/values/ic_launcher_background.xml | 0 .../{src/main => }/res/values/strings.xml | 0 .../{src/main => }/res/values/styles.xml | 0 .../src/{main => }/AndroidManifest.xml | 2 +- .../org/jetbrains/codeviewer/MainActivity.kt | 0 examples/codeviewer/build.gradle.kts | 10 - .../codeviewer/desktopApp/build.gradle.kts | 41 -- examples/codeviewer/desktopApp/module.yaml | 11 + .../jvmMain => }/resources/ic_launcher.png | Bin .../org/jetbrains/codeviewer/main.kt | 0 examples/codeviewer/gradle.properties | 10 - examples/codeviewer/gradle/libs.versions.toml | 27 -- .../gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 8 - examples/codeviewer/gradlew | 240 ----------- examples/codeviewer/gradlew.bat | 91 ----- .../iosApp/Configuration/Config.xcconfig | 3 - .../iosApp/iosApp.xcodeproj/project.pbxproj | 382 ------------------ examples/codeviewer/iosApp/iosApp/Info.plist | 50 --- .../Preview Assets.xcassets/Contents.json | 6 - .../iosApp/module.xcodeproj/project.pbxproj | 221 ++++++++++ .../xcschemes/Module iosApp.xcscheme | 80 ++++ examples/codeviewer/iosApp/module.yaml | 8 + .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 .../iosApp/{iosApp => src}/ContentView.swift | 2 +- examples/codeviewer/iosApp/src/Info.plist | 41 ++ .../iosApp/{iosApp => src}/iOSApp.swift | 0 .../iosMain/kotlin => iosApp/src}/main.ios.kt | 0 examples/codeviewer/kotlin | 292 +++++++++++++ examples/codeviewer/kotlin.bat | 280 +++++++++++++ examples/codeviewer/libs.versions.toml | 17 + examples/codeviewer/project.yaml | 5 + examples/codeviewer/run-configurations.png | Bin 17480 -> 0 bytes examples/codeviewer/settings.gradle.kts | 33 -- examples/codeviewer/shared/build.gradle.kts | 63 --- .../composeResources/files/EditorView.kt | 183 +++++++++ .../font/jetbrainsmono_bold.ttf | Bin .../font/jetbrainsmono_bold_italic.ttf | Bin .../font/jetbrainsmono_extrabold.ttf | Bin .../font/jetbrainsmono_extrabold_italic.ttf | Bin .../font/jetbrainsmono_italic.ttf | Bin .../font/jetbrainsmono_medium.ttf | Bin .../font/jetbrainsmono_medium_italic.ttf | Bin .../font/jetbrainsmono_regular.ttf | Bin examples/codeviewer/shared/module.yaml | 28 ++ .../src/androidMain/AndroidManifest.xml | 2 - .../org/jetbrains/codeviewer/platform/File.kt | 0 .../jetbrains/codeviewer/platform/Mouse.kt | 0 .../codeviewer/platform/Scrollbar.kt | 0 .../org/jetbrains/codeviewer/ui/CodeViewer.kt | 0 .../jetbrains/codeviewer/ui/CodeViewerView.kt | 0 .../org/jetbrains/codeviewer/ui/MainView.kt | 0 .../jetbrains/codeviewer/ui/common/Fonts.kt | 0 .../codeviewer/ui/common/Settings.kt | 0 .../jetbrains/codeviewer/ui/common/Theme.kt | 0 .../jetbrains/codeviewer/ui/editor/Editor.kt | 0 .../codeviewer/ui/editor/EditorEmptyView.kt | 0 .../codeviewer/ui/editor/EditorTabsView.kt | 0 .../codeviewer/ui/editor/EditorView.kt | 0 .../jetbrains/codeviewer/ui/editor/Editors.kt | 0 .../codeviewer/ui/filetree/FileTree.kt | 0 .../codeviewer/ui/filetree/FileTreeView.kt | 0 .../codeviewer/ui/statusbar/StatusBar.kt | 0 .../codeviewer/util/LayoutModifiers.kt | 0 .../org/jetbrains/codeviewer/util/Loadable.kt | 0 .../codeviewer/util/SingleSelection.kt | 0 .../jetbrains/codeviewer/util/TextLines.kt | 0 .../codeviewer/util/VerticalSplittable.kt | 0 .../kotlin => src@android}/main.android.kt | 0 .../org/jetbrains/codeviewer/platform/File.kt | 0 .../jetbrains/codeviewer/platform/Mouse.kt | 0 .../codeviewer/platform/Scrollbar.kt | 0 .../org/jetbrains/codeviewer/platform/File.kt | 2 +- .../jetbrains/codeviewer/platform/Mouse.kt | 0 .../codeviewer/platform/Scrollbar.kt | 0 .../kotlin => src@jvm}/main.desktop.kt | 0 .../org/jetbrains/codeviewer/platform/File.kt | 0 .../jetbrains/codeviewer/platform/Mouse.kt | 0 .../codeviewer/platform/Scrollbar.kt | 0 .../jetbrains/codeviewer/platform/JvmFile.kt | 0 examples/validateExamples.sh | 11 +- examples/validateExamplesAndroid.sh | 11 +- examples/validateExamplesIos.sh | 11 +- 96 files changed, 1241 insertions(+), 1060 deletions(-) create mode 100644 examples/codeviewer/.gitattributes delete mode 100644 examples/codeviewer/.run/desktopApp.run.xml rename examples/codeviewer/androidApp/{src/main => }/assets/data/EditorView.kt (100%) delete mode 100644 examples/codeviewer/androidApp/build.gradle.kts create mode 100644 examples/codeviewer/androidApp/module.yaml rename examples/codeviewer/androidApp/{src/main => }/res/drawable/ic_launcher_foreground.xml (100%) rename examples/codeviewer/androidApp/{src/main => }/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename examples/codeviewer/androidApp/{src/main => }/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename examples/codeviewer/androidApp/{src/main => }/res/values-night/styles.xml (100%) rename examples/codeviewer/androidApp/{src/main => }/res/values/ic_launcher_background.xml (100%) rename examples/codeviewer/androidApp/{src/main => }/res/values/strings.xml (100%) rename examples/codeviewer/androidApp/{src/main => }/res/values/styles.xml (100%) rename examples/codeviewer/androidApp/src/{main => }/AndroidManifest.xml (92%) rename examples/codeviewer/androidApp/src/{main/kotlin => }/org/jetbrains/codeviewer/MainActivity.kt (100%) delete mode 100644 examples/codeviewer/build.gradle.kts delete mode 100644 examples/codeviewer/desktopApp/build.gradle.kts create mode 100644 examples/codeviewer/desktopApp/module.yaml rename examples/codeviewer/desktopApp/{src/jvmMain => }/resources/ic_launcher.png (100%) rename examples/codeviewer/desktopApp/src/{jvmMain/kotlin => }/org/jetbrains/codeviewer/main.kt (100%) delete mode 100644 examples/codeviewer/gradle.properties delete mode 100644 examples/codeviewer/gradle/libs.versions.toml delete mode 100644 examples/codeviewer/gradle/wrapper/gradle-wrapper.jar delete mode 100644 examples/codeviewer/gradle/wrapper/gradle-wrapper.properties delete mode 100755 examples/codeviewer/gradlew delete mode 100644 examples/codeviewer/gradlew.bat delete mode 100644 examples/codeviewer/iosApp/Configuration/Config.xcconfig delete mode 100644 examples/codeviewer/iosApp/iosApp.xcodeproj/project.pbxproj delete mode 100644 examples/codeviewer/iosApp/iosApp/Info.plist delete mode 100644 examples/codeviewer/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json create mode 100644 examples/codeviewer/iosApp/module.xcodeproj/project.pbxproj create mode 100644 examples/codeviewer/iosApp/module.xcodeproj/xcshareddata/xcschemes/Module iosApp.xcscheme create mode 100644 examples/codeviewer/iosApp/module.yaml rename examples/codeviewer/iosApp/{iosApp => src}/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename examples/codeviewer/iosApp/{iosApp => src}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename examples/codeviewer/iosApp/{iosApp => src}/Assets.xcassets/Contents.json (100%) rename examples/codeviewer/iosApp/{iosApp => src}/ContentView.swift (95%) create mode 100644 examples/codeviewer/iosApp/src/Info.plist rename examples/codeviewer/iosApp/{iosApp => src}/iOSApp.swift (100%) rename examples/codeviewer/{shared/src/iosMain/kotlin => iosApp/src}/main.ios.kt (100%) create mode 100755 examples/codeviewer/kotlin create mode 100755 examples/codeviewer/kotlin.bat create mode 100644 examples/codeviewer/libs.versions.toml create mode 100644 examples/codeviewer/project.yaml delete mode 100644 examples/codeviewer/run-configurations.png delete mode 100644 examples/codeviewer/settings.gradle.kts delete mode 100644 examples/codeviewer/shared/build.gradle.kts create mode 100644 examples/codeviewer/shared/composeResources/files/EditorView.kt rename examples/codeviewer/shared/{src/commonMain => }/composeResources/font/jetbrainsmono_bold.ttf (100%) rename examples/codeviewer/shared/{src/commonMain => }/composeResources/font/jetbrainsmono_bold_italic.ttf (100%) rename examples/codeviewer/shared/{src/commonMain => }/composeResources/font/jetbrainsmono_extrabold.ttf (100%) rename examples/codeviewer/shared/{src/commonMain => }/composeResources/font/jetbrainsmono_extrabold_italic.ttf (100%) rename examples/codeviewer/shared/{src/commonMain => }/composeResources/font/jetbrainsmono_italic.ttf (100%) rename examples/codeviewer/shared/{src/commonMain => }/composeResources/font/jetbrainsmono_medium.ttf (100%) rename examples/codeviewer/shared/{src/commonMain => }/composeResources/font/jetbrainsmono_medium_italic.ttf (100%) rename examples/codeviewer/shared/{src/commonMain => }/composeResources/font/jetbrainsmono_regular.ttf (100%) create mode 100644 examples/codeviewer/shared/module.yaml delete mode 100644 examples/codeviewer/shared/src/androidMain/AndroidManifest.xml rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/platform/File.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/platform/Mouse.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/platform/Scrollbar.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/CodeViewer.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/CodeViewerView.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/MainView.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/common/Fonts.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/common/Settings.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/common/Theme.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/editor/Editor.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/editor/EditorEmptyView.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/editor/EditorTabsView.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/editor/EditorView.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/editor/Editors.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/filetree/FileTree.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/ui/statusbar/StatusBar.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/util/LayoutModifiers.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/util/Loadable.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/util/SingleSelection.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/util/TextLines.kt (100%) rename examples/codeviewer/shared/src/{commonMain/kotlin => }/org/jetbrains/codeviewer/util/VerticalSplittable.kt (100%) rename examples/codeviewer/shared/{src/androidMain/kotlin => src@android}/main.android.kt (100%) rename examples/codeviewer/shared/{src/androidMain/kotlin => src@android}/org/jetbrains/codeviewer/platform/File.kt (100%) rename examples/codeviewer/shared/{src/androidMain/kotlin => src@android}/org/jetbrains/codeviewer/platform/Mouse.kt (100%) rename examples/codeviewer/shared/{src/androidMain/kotlin => src@android}/org/jetbrains/codeviewer/platform/Scrollbar.kt (100%) rename examples/codeviewer/shared/{src/iosMain/kotlin => src@ios}/org/jetbrains/codeviewer/platform/File.kt (95%) rename examples/codeviewer/shared/{src/iosMain/kotlin => src@ios}/org/jetbrains/codeviewer/platform/Mouse.kt (100%) rename examples/codeviewer/shared/{src/iosMain/kotlin => src@ios}/org/jetbrains/codeviewer/platform/Scrollbar.kt (100%) rename examples/codeviewer/shared/{src/desktopMain/kotlin => src@jvm}/main.desktop.kt (100%) rename examples/codeviewer/shared/{src/desktopMain/kotlin => src@jvm}/org/jetbrains/codeviewer/platform/File.kt (100%) rename examples/codeviewer/shared/{src/desktopMain/kotlin => src@jvm}/org/jetbrains/codeviewer/platform/Mouse.kt (100%) rename examples/codeviewer/shared/{src/desktopMain/kotlin => src@jvm}/org/jetbrains/codeviewer/platform/Scrollbar.kt (100%) rename examples/codeviewer/shared/{src/jvmMain/kotlin => src@jvmAndAndroid}/org/jetbrains/codeviewer/platform/JvmFile.kt (100%) diff --git a/examples/codeviewer/.gitattributes b/examples/codeviewer/.gitattributes new file mode 100644 index 00000000000..f539da4fa1d --- /dev/null +++ b/examples/codeviewer/.gitattributes @@ -0,0 +1,4 @@ +*.bat text eol=crlf + +# Kotlin CLI wrapper without extension +kotlin text eol=lf diff --git a/examples/codeviewer/.gitignore b/examples/codeviewer/.gitignore index 6e5f30477c5..7c1a2b3a43b 100644 --- a/examples/codeviewer/.gitignore +++ b/examples/codeviewer/.gitignore @@ -1,15 +1,11 @@ +build/ +.kotlin/ +.idea/ *.iml -.gradle -/local.properties -/.idea .DS_Store -build/ -/captures -.externalNativeBuild -.cxx -iosApp/Podfile.lock -iosApp/Pods/* -iosApp/iosApp.xcworkspace/* -iosApp/iosApp.xcodeproj/* -!iosApp/iosApp.xcodeproj/project.pbxproj -shared/shared.podspec +**/module.xcodeproj/* +!**/module.xcodeproj/project.pbxproj +!**/module.xcodeproj/xcshareddata/ +!**/module.xcodeproj/project.xcworkspace/ +**/xcshareddata/WorkspaceSettings.xcsettings +xcuserdata diff --git a/examples/codeviewer/.run/desktopApp.run.xml b/examples/codeviewer/.run/desktopApp.run.xml deleted file mode 100644 index 2d56d7f072a..00000000000 --- a/examples/codeviewer/.run/desktopApp.run.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - true - true - false - - - \ No newline at end of file diff --git a/examples/codeviewer/README.md b/examples/codeviewer/README.md index 2c680764cfe..1b2fa951cd9 100644 --- a/examples/codeviewer/README.md +++ b/examples/codeviewer/README.md @@ -1,24 +1,27 @@ # Code Viewer Code Viewer example for Desktop, Android and iOS written in Compose Multiplatform. +The project is built with the [Kotlin Toolchain](https://github.com/JetBrains/kotlin-toolchain). + ## Setting up your development environment -To setup the environment, please consult these [instructions](https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-multiplatform-setup.html). +To set up the environment, please consult these [instructions](https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-multiplatform-setup.html). + +Open the project in IntelliJ IDEA with the Kotlin Toolchain plugin and use the run gutter icons or run configurations +to launch the app on the target of your choice. + +## Run desktop app -## How to run +`./kotlin run -m desktopApp` -Choose a run configuration for an appropriate target in Android Studio and run it. +## Run Android app -![run-configurations.png](run-configurations.png) +`./kotlin run -m androidApp` -## Run desktop via Gradle +## Run iOS app -`./gradlew desktopApp:run` +`./kotlin run -m iosApp` -### Building native desktop distribution -``` -./gradlew :desktop:packageDistributionForCurrentOS -# outputs are written to desktop/build/compose/binaries -``` +or open `iosApp/module.xcodeproj` in Xcode. -![Desktop](screenshots/codeviewer.png) \ No newline at end of file +![Desktop](screenshots/codeviewer.png) diff --git a/examples/codeviewer/androidApp/src/main/assets/data/EditorView.kt b/examples/codeviewer/androidApp/assets/data/EditorView.kt similarity index 100% rename from examples/codeviewer/androidApp/src/main/assets/data/EditorView.kt rename to examples/codeviewer/androidApp/assets/data/EditorView.kt diff --git a/examples/codeviewer/androidApp/build.gradle.kts b/examples/codeviewer/androidApp/build.gradle.kts deleted file mode 100644 index c02e2e322d4..00000000000 --- a/examples/codeviewer/androidApp/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - -plugins { - alias(libs.plugins.androidApplication) - alias(libs.plugins.composeCompiler) - alias(libs.plugins.composeMultiplatform) -} - -kotlin { - compilerOptions { - jvmTarget = JvmTarget.JVM_17 - } -} -dependencies { - implementation(project(":shared")) - implementation(libs.androidx.activity.compose) -} - -android { - compileSdk { - version = release(37) { minorApiLevel = 1 } - } - namespace = "org.jetbrains.codeviewer" - defaultConfig { - applicationId = "org.jetbrains.Codeviewer" - minSdk = 26 - targetSdk = 37 - versionCode = 1 - versionName = "1.0" - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } -} diff --git a/examples/codeviewer/androidApp/module.yaml b/examples/codeviewer/androidApp/module.yaml new file mode 100644 index 00000000000..6b2f42aec4b --- /dev/null +++ b/examples/codeviewer/androidApp/module.yaml @@ -0,0 +1,14 @@ +product: android/app + +dependencies: + - //shared + - $libs.androidx.activity.compose + +settings: + compose: enabled + android: + namespace: org.jetbrains.codeviewer + applicationId: org.jetbrains.Codeviewer + minSdk: 26 + versionCode: 1 + versionName: "1.0" diff --git a/examples/codeviewer/androidApp/src/main/res/drawable/ic_launcher_foreground.xml b/examples/codeviewer/androidApp/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from examples/codeviewer/androidApp/src/main/res/drawable/ic_launcher_foreground.xml rename to examples/codeviewer/androidApp/res/drawable/ic_launcher_foreground.xml diff --git a/examples/codeviewer/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/codeviewer/androidApp/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from examples/codeviewer/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to examples/codeviewer/androidApp/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/examples/codeviewer/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/codeviewer/androidApp/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from examples/codeviewer/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to examples/codeviewer/androidApp/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/examples/codeviewer/androidApp/src/main/res/values-night/styles.xml b/examples/codeviewer/androidApp/res/values-night/styles.xml similarity index 100% rename from examples/codeviewer/androidApp/src/main/res/values-night/styles.xml rename to examples/codeviewer/androidApp/res/values-night/styles.xml diff --git a/examples/codeviewer/androidApp/src/main/res/values/ic_launcher_background.xml b/examples/codeviewer/androidApp/res/values/ic_launcher_background.xml similarity index 100% rename from examples/codeviewer/androidApp/src/main/res/values/ic_launcher_background.xml rename to examples/codeviewer/androidApp/res/values/ic_launcher_background.xml diff --git a/examples/codeviewer/androidApp/src/main/res/values/strings.xml b/examples/codeviewer/androidApp/res/values/strings.xml similarity index 100% rename from examples/codeviewer/androidApp/src/main/res/values/strings.xml rename to examples/codeviewer/androidApp/res/values/strings.xml diff --git a/examples/codeviewer/androidApp/src/main/res/values/styles.xml b/examples/codeviewer/androidApp/res/values/styles.xml similarity index 100% rename from examples/codeviewer/androidApp/src/main/res/values/styles.xml rename to examples/codeviewer/androidApp/res/values/styles.xml diff --git a/examples/codeviewer/androidApp/src/main/AndroidManifest.xml b/examples/codeviewer/androidApp/src/AndroidManifest.xml similarity index 92% rename from examples/codeviewer/androidApp/src/main/AndroidManifest.xml rename to examples/codeviewer/androidApp/src/AndroidManifest.xml index f91ba3788ad..42016792c17 100644 --- a/examples/codeviewer/androidApp/src/main/AndroidManifest.xml +++ b/examples/codeviewer/androidApp/src/AndroidManifest.xml @@ -10,7 +10,7 @@ android:theme="@style/Theme.Application"> diff --git a/examples/codeviewer/androidApp/src/main/kotlin/org/jetbrains/codeviewer/MainActivity.kt b/examples/codeviewer/androidApp/src/org/jetbrains/codeviewer/MainActivity.kt similarity index 100% rename from examples/codeviewer/androidApp/src/main/kotlin/org/jetbrains/codeviewer/MainActivity.kt rename to examples/codeviewer/androidApp/src/org/jetbrains/codeviewer/MainActivity.kt diff --git a/examples/codeviewer/build.gradle.kts b/examples/codeviewer/build.gradle.kts deleted file mode 100644 index 50aea4ca8b4..00000000000 --- a/examples/codeviewer/build.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -plugins { - // this is necessary to avoid the plugins to be loaded multiple times - // in each subproject's classloader - alias(libs.plugins.androidApplication) apply false - alias(libs.plugins.androidMultiplatformLibrary) apply false - alias(libs.plugins.composeMultiplatform) apply false - alias(libs.plugins.composeCompiler) apply false - alias(libs.plugins.kotlinJvm) apply false - alias(libs.plugins.kotlinMultiplatform) apply false -} diff --git a/examples/codeviewer/desktopApp/build.gradle.kts b/examples/codeviewer/desktopApp/build.gradle.kts deleted file mode 100644 index ccef649b265..00000000000 --- a/examples/codeviewer/desktopApp/build.gradle.kts +++ /dev/null @@ -1,41 +0,0 @@ -import org.jetbrains.compose.desktop.application.dsl.TargetFormat - -plugins { - alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.composeCompiler) - alias(libs.plugins.composeMultiplatform) -} - -kotlin { - jvm {} - - sourceSets { - jvmMain.dependencies { - implementation(compose.desktop.currentOs) - implementation(project(":shared")) - } - } -} - -compose.desktop { - application { - mainClass = "org.jetbrains.codeviewer.MainKt" - - nativeDistributions { - targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) - packageName = "ComposeCodeViewer" - packageVersion = "1.0.0" - - windows { - menu = true - // see https://wixtoolset.org/documentation/manual/v3/howtos/general/generate_guids.html - upgradeUuid = "AF792DA6-2EA3-495A-95E5-C3C6CBCB9948" - } - - macOS { - // Use -Pcompose.desktop.mac.sign=true to sign and notarize. - bundleID = "com.jetbrains.compose.codeviewer" - } - } - } -} diff --git a/examples/codeviewer/desktopApp/module.yaml b/examples/codeviewer/desktopApp/module.yaml new file mode 100644 index 00000000000..11ab5ac5b56 --- /dev/null +++ b/examples/codeviewer/desktopApp/module.yaml @@ -0,0 +1,11 @@ +product: jvm/app + +dependencies: + - //shared + - $libs.compose.runtime + - $libs.compose.ui + +settings: + compose: enabled + jvm: + mainClass: org.jetbrains.codeviewer.MainKt diff --git a/examples/codeviewer/desktopApp/src/jvmMain/resources/ic_launcher.png b/examples/codeviewer/desktopApp/resources/ic_launcher.png similarity index 100% rename from examples/codeviewer/desktopApp/src/jvmMain/resources/ic_launcher.png rename to examples/codeviewer/desktopApp/resources/ic_launcher.png diff --git a/examples/codeviewer/desktopApp/src/jvmMain/kotlin/org/jetbrains/codeviewer/main.kt b/examples/codeviewer/desktopApp/src/org/jetbrains/codeviewer/main.kt similarity index 100% rename from examples/codeviewer/desktopApp/src/jvmMain/kotlin/org/jetbrains/codeviewer/main.kt rename to examples/codeviewer/desktopApp/src/org/jetbrains/codeviewer/main.kt diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties deleted file mode 100644 index a5a909b489e..00000000000 --- a/examples/codeviewer/gradle.properties +++ /dev/null @@ -1,10 +0,0 @@ -kotlin.code.style=official -xcodeproj=./iosApp -android.useAndroidX=true -org.gradle.jvmargs=-Xmx8g -org.gradle.configuration-cache=true -org.gradle.caching=true -org.jetbrains.compose.experimental.macos.enabled=true -kotlin.version=2.4.20 -agp.version=9.2.1 -compose.version=1.12.0 diff --git a/examples/codeviewer/gradle/libs.versions.toml b/examples/codeviewer/gradle/libs.versions.toml deleted file mode 100644 index c3f71366f22..00000000000 --- a/examples/codeviewer/gradle/libs.versions.toml +++ /dev/null @@ -1,27 +0,0 @@ -[versions] -kotlin = "2.3.20" # overriden via gradle.properties -compose = "1.10.1" # overriden via gradle.properties -agp = "9.2.1" # overriden via gradle.properties -androidx-activity = "1.13.0" -androidx-appcompat = "1.7.1" -androidx-core = "1.18.0" - -[libraries] -androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } -androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } -androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" } -compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "compose" } -compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "compose" } -material-icons-extended = { module = "org.jetbrains.compose.material:material-icons-extended", version = "1.7.3" } -compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose" } -compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose" } -compose-material = { module = "org.jetbrains.compose.material:material", version.ref = "compose" } -components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "compose"} - -[plugins] -androidApplication = { id = "com.android.application", version.ref = "agp" } -androidMultiplatformLibrary = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" } -composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose" } -composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } diff --git a/examples/codeviewer/gradle/wrapper/gradle-wrapper.jar b/examples/codeviewer/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 249e5832f090a2944b7473328c07c9755baa3196..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60756 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 '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/examples/codeviewer/gradlew.bat b/examples/codeviewer/gradlew.bat deleted file mode 100644 index f127cfd49d4..00000000000 --- a/examples/codeviewer/gradlew.bat +++ /dev/null @@ -1,91 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/examples/codeviewer/iosApp/Configuration/Config.xcconfig b/examples/codeviewer/iosApp/Configuration/Config.xcconfig deleted file mode 100644 index 1393dc4f0b7..00000000000 --- a/examples/codeviewer/iosApp/Configuration/Config.xcconfig +++ /dev/null @@ -1,3 +0,0 @@ -TEAM_ID= -BUNDLE_ID=org.jetbrains.Codeviewer -APP_NAME=Codeviewer diff --git a/examples/codeviewer/iosApp/iosApp.xcodeproj/project.pbxproj b/examples/codeviewer/iosApp/iosApp.xcodeproj/project.pbxproj deleted file mode 100644 index b2916a6c394..00000000000 --- a/examples/codeviewer/iosApp/iosApp.xcodeproj/project.pbxproj +++ /dev/null @@ -1,382 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 50; - objects = { - -/* Begin PBXBuildFile section */ - 058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; }; - 058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; }; - 2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; }; - 3251B1382AA8CF70001521C0 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3251B1372AA8CF70001521C0 /* ContentView.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - 2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = ""; }; - 3251B1372AA8CF70001521C0 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; - 7555FF7B242A565900829871 /* Codeviewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Codeviewer.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - AB3632DC29227652001CCB65 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - F85CB1118929364A9C6EFABC /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 058557D7273AAEEB004C7B11 /* Preview Content */ = { - isa = PBXGroup; - children = ( - 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */, - ); - path = "Preview Content"; - sourceTree = ""; - }; - 7555FF72242A565900829871 = { - isa = PBXGroup; - children = ( - AB1DB47929225F7C00F7AF9C /* Configuration */, - 7555FF7D242A565900829871 /* iosApp */, - 7555FF7C242A565900829871 /* Products */, - ); - sourceTree = ""; - }; - 7555FF7C242A565900829871 /* Products */ = { - isa = PBXGroup; - children = ( - 7555FF7B242A565900829871 /* Codeviewer.app */, - ); - name = Products; - sourceTree = ""; - }; - 7555FF7D242A565900829871 /* iosApp */ = { - isa = PBXGroup; - children = ( - 058557BA273AAA24004C7B11 /* Assets.xcassets */, - 7555FF8C242A565B00829871 /* Info.plist */, - 2152FB032600AC8F00CF470E /* iOSApp.swift */, - 058557D7273AAEEB004C7B11 /* Preview Content */, - 3251B1372AA8CF70001521C0 /* ContentView.swift */, - ); - path = iosApp; - sourceTree = ""; - }; - AB1DB47929225F7C00F7AF9C /* Configuration */ = { - isa = PBXGroup; - children = ( - AB3632DC29227652001CCB65 /* Config.xcconfig */, - ); - path = Configuration; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 7555FF7A242A565900829871 /* iosApp */ = { - isa = PBXNativeTarget; - buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */; - buildPhases = ( - 05E104072A8AA90A00D11C3D /* Compile Kotlin */, - 7555FF77242A565900829871 /* Sources */, - 7555FF79242A565900829871 /* Resources */, - F85CB1118929364A9C6EFABC /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = iosApp; - productName = iosApp; - productReference = 7555FF7B242A565900829871 /* Codeviewer.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 7555FF73242A565900829871 /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 1130; - LastUpgradeCheck = 1130; - ORGANIZATIONNAME = orgName; - TargetAttributes = { - 7555FF7A242A565900829871 = { - CreatedOnToolsVersion = 11.3.1; - }; - }; - }; - buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 7555FF72242A565900829871; - productRefGroup = 7555FF7C242A565900829871 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 7555FF7A242A565900829871 /* iosApp */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 7555FF79242A565900829871 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */, - 058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 05E104072A8AA90A00D11C3D /* Compile Kotlin */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Compile Kotlin"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 7555FF77242A565900829871 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 3251B1382AA8CF70001521C0 /* ContentView.swift in Sources */, - 2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 7555FFA3242A565B00829871 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = AB3632DC29227652001CCB65 /* Config.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.1; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - 7555FFA4242A565B00829871 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = AB3632DC29227652001CCB65 /* Config.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.1; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 7555FFA6242A565B00829871 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; - DEVELOPMENT_TEAM = "${TEAM_ID}"; - ENABLE_PREVIEWS = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)\n"; - INFOPLIST_FILE = iosApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.1; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - "shared\n", - ); - PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}"; - PRODUCT_NAME = "${APP_NAME}"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 7555FFA7242A565B00829871 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; - DEVELOPMENT_TEAM = "${TEAM_ID}"; - ENABLE_PREVIEWS = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)\n"; - INFOPLIST_FILE = iosApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.1; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - "shared\n", - ); - PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}"; - PRODUCT_NAME = "${APP_NAME}"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7555FFA3242A565B00829871 /* Debug */, - 7555FFA4242A565B00829871 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7555FFA6242A565B00829871 /* Debug */, - 7555FFA7242A565B00829871 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 7555FF73242A565900829871 /* Project object */; -} diff --git a/examples/codeviewer/iosApp/iosApp/Info.plist b/examples/codeviewer/iosApp/iosApp/Info.plist deleted file mode 100644 index 412e3781280..00000000000 --- a/examples/codeviewer/iosApp/iosApp/Info.plist +++ /dev/null @@ -1,50 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSRequiresIPhoneOS - - CADisableMinimumFrameDurationOnPhone - - UIApplicationSceneManifest - - UIApplicationSupportsMultipleScenes - - - UILaunchScreen - - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/examples/codeviewer/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json b/examples/codeviewer/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json deleted file mode 100644 index 4aa7c5350bf..00000000000 --- a/examples/codeviewer/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} \ No newline at end of file diff --git a/examples/codeviewer/iosApp/module.xcodeproj/project.pbxproj b/examples/codeviewer/iosApp/module.xcodeproj/project.pbxproj new file mode 100644 index 00000000000..1bbc11aa054 --- /dev/null +++ b/examples/codeviewer/iosApp/module.xcodeproj/project.pbxproj @@ -0,0 +1,221 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXFileReference section */ + 61953054E79C679999285760 /* Codeviewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Codeviewer.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 61953F84EDE8841FF4EB58FD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.info; name = Info.plist; path = src/Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ + 619536EC3227DE902FA82C88 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + Info.plist, + ); + target = 61953448E778222CB0131C83 /* app */; + }; +/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ + +/* Begin PBXFileSystemSynchronizedRootGroup section */ + 6195343827A0FB09880F5E89 /* src */ = { + isa = PBXFileSystemSynchronizedRootGroup; + exceptions = ( + 619536EC3227DE902FA82C88 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, + ); + path = src; + sourceTree = SOURCE_ROOT; + }; +/* End PBXFileSystemSynchronizedRootGroup section */ + +/* Begin PBXFrameworksBuildPhase section */ + 61953852C94087CBE26CE7E2 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 61953869EC51EBC6C13E7A72 = { + isa = PBXGroup; + children = ( + 61953F4FE2725B94BB5DE016 /* Products */, + 61953F84EDE8841FF4EB58FD /* Info.plist */, + 6195343827A0FB09880F5E89 /* src */, + ); + sourceTree = ""; + }; + 61953F4FE2725B94BB5DE016 /* Products */ = { + isa = PBXGroup; + children = ( + 61953054E79C679999285760 /* Codeviewer.app */, + ); + name = Products; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 61953448E778222CB0131C83 /* app */ = { + isa = PBXNativeTarget; + buildConfigurationList = 619537AD847CA000C1640B8B /* Build configuration list for PBXNativeTarget "app" */; + buildPhases = ( + 61953AB277B46DCD95A720D6 /* Build Kotlin */, + 61953E99CB2418540738CD58 /* Sources */, + 61953852C94087CBE26CE7E2 /* Frameworks */, + 61953807DDCA3237E8120E0C /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + fileSystemSynchronizedGroups = ( + 6195343827A0FB09880F5E89 /* src */, + ); + name = app; + productName = app; + productReference = 61953054E79C679999285760 /* Codeviewer.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 61953894F26186C70B8C203C /* Project object */ = { + isa = PBXProject; + buildConfigurationList = 61953A94F0B4D42348B90F07 /* Build configuration list for PBXProject "module" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 61953869EC51EBC6C13E7A72; + productRefGroup = 61953F4FE2725B94BB5DE016 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 61953448E778222CB0131C83 /* app */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 61953807DDCA3237E8120E0C /* Resources */ = { + isa = PBXResourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 61953AB277B46DCD95A720D6 /* Build Kotlin */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + inputPaths = ( + ); + name = "Build Kotlin"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# !KOTLIN INTEGRATION STEP!\n# This script is managed by the Kotlin Toolchain, do not edit manually!\n\"${KOTLIN_CLI_WRAPPER_PATH}\" tool xcode-integration\n"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 61953E99CB2418540738CD58 /* Sources */ = { + isa = PBXSourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 619532473E3B85FD35EA73E8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_OPTIMIZATION_LEVEL = 0; + INFOPLIST_FILE = src/Info.plist; + KOTLIN_CLI_WRAPPER_PATH = ../kotlin; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = org.jetbrains.Codeviewer; + PRODUCT_MODULE_NAME = app; + PRODUCT_NAME = Codeviewer; + SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = ( + 1, + 2, + ); + }; + name = Debug; + }; + 619534C7499BFCC9FFF5D8EC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Debug; + }; + 619536FEC92F1AEADBE2167D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + INFOPLIST_FILE = src/Info.plist; + KOTLIN_CLI_WRAPPER_PATH = ../kotlin; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = org.jetbrains.Codeviewer; + PRODUCT_MODULE_NAME = app; + PRODUCT_NAME = Codeviewer; + SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = ( + 1, + 2, + ); + }; + name = Release; + }; + 61953F9B26C121FF0F32B955 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 619537AD847CA000C1640B8B /* Build configuration list for PBXNativeTarget "app" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 619532473E3B85FD35EA73E8 /* Debug */, + 619536FEC92F1AEADBE2167D /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 61953A94F0B4D42348B90F07 /* Build configuration list for PBXProject "module" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 619534C7499BFCC9FFF5D8EC /* Debug */, + 61953F9B26C121FF0F32B955 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 61953894F26186C70B8C203C /* Project object */; +} diff --git a/examples/codeviewer/iosApp/module.xcodeproj/xcshareddata/xcschemes/Module iosApp.xcscheme b/examples/codeviewer/iosApp/module.xcodeproj/xcshareddata/xcschemes/Module iosApp.xcscheme new file mode 100644 index 00000000000..4910983be59 --- /dev/null +++ b/examples/codeviewer/iosApp/module.xcodeproj/xcshareddata/xcschemes/Module iosApp.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/codeviewer/iosApp/module.yaml b/examples/codeviewer/iosApp/module.yaml new file mode 100644 index 00000000000..392eaa5f782 --- /dev/null +++ b/examples/codeviewer/iosApp/module.yaml @@ -0,0 +1,8 @@ +product: ios/app + +dependencies: + - //shared + - $libs.compose.ui + +settings: + compose: enabled diff --git a/examples/codeviewer/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json b/examples/codeviewer/iosApp/src/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from examples/codeviewer/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json rename to examples/codeviewer/iosApp/src/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/examples/codeviewer/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/examples/codeviewer/iosApp/src/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from examples/codeviewer/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json rename to examples/codeviewer/iosApp/src/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/examples/codeviewer/iosApp/iosApp/Assets.xcassets/Contents.json b/examples/codeviewer/iosApp/src/Assets.xcassets/Contents.json similarity index 100% rename from examples/codeviewer/iosApp/iosApp/Assets.xcassets/Contents.json rename to examples/codeviewer/iosApp/src/Assets.xcassets/Contents.json diff --git a/examples/codeviewer/iosApp/iosApp/ContentView.swift b/examples/codeviewer/iosApp/src/ContentView.swift similarity index 95% rename from examples/codeviewer/iosApp/iosApp/ContentView.swift rename to examples/codeviewer/iosApp/src/ContentView.swift index ddb2dd9b6eb..f5de0ba0a83 100644 --- a/examples/codeviewer/iosApp/iosApp/ContentView.swift +++ b/examples/codeviewer/iosApp/src/ContentView.swift @@ -1,6 +1,6 @@ import UIKit import SwiftUI -import shared +import KotlinModules struct ContentView: View { var body: some View { diff --git a/examples/codeviewer/iosApp/src/Info.plist b/examples/codeviewer/iosApp/src/Info.plist new file mode 100644 index 00000000000..80d2cac7d55 --- /dev/null +++ b/examples/codeviewer/iosApp/src/Info.plist @@ -0,0 +1,41 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + UILaunchScreen + + UIApplicationSupportsIndirectInputEvents + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CADisableMinimumFrameDurationOnPhone + + + diff --git a/examples/codeviewer/iosApp/iosApp/iOSApp.swift b/examples/codeviewer/iosApp/src/iOSApp.swift similarity index 100% rename from examples/codeviewer/iosApp/iosApp/iOSApp.swift rename to examples/codeviewer/iosApp/src/iOSApp.swift diff --git a/examples/codeviewer/shared/src/iosMain/kotlin/main.ios.kt b/examples/codeviewer/iosApp/src/main.ios.kt similarity index 100% rename from examples/codeviewer/shared/src/iosMain/kotlin/main.ios.kt rename to examples/codeviewer/iosApp/src/main.ios.kt diff --git a/examples/codeviewer/kotlin b/examples/codeviewer/kotlin new file mode 100755 index 00000000000..5ef1dee4f32 --- /dev/null +++ b/examples/codeviewer/kotlin @@ -0,0 +1,292 @@ +#!/bin/sh + +# +# Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +# + +# Possible environment variables: +# KOTLIN_CLI_DOWNLOAD_ROOT Maven repository to download the Kotlin CLI dist from. +# default: https://packages.jetbrains.team/maven/p/amper/amper +# KOTLIN_CLI_JRE_DOWNLOAD_ROOT Url prefix to download the JRE to run the Kotlin CLI +# default: https:/ +# KOTLIN_CLI_BOOTSTRAP_CACHE_DIR Cache directory to store the extracted JRE and Kotlin CLI distribution +# KOTLIN_CLI_JAVA_HOME JRE to run the Kotlin CLI itself (optional, does not affect compilation) +# KOTLIN_CLI_JAVA_OPTIONS JVM options to pass to the JVM running the Kotlin CLI (does not affect the user's application) +# KOTLIN_CLI_NO_WELCOME_BANNER Disables the first-run welcome message if set to a non-empty value + +set -e -u + +# The version of the Kotlin Toolchain (and CLI) distribution to provision and use +kotlin_cli_version=0.13.0 +# Establish chain of trust from here by specifying exact checksum of Kotlin Toolchain (and CLI) distribution to be run +kotlin_cli_sha256=fa82b9872dcfa04d26c8f800f33d597c99fbffd747a0e9bbce3a9e4424b3a588 + +KOTLIN_CLI_DOWNLOAD_ROOT="${KOTLIN_CLI_DOWNLOAD_ROOT:-https://packages.jetbrains.team/maven/p/amper/amper}" + +die() { + echo >&2 + echo "$@" >&2 + echo >&2 + exit 1 +} + +# usage: check_sha SOURCE_MONIKER FILE SHA_CHECKSUM SHA_SIZE +# $1 SOURCE_MONIKER (e.g. url) +# $2 FILE +# $3 SHA hex string +# $4 SHA size in bits (256, 512, ...) +check_sha() { + sha_size=$4 + if command -v shasum >/dev/null 2>&1; then + echo "$3 *$2" | shasum -a "$sha_size" --status -c || { + die "ERROR: Checksum mismatch for $2 (downloaded from $1): expected checksum $3 but got $(shasum --binary -a "$sha_size" "$2" | awk '{print $1}')" + } + return 0 + fi + + shaNsumCommand="sha${sha_size}sum" + if command -v "$shaNsumCommand" >/dev/null 2>&1; then + # discard the output as sha*sum may print redundant warnings in some versions + echo "$3 *$2" | $shaNsumCommand -w -c >/dev/null 2>&1 || { + die "ERROR: Checksum mismatch for $2 (downloaded from $1): expected checksum $3 but got $($shaNsumCommand "$2" | awk '{print $1}')" + } + return 0 + fi + + echo "Both 'shasum' and 'sha${sha_size}sum' utilities are missing. Please install one of them" + return 1 +} + + +download_and_extract() { + moniker="$1" + file_url="$2" + file_sha="$3" + sha_size="$4" + cache_dir="$5" + extract_dir="$6" + show_banner_on_cache_miss="$7" + + if [ -e "$extract_dir/.flag" ] && [ "$(cat "$extract_dir/.flag")" = "${file_sha}" ]; then + # Everything is up-to-date in $extract_dir, do nothing + return 0; + fi + + mkdir -p "$cache_dir" + + # Take a lock for the download of this file + short_sha=$(echo "$file_sha" | cut -c1-32) # cannot use the ${short_sha:0:32} syntax in regular /bin/sh + download_lock_file="$cache_dir/download-${short_sha}.lock" + process_lock_file="$cache_dir/download-${short_sha}.$$.lock" + temp_file="$cache_dir/download-${short_sha}.$$.bin" + echo $$ >"$process_lock_file" + while ! ln "$process_lock_file" "$download_lock_file" 2>/dev/null; do + lock_owner=$(cat "$download_lock_file" 2>/dev/null || true) + # We use `kill -0` instead of `ps -p` as the first one is more portable + if [ -n "$lock_owner" ] && kill -0 "$lock_owner" >/dev/null; then + echo "Another Kotlin CLI instance (pid $lock_owner) is downloading $moniker. Awaiting the result..." + sleep 1 + elif [ -n "$lock_owner" ] && [ "$(cat "$download_lock_file" 2>/dev/null)" = "$lock_owner" ]; then + rm -f "$download_lock_file" + # We don't want to simply loop again here, because multiple concurrent processes may face this at the same time, + # which means the 'rm' command above from another script could delete our new valid lock file. Instead, we just + # ask the user to try again. This doesn't 100% eliminate the race, but the probability of issues is drastically + # reduced because it would involve 4 processes with perfect timing. We can revisit this later. + die "Another Kotlin CLI instance (pid $lock_owner) locked the download of $moniker, but is no longer running. The lock file is now removed, please try again." + fi + done + + + # An extraction left half-done must never keep the .flag file, which marks $extract_dir as complete: subsequent runs + # would skip the extraction and use the broken directory. + cleanup_incomplete_provisioning() { + rm -f "$download_lock_file" "$temp_file" + rm -rf "$extract_dir" + } + trap cleanup_incomplete_provisioning EXIT + rm -f "$process_lock_file" + + unlock_and_cleanup() { + rm -f "$download_lock_file" + trap - EXIT + return 0 + } + + if [ -e "$extract_dir/.flag" ] && [ "$(cat "$extract_dir/.flag")" = "${file_sha}" ]; then + # Everything is up-to-date in $extract_dir, just release the lock + unlock_and_cleanup + return 0; + fi + + if [ "$show_banner_on_cache_miss" = "true" ] && [ -z "${KOTLIN_CLI_NO_WELCOME_BANNER:-}" ]; then + echo + cat </dev/null 2>&1; then + if [ -t 1 ]; then CURL_PROGRESS="--progress-bar"; else CURL_PROGRESS="--silent --show-error"; fi + # shellcheck disable=SC2086 + curl $CURL_PROGRESS -L --fail --retry 5 --connect-timeout 30 --output "${temp_file}" "$file_url" + elif command -v wget >/dev/null 2>&1; then + if [ -t 1 ]; then WGET_PROGRESS=""; else WGET_PROGRESS="-nv"; fi + wget $WGET_PROGRESS --tries=5 --connect-timeout=30 --read-timeout=120 -O "${temp_file}" "$file_url" + else + die "ERROR: Please install 'wget' or 'curl', as one of them is required to download $moniker" + fi + + check_sha "$file_url" "$temp_file" "$file_sha" "$sha_size" + + rm -rf "$extract_dir" + mkdir -p "$extract_dir" + + case "$file_url" in + *".zip") + if command -v unzip >/dev/null 2>&1; then + unzip -q "$temp_file" -d "$extract_dir" + else + die "ERROR: Please install 'unzip', which is required to extract $moniker" + fi ;; + *) + if command -v tar >/dev/null 2>&1; then + tar -x -f "$temp_file" -C "$extract_dir" + else + die "ERROR: Please install 'tar', which is required to extract $moniker" + fi ;; + esac + + rm -f "$temp_file" + + echo "$file_sha" >"$extract_dir/.flag" + + # Unlock and cleanup the lock file + unlock_and_cleanup + + echo "Download complete." + echo +} + + +# ********** Project-local version detection ********** + +# 1. Search upwards for an executable `amper` file and/or `project.yaml` +# Sets wrapper_script to the found wrapper path, or empty string if not found. +find_project_context() { + wrapper_script="" + this_script="$(realpath "$0")" + project_dir=$(pwd) + while [ "$project_dir" != "/" ] && [ -n "$project_dir" ]; do + wrapper_candidate="$project_dir/kotlin" + if [ "$this_script" = "$wrapper_candidate" ]; then + # Found itself (local wrapper case), no need to update any version or search further. + return 1 + fi + + if [ -f "$wrapper_candidate" ] && [ -x "$wrapper_candidate" ]; then + # Found the wrapper — check that a project context exists alongside it + if [ -f "$project_dir/project.yaml" ] || [ -f "$project_dir/module.yaml" ]; then + wrapper_script="$wrapper_candidate" + return 0 + else + echo "WARNING: Found wrapper script '$wrapper_candidate', but no project.yaml or module.yaml near it. Skipping." >&2 + # Continue the search + fi + elif [ -f "$project_dir/project.yaml" ]; then + # Found project.yaml but no executable wrapper alongside it + echo "WARNING: Found a project.yaml in '$project_dir', but the wrapper script is missing; using Kotlin Toolchain v$kotlin_cli_version." >&2 + return 1 + fi + + project_dir=$(dirname "$project_dir") + done + # Do not check root '/' - it's an unlikely candidate for a project + + return 1 +} + +parse_project_context() { + # Parse kotlin_cli_version and kotlin_cli_sha256 from "$wrapper_script" without executing it. + parsed_kotlin_cli_version=$( + sed -n 's/^kotlin_cli_version=\([A-Za-z0-9._+-]\{1,\}\)[[:space:]]*$/\1/p' "$wrapper_script" \ + | head -n 1 + ) + parsed_kotlin_cli_sha256=$( + sed -n 's/^kotlin_cli_sha256=\([0-9a-fA-F]\{64\}\)[[:space:]]*$/\1/p' "$wrapper_script" \ + | head -n 1 + ) + + if [ -z "$parsed_kotlin_cli_version" ]; then + echo "ERROR: Suspicious local wrapper script: failed to detect the distribution version in '$wrapper_script'" >&2 + return 1 + fi + if [ -z "$parsed_kotlin_cli_sha256" ]; then + echo "ERROR: Suspicious local wrapper script: failed to detect the distribution checksum in '$wrapper_script'" >&2 + return 1 + fi + + # overwrite builtin values and proceed + kotlin_cli_version=$parsed_kotlin_cli_version + kotlin_cli_sha256=$parsed_kotlin_cli_sha256 + return 0 +} + +if [ -z "${KOTLIN_CLI_WRAPPER_ALWAYS_USE_INTRINSIC_VERSION:-}" ]; then + find_project_context && parse_project_context +fi + +# ********** System detection ********** + +kernelName=$(uname -s) +case "$kernelName" in + Darwin* ) + default_kotlin_cli_cache_dir="$HOME/Library/Caches/JetBrains/Kotlin/cli" + ;; + Linux* ) + default_kotlin_cli_cache_dir="$HOME/.cache/JetBrains/Kotlin/cli" + ;; + CYGWIN* | MSYS* | MINGW* ) + if command -v cygpath >/dev/null 2>&1; then + default_kotlin_cli_cache_dir=$(cygpath -u "$LOCALAPPDATA\JetBrains\Kotlin\cli") + else + die "The 'cypath' command is not available, but the Kotlin CLI needs it. Use kotlin.bat instead, or try a Cygwin or MSYS environment." + fi + ;; + *) + die "Unsupported platform $kernelName" + ;; +esac + +kotlin_cli_cache_dir="${KOTLIN_CLI_BOOTSTRAP_CACHE_DIR:-$default_kotlin_cli_cache_dir}" + +# ********** Provision the Kotlin Toolchain distribution ********** + +kotlin_cli_url="$KOTLIN_CLI_DOWNLOAD_ROOT/org/jetbrains/kotlin/kotlin-cli/$kotlin_cli_version/kotlin-cli-$kotlin_cli_version-dist.tgz" +kotlin_cli_target_dir="$kotlin_cli_cache_dir/kotlin-cli-$kotlin_cli_version" +download_and_extract "Kotlin Toolchain distribution v$kotlin_cli_version" "$kotlin_cli_url" "$kotlin_cli_sha256" 256 "$kotlin_cli_cache_dir" "$kotlin_cli_target_dir" "true" + +# ********** Launch the Kotlin CLI ********** + +launcher_script="$kotlin_cli_target_dir/bin/launcher.sh" + +KOTLIN_CLI_WRAPPER_PATH="$(realpath "$0")" \ +exec /bin/sh "$launcher_script" "$@" diff --git a/examples/codeviewer/kotlin.bat b/examples/codeviewer/kotlin.bat new file mode 100755 index 00000000000..f295d64bf00 --- /dev/null +++ b/examples/codeviewer/kotlin.bat @@ -0,0 +1,280 @@ +@echo off + +@rem +@rem Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +@rem + +@rem Possible environment variables: +@rem KOTLIN_CLI_DOWNLOAD_ROOT Maven repository to download the Kotlin CLI dist from +@rem default: https://packages.jetbrains.team/maven/p/amper/amper +@rem KOTLIN_CLI_JRE_DOWNLOAD_ROOT Url prefix to download the Kotlin CLI JRE from. +@rem default: https:/ +@rem KOTLIN_CLI_BOOTSTRAP_CACHE_DIR Cache directory to store the extracted JRE and Kotlin CLI distribution +@rem KOTLIN_CLI_JAVA_HOME JRE to run the Kotlin CLI itself (optional, does not affect compilation) +@rem KOTLIN_CLI_JAVA_OPTIONS JVM options to pass to the JVM running the Kotlin CLI (does not affect the user's application) +@rem KOTLIN_CLI_NO_WELCOME_BANNER Disables the first-run welcome message if set to a non-empty value + +setlocal + +@rem The version of the Kotlin Toolchain distribution to provision and use +set kotlin_cli_version=0.13.0 +@rem Establish chain of trust from here by specifying the exact checksum of the Kotlin Toolchain distribution to be run +set kotlin_cli_sha256=fa82b9872dcfa04d26c8f800f33d597c99fbffd747a0e9bbce3a9e4424b3a588 + +if not defined KOTLIN_CLI_DOWNLOAD_ROOT set KOTLIN_CLI_DOWNLOAD_ROOT=https://packages.jetbrains.team/maven/p/amper/amper +if not defined KOTLIN_CLI_BOOTSTRAP_CACHE_DIR set KOTLIN_CLI_BOOTSTRAP_CACHE_DIR=%LOCALAPPDATA%\JetBrains\Kotlin\cli +@rem remove trailing \ if present +if [%KOTLIN_CLI_BOOTSTRAP_CACHE_DIR:~-1%] EQU [\] set KOTLIN_CLI_BOOTSTRAP_CACHE_DIR=%KOTLIN_CLI_BOOTSTRAP_CACHE_DIR:~0,-1% + +goto :after_function_declarations + +REM ********** Download and extract any zip or .tar.gz archive ********** + +:download_and_extract +setlocal + +set moniker=%~1 +set url=%~2 +set target_dir=%~3 +set sha=%~4 +set sha_size=%~5 +set show_banner_on_cache_miss=%~6 + +setlocal enableDelayedExpansion + +set flag_file=%target_dir%\.flag +if exist "%flag_file%" ( + set /p current_flag=<"%flag_file%" + if "!current_flag!" == "%sha%" exit /b +) + +set NL=^ + + +@rem two empty lines required above for the NL character + +@rem We have to build the welcome banner here as an env var because we +@rem can't pass a multiline string through the single line powershell +set welcome_banner=!NL! ^ +Welcome to !NL! ^ + !NL! ^ +@@@ @@@@ @@@ @@@ !NL! ^ +@@@ @@@@ @@@ @@@ @@@ !NL! ^ +@@@ #@@@^" ,@@@ @@@ !NL! ^ +@@@ ,@@@%% ,@@@@@@@, @@@@@@@@@@ @@@ @@@ @@@ ,@@@@@, !NL! ^ +@@@ @@@@ @@@@@%%^"%%@@@@@ @@@@@@@@@@ @@@ @@@ @@@@@@%%%%@@@@@ !NL! ^ +@@@@@@%% @@@%% %%@@@ @@@ @@@ @@@ @@@@ %%@@%% !NL! ^ +@@@ @@@@= #@@@ @@@# @@@ @@@ @@@ @@@ @@@ !NL! ^ +@@@ @@@@ #@@@ @@@# @@@ @@@ @@@ @@@ @@@ !NL! ^ +@@@ *@@@%% @@@@ @@@@ @@@ @@@ @@@ @@@ @@@ !NL! ^ +@@@ %%@@@= %%@@@@*,*@@@@%% @@@@### @@@ @@@ @@@ @@@ !NL! ^ +@@@ @@@@ ^"@@@@@@@^" %%@@@@@ @@@ @@@ @@@ @@@ !NL! + +@rem This multiline string is actually passed as a single line to powershell, meaning #-comments are not possible. +@rem So here are a few comments about the code below: +@rem - we need to support both .zip and .tar.gz archives (for the Kotlin Toolchain distribution and the JRE) +@rem - tar should be present in all Windows machines since 2018 (and usable from both cmd and powershell) +@rem - tar requires the destination dir to exist +@rem - native commands like tar don't raise PowerShell errors on failure, so we have to check $LASTEXITCODE. +@rem The extraction must never be left half-done with the .flag file in place, because the .flag file marks the +@rem target dir as complete, and subsequent runs would then skip the extraction and use the broken directory. +@rem - We use (New-Object Net.WebClient).DownloadFile instead of Invoke-WebRequest for performance. See the issue +@rem https://github.com/PowerShell/PowerShell/issues/16914, which is still not fixed in Windows PowerShell 5.1 +@rem - DownloadFile requires the directories in the destination file's path to exist +set download_and_extract_ps1= ^ +Set-StrictMode -Version 3.0; ^ +$ErrorActionPreference = 'Stop'; ^ + ^ +$temp_file = $null; ^ +$createdNew = $false; ^ +$lock = New-Object System.Threading.Mutex($true, ('Global\kotlin-cli-bootstrap.' + '%target_dir%'.GetHashCode().ToString()), [ref]$createdNew); ^ +if (-not $createdNew) { ^ + Write-Host 'Another Kotlin CLI instance is bootstrapping. Waiting for our turn...'; ^ + [void]$lock.WaitOne(); ^ +} ^ + ^ +try { ^ + if ((Get-Content '%flag_file%' -ErrorAction Ignore) -ne '%sha%') { ^ + if (('%show_banner_on_cache_miss%' -eq 'true') -and [string]::IsNullOrEmpty('%KOTLIN_CLI_NO_WELCOME_BANNER%')) { ^ + Write-Host \"$env:welcome_banner\"; ^ + Write-Host ''; ^ + Write-Host 'This is the first run of the Kotlin CLI v%kotlin_cli_version%, so we need to download the Kotlin Toolchain.'; ^ + Write-Host 'Please give us a few seconds now, subsequent runs will be faster.'; ^ + Write-Host ''; ^ + } ^ + $temp_file = '%KOTLIN_CLI_BOOTSTRAP_CACHE_DIR%\' + [System.IO.Path]::GetRandomFileName(); ^ + [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ^ + Write-Host 'Downloading %moniker%...'; ^ + [void](New-Item '%KOTLIN_CLI_BOOTSTRAP_CACHE_DIR%' -ItemType Directory -Force); ^ + if (Get-Command curl.exe -errorAction SilentlyContinue) { ^ + curl.exe -L --silent --show-error --fail --output $temp_file '%url%'; ^ + } else { ^ + (New-Object Net.WebClient).DownloadFile('%url%', $temp_file); ^ + } ^ + ^ + $actualSha = (Get-FileHash -Algorithm SHA%sha_size% -Path $temp_file).Hash.ToString(); ^ + if ($actualSha -ne '%sha%') { ^ + $writeErr = if ($Host.Name -eq 'ConsoleHost') { [Console]::Error.WriteLine } else { $host.ui.WriteErrorLine } ^ + $writeErr.Invoke(\"ERROR: Checksum mismatch for $temp_file (downloaded from %url%): expected checksum %sha% but got $actualSha\"); ^ + exit 1; ^ + } ^ + ^ + if (Test-Path '%target_dir%') { ^ + Remove-Item '%target_dir%' -Recurse; ^ + } ^ + try { ^ + if ($temp_file -like '*.zip') { ^ + Add-Type -A 'System.IO.Compression.FileSystem'; ^ + [IO.Compression.ZipFile]::ExtractToDirectory($temp_file, '%target_dir%'); ^ + } else { ^ + [void](New-Item '%target_dir%' -ItemType Directory -Force); ^ + tar -xzf $temp_file -C '%target_dir%'; ^ + if ($LASTEXITCODE -ne 0) { ^ + throw \"tar failed to extract %moniker% (exit code $LASTEXITCODE)\"; ^ + } ^ + } ^ + } catch { ^ + Remove-Item '%flag_file%' -Force -ErrorAction Ignore; ^ + Remove-Item '%target_dir%' -Recurse -Force -ErrorAction Ignore; ^ + throw; ^ + } ^ + ^ + Set-Content '%flag_file%' -Value '%sha%'; ^ + Write-Host 'Download complete.'; ^ + Write-Host ''; ^ + } ^ +} ^ +finally { ^ + if ($temp_file) { ^ + Remove-Item $temp_file -Force -ErrorAction Ignore; ^ + } ^ + $lock.ReleaseMutex(); ^ +} + +rem We reset the PSModulePath in case this batch script was called from PowerShell Core +rem See https://github.com/PowerShell/PowerShell/issues/18108#issuecomment-2269703022 +set PSModulePath= +set powershell=%SystemRoot%\system32\WindowsPowerShell\v1.0\powershell.exe +"%powershell%" -NonInteractive -NoProfile -NoLogo -Command %download_and_extract_ps1% +if errorlevel 1 exit /b 1 +exit /b 0 + +:find_project_context +@rem Search upwards for a kotlin.bat wrapper file and/or project.yaml +@rem Sets wrapper_script to the found wrapper path, or empty string if not found. +@rem Returns errorlevel 0 if a valid wrapper (that is not this script itself) was found, 1 otherwise. +set wrapper_script= +set this_script=%~f0 +set project_dir=%CD% + +:find_loop +set wrapper_candidate=%project_dir%\kotlin.bat +if "%this_script%"=="%wrapper_candidate%" ( + @rem Found itself (local wrapper case), no need to update any version or search further. + exit /b 1 +) + +if exist "%wrapper_candidate%" ( + @rem Found a wrapper — check that a project context exists alongside it + if exist "%project_dir%\project.yaml" ( + set wrapper_script=%wrapper_candidate% + exit /b 0 + ) + if exist "%project_dir%\module.yaml" ( + set wrapper_script=%wrapper_candidate% + exit /b 0 + ) + echo WARNING: Found wrapper script '%wrapper_candidate%', but no project.yaml or module.yaml near it. Skipping. >&2 + @rem Continue the search + goto :find_next_parent +) + +if exist "%project_dir%\project.yaml" ( + @rem Found project.yaml but no wrapper alongside it + echo WARNING: Found a project.yaml in '%project_dir%', but the wrapper script is missing; using Kotlin Toolchain v%kotlin_cli_version%. >&2 + exit /b 1 +) + +:find_next_parent +@rem Move to parent directory +for %%P in ("%project_dir%\..") do set parent_dir=%%~fP +if "%parent_dir%"=="%project_dir%" ( + @rem Reached the root, stop searching + exit /b 1 +) +set project_dir=%parent_dir% +goto :find_loop + +:parse_project_context +@rem Parse kotlin_cli_version and kotlin_cli_sha256 from the found wrapper_script without executing it. +set parsed_kotlin_cli_version= +set parsed_kotlin_cli_sha256= + +for /f "tokens=2 delims==" %%A in ('findstr /r /c:"^set kotlin_cli_version=[A-Za-z0-9._+-]*$" "%wrapper_script%"') do ( + if not defined parsed_kotlin_cli_version set parsed_kotlin_cli_version=%%A +) +for /f "tokens=2 delims==" %%A in ('findstr /r /c:"^set kotlin_cli_sha256=[0-9a-fA-F]*$" "%wrapper_script%"') do ( + if not defined parsed_kotlin_cli_sha256 set parsed_kotlin_cli_sha256=%%A +) + +if not defined parsed_kotlin_cli_version ( + echo ERROR: Suspicious local wrapper script: failed to detect the distribution version in '%wrapper_script%' >&2 + exit /b 1 +) +if not defined parsed_kotlin_cli_sha256 ( + echo ERROR: Suspicious local wrapper script: failed to detect the distribution checksum in '%wrapper_script%' >&2 + exit /b 1 +) + +@rem Overwrite builtin values and proceed +set kotlin_cli_version=%parsed_kotlin_cli_version% +set kotlin_cli_sha256=%parsed_kotlin_cli_sha256% +exit /b 0 + +:fail +echo ERROR: Kotlin CLI bootstrap failed, see errors above +exit /b 1 + +:after_function_declarations + +REM ********** Project-local version detection ********** + +if defined KOTLIN_CLI_WRAPPER_ALWAYS_USE_INTRINSIC_VERSION goto :after_local_version_detection + +call :find_project_context +if errorlevel 1 goto :after_local_version_detection +call :parse_project_context +if errorlevel 1 goto fail +:after_local_version_detection + +REM ********** Provision the Kotlin Toolchain distribution ********** + +set kotlin_cli_url=%KOTLIN_CLI_DOWNLOAD_ROOT%/org/jetbrains/kotlin/kotlin-cli/%kotlin_cli_version%/kotlin-cli-%kotlin_cli_version%-dist.tgz +set kotlin_cli_target_dir=%KOTLIN_CLI_BOOTSTRAP_CACHE_DIR%\kotlin-cli-%kotlin_cli_version% +call :download_and_extract "Kotlin Toolchain distribution v%kotlin_cli_version%" "%kotlin_cli_url%" "%kotlin_cli_target_dir%" "%kotlin_cli_sha256%" "256" "true" +if errorlevel 1 goto fail + +REM ********** Launch the Kotlin CLI ********** + +rem Determine the correct busybox binary based on architecture +if "%PROCESSOR_ARCHITECTURE%"=="ARM64" ( + set busybox_exe=%kotlin_cli_target_dir%\bin\busybox64a.exe +) else if "%PROCESSOR_ARCHITECTURE%"=="AMD64" ( + set busybox_exe=%kotlin_cli_target_dir%\bin\busybox64u.exe +) else ( + echo Unsupported architecture %PROCESSOR_ARCHITECTURE% >&2 + goto fail +) + +rem We use busybox here because it doesn't reinterpret the user-passed command-line arguments (that we pass via %*). +rem Also this way we can use the unified launcher script (.sh) +set KOTLIN_CLI_WRAPPER_PATH=%~f0 + +rem The '& call' after the app run is to avoid the "Terminate batch job (Y/N)?" prompt +"%busybox_exe%" sh "%kotlin_cli_target_dir%\bin\launcher.sh" %* & call :exitWithErrorLevel + +:exitWithErrorLevel +@rem We use "%COMSPEC%" /d /c exit so that and/or operators work properly when calling kotlin.bat directly from a script +@rem without the `call` command. With a plain `exit /B %ERRORLEVEL%`, using `kotlin.bat && echo success` would print +@rem 'success' even in case of failure. Consumers would have to use `call kotlin.bat && echo success` for it to work.` +"%COMSPEC%" /d /c exit %ERRORLEVEL% diff --git a/examples/codeviewer/libs.versions.toml b/examples/codeviewer/libs.versions.toml new file mode 100644 index 00000000000..331ceb6ec8e --- /dev/null +++ b/examples/codeviewer/libs.versions.toml @@ -0,0 +1,17 @@ +[versions] +androidx-activity = "1.13.0" +androidx-appcompat = "1.7.1" +androidx-core = "1.18.0" +compose-multiplatform = "1.12.1" +material-icons-extended = "1.7.3" + +[libraries] +androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } +androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } +androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" } +compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "compose-multiplatform" } +compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose-multiplatform" } +compose-material = { module = "org.jetbrains.compose.material:material", version.ref = "compose-multiplatform" } +compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose-multiplatform" } +compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "compose-multiplatform" } +material-icons-extended = { module = "org.jetbrains.compose.material:material-icons-extended", version.ref = "material-icons-extended" } diff --git a/examples/codeviewer/project.yaml b/examples/codeviewer/project.yaml new file mode 100644 index 00000000000..2b073b4c45c --- /dev/null +++ b/examples/codeviewer/project.yaml @@ -0,0 +1,5 @@ +modules: + - androidApp + - desktopApp + - iosApp + - shared diff --git a/examples/codeviewer/run-configurations.png b/examples/codeviewer/run-configurations.png deleted file mode 100644 index d859ff0870f4af0332e8ca15caf4bcbbf94bb6fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17480 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 diff --git a/examples/codeviewer/settings.gradle.kts b/examples/codeviewer/settings.gradle.kts deleted file mode 100644 index ca43bf2d371..00000000000 --- a/examples/codeviewer/settings.gradle.kts +++ /dev/null @@ -1,33 +0,0 @@ -pluginManagement { - repositories { - gradlePluginPortal() - maven("https://packages.jetbrains.team/maven/p/cmp/dev") - google() - } -} - -dependencyResolutionManagement { - repositories { - google() - mavenCentral() - maven("https://packages.jetbrains.team/maven/p/cmp/dev") - } - - versionCatalogs { - create("libs") { - version("kotlin", extra["kotlin.version"].toString()) - version("compose", extra["compose.version"].toString()) - version("agp", extra["agp.version"].toString()) - } - } -} - -plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version("1.0.0") -} - -rootProject.name = "codeviewer" - -include(":androidApp") -include(":shared") -include(":desktopApp") diff --git a/examples/codeviewer/shared/build.gradle.kts b/examples/codeviewer/shared/build.gradle.kts deleted file mode 100644 index a509d3b44ce..00000000000 --- a/examples/codeviewer/shared/build.gradle.kts +++ /dev/null @@ -1,63 +0,0 @@ -@file:Suppress("OPT_IN_IS_NOT_ENABLED") - -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - -plugins { - alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.composeCompiler) - alias(libs.plugins.androidMultiplatformLibrary) - alias(libs.plugins.composeMultiplatform) -} - -version = "1.0-SNAPSHOT" - -kotlin { - jvm("desktop") - - listOf( - iosArm64(), - iosSimulatorArm64() - ).forEach { iosTarget -> - iosTarget.binaries.framework { - baseName = "shared" - isStatic = true - } - } - - android { - compileSdk { - version = release(37) { minorApiLevel = 1 } - } - namespace = "org.jetbrains.codeviewer.common" - minSdk = 26 - - compilerOptions { - jvmTarget = JvmTarget.JVM_17 - } - } - - sourceSets { - commonMain.dependencies { - implementation(libs.compose.runtime) - implementation(libs.compose.foundation) - implementation(libs.compose.material) - implementation(libs.material.icons.extended) - implementation(libs.components.resources) - } - androidMain { - kotlin { - srcDirs("src/jvmMain/kotlin") - } - dependencies { - api(libs.androidx.activity.compose) - api(libs.androidx.appcompat) - api(libs.androidx.core.ktx) - } - } - val desktopMain by getting { - kotlin { - srcDirs("src/jvmMain/kotlin") - } - } - } -} diff --git a/examples/codeviewer/shared/composeResources/files/EditorView.kt b/examples/codeviewer/shared/composeResources/files/EditorView.kt new file mode 100644 index 00000000000..8917e4c6035 --- /dev/null +++ b/examples/codeviewer/shared/composeResources/files/EditorView.kt @@ -0,0 +1,183 @@ +/** + * This file is an example (we can open it in iOS application) + */ + +package org.jetbrains.codeviewer.ui.editor + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.text.selection.DisableSelection +import androidx.compose.material.AmbientContentColor +import androidx.compose.material.CircularProgressIndicator +import androidx.compose.material.Surface +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.key +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.text.* +import androidx.compose.ui.unit.dp +import org.jetbrains.codeviewer.platform.SelectionContainer +import org.jetbrains.codeviewer.ui.common.AppTheme +import org.jetbrains.codeviewer.ui.common.Fonts +import org.jetbrains.codeviewer.ui.common.Settings +import org.jetbrains.codeviewer.util.loadableScoped +import org.jetbrains.codeviewer.util.withoutWidthConstraints +import kotlin.text.Regex.Companion.fromLiteral + +@Composable +fun EditorView(model: Editor, settings: Settings) = key(model) { + with (LocalDensity.current) { + SelectionContainer { + Surface( + Modifier.fillMaxSize(), + color = AppTheme.colors.backgroundDark, + ) { + val lines by loadableScoped(model.lines) + + if (lines != null) { + Box { + Lines(lines!!, settings) + Box( + Modifier + .offset( + x = settings.fontSize.toDp() * 0.5f * settings.maxLineSymbols + ) + .width(1.dp) + .fillMaxHeight() + .background(AppTheme.colors.codeGuide) + ) + } + } else { + CircularProgressIndicator( + modifier = Modifier + .size(36.dp) + .padding(4.dp) + ) + } + } + } + } +} + +@Composable +private fun Lines(lines: Editor.Lines, settings: Settings) = with(DensityAmbient.current) { + val maxNumber = remember(lines.lineNumberDigitCount) { + (1..lines.lineNumberDigitCount).joinToString(separator = "") { "9" } + } + + Box(Modifier.fillMaxSize()) { + val scrollState = rememberLazyListState() + val lineHeight = settings.fontSize.toDp() * 1.6f + + LazyColumnFor( + lines.size, + modifier = Modifier.fillMaxSize(), + state = scrollState, + itemContent = { index -> + val line: Editor.Line? by loadable { lines.get(index) } + Box(Modifier.height(lineHeight)) { + if (line != null) { + Line(Modifier.align(Alignment.CenterStart), maxNumber, line!!, settings) + } + } + } + ) + + VerticalScrollbar( + Modifier.align(Alignment.CenterEnd), + scrollState, + lines.size, + lineHeight + ) + } +} + +// Поддержка русского языка +// دعم اللغة العربية +// 中文支持 +@Composable +private fun Line(modifier: Modifier, maxNumber: String, line: Editor.Line, settings: Settings) { + Row(modifier = modifier) { + DisableSelection { + Box { + LineNumber(maxNumber, Modifier.alpha(0f), settings) + LineNumber(line.number.toString(), Modifier.align(Alignment.CenterEnd), settings) + } + } + LineContent( + line.content, + modifier = Modifier + .weight(1f) + .withoutWidthConstraints() + .padding(start = 28.dp, end = 12.dp), + settings = settings + ) + } +} + +@Composable +private fun LineNumber(number: String, modifier: Modifier, settings: Settings) = Text( + text = number, + fontSize = settings.fontSize, + fontFamily = Fonts.jetbrainsMono(), + color = AmbientContentColor.current.copy(alpha = 0.30f), + modifier = modifier.padding(start = 12.dp) +) + +@Composable +private fun LineContent(content: Editor.Content, modifier: Modifier, settings: Settings) = Text( + text = if (content.isCode) { + codeString(content.value.value) + } else { + AnnotatedString(content.value.value) + }, + fontSize = settings.fontSize, + fontFamily = Fonts.jetbrainsMono(), + modifier = modifier, + softWrap = false +) + +private fun codeString(str: String) = buildAnnotatedString { + withStyle(AppTheme.code.simple) { + append(str.replace("\t", " ")) + addStyle(AppTheme.code.punctuation, ":") + addStyle(AppTheme.code.punctuation, "=") + addStyle(AppTheme.code.punctuation, "\"") + addStyle(AppTheme.code.punctuation, "[") + addStyle(AppTheme.code.punctuation, "]") + addStyle(AppTheme.code.punctuation, "{") + addStyle(AppTheme.code.punctuation, "}") + addStyle(AppTheme.code.punctuation, "(") + addStyle(AppTheme.code.punctuation, ")") + addStyle(AppTheme.code.punctuation, ",") + addStyle(AppTheme.code.keyword, "fun ") + addStyle(AppTheme.code.keyword, "val ") + addStyle(AppTheme.code.keyword, "var ") + addStyle(AppTheme.code.keyword, "private ") + addStyle(AppTheme.code.keyword, "internal ") + addStyle(AppTheme.code.keyword, "for ") + addStyle(AppTheme.code.keyword, "expect ") + addStyle(AppTheme.code.keyword, "actual ") + addStyle(AppTheme.code.keyword, "import ") + addStyle(AppTheme.code.keyword, "package ") + addStyle(AppTheme.code.value, "true") + addStyle(AppTheme.code.value, "false") + addStyle(AppTheme.code.value, Regex("[0-9]*")) + addStyle(AppTheme.code.annotation, Regex("^@[a-zA-Z_]*")) + addStyle(AppTheme.code.comment, Regex("^\\s*//.*")) + } +} + +private fun AnnotatedString.Builder.addStyle(style: SpanStyle, regexp: String) { + addStyle(style, fromLiteral(regexp)) +} + +private fun AnnotatedString.Builder.addStyle(style: SpanStyle, regexp: Regex) { + for (result in regexp.findAll(toString())) { + addStyle(style, result.range.first, result.range.last + 1) + } +} \ No newline at end of file diff --git a/examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_bold.ttf b/examples/codeviewer/shared/composeResources/font/jetbrainsmono_bold.ttf similarity index 100% rename from examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_bold.ttf rename to examples/codeviewer/shared/composeResources/font/jetbrainsmono_bold.ttf diff --git a/examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_bold_italic.ttf b/examples/codeviewer/shared/composeResources/font/jetbrainsmono_bold_italic.ttf similarity index 100% rename from examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_bold_italic.ttf rename to examples/codeviewer/shared/composeResources/font/jetbrainsmono_bold_italic.ttf diff --git a/examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_extrabold.ttf b/examples/codeviewer/shared/composeResources/font/jetbrainsmono_extrabold.ttf similarity index 100% rename from examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_extrabold.ttf rename to examples/codeviewer/shared/composeResources/font/jetbrainsmono_extrabold.ttf diff --git a/examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_extrabold_italic.ttf b/examples/codeviewer/shared/composeResources/font/jetbrainsmono_extrabold_italic.ttf similarity index 100% rename from examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_extrabold_italic.ttf rename to examples/codeviewer/shared/composeResources/font/jetbrainsmono_extrabold_italic.ttf diff --git a/examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_italic.ttf b/examples/codeviewer/shared/composeResources/font/jetbrainsmono_italic.ttf similarity index 100% rename from examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_italic.ttf rename to examples/codeviewer/shared/composeResources/font/jetbrainsmono_italic.ttf diff --git a/examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_medium.ttf b/examples/codeviewer/shared/composeResources/font/jetbrainsmono_medium.ttf similarity index 100% rename from examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_medium.ttf rename to examples/codeviewer/shared/composeResources/font/jetbrainsmono_medium.ttf diff --git a/examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_medium_italic.ttf b/examples/codeviewer/shared/composeResources/font/jetbrainsmono_medium_italic.ttf similarity index 100% rename from examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_medium_italic.ttf rename to examples/codeviewer/shared/composeResources/font/jetbrainsmono_medium_italic.ttf diff --git a/examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_regular.ttf b/examples/codeviewer/shared/composeResources/font/jetbrainsmono_regular.ttf similarity index 100% rename from examples/codeviewer/shared/src/commonMain/composeResources/font/jetbrainsmono_regular.ttf rename to examples/codeviewer/shared/composeResources/font/jetbrainsmono_regular.ttf diff --git a/examples/codeviewer/shared/module.yaml b/examples/codeviewer/shared/module.yaml new file mode 100644 index 00000000000..1656fb9b60e --- /dev/null +++ b/examples/codeviewer/shared/module.yaml @@ -0,0 +1,28 @@ +product: + type: kmp/lib + platforms: [android, iosArm64, iosSimulatorArm64, jvm] + +aliases: + - jvmAndAndroid: [jvm, android] + +dependencies: + - $libs.compose.runtime + - $libs.compose.foundation + - $libs.compose.material + - $libs.compose.components.resources + - $libs.material.icons.extended + +dependencies@android: + - $libs.androidx.activity.compose: exported + - $libs.androidx.appcompat: exported + - $libs.androidx.core.ktx: exported + +settings: + compose: + enabled: true + resources: + packageName: codeviewer.shared.generated.resources + android: + namespace: org.jetbrains.codeviewer.common + minSdk: 26 + diff --git a/examples/codeviewer/shared/src/androidMain/AndroidManifest.xml b/examples/codeviewer/shared/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 568741e54f2..00000000000 --- a/examples/codeviewer/shared/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/File.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/platform/File.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/File.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/platform/File.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Mouse.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/platform/Mouse.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Mouse.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/platform/Mouse.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/platform/Scrollbar.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/platform/Scrollbar.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/CodeViewer.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/CodeViewer.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/CodeViewer.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/CodeViewer.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/CodeViewerView.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/CodeViewerView.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/CodeViewerView.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/CodeViewerView.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/MainView.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/MainView.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/MainView.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/MainView.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/common/Fonts.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/common/Fonts.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/common/Fonts.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/common/Fonts.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/common/Settings.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/common/Settings.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/common/Settings.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/common/Settings.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/common/Theme.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/common/Theme.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/common/Theme.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/common/Theme.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/Editor.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/editor/Editor.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/Editor.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/editor/Editor.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorEmptyView.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/editor/EditorEmptyView.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorEmptyView.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/editor/EditorEmptyView.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorTabsView.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/editor/EditorTabsView.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorTabsView.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/editor/EditorTabsView.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorView.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/editor/EditorView.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorView.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/editor/EditorView.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/Editors.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/editor/Editors.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/Editors.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/editor/Editors.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTree.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/filetree/FileTree.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTree.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/filetree/FileTree.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/statusbar/StatusBar.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/statusbar/StatusBar.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/statusbar/StatusBar.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/ui/statusbar/StatusBar.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/util/LayoutModifiers.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/util/LayoutModifiers.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/util/LayoutModifiers.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/util/LayoutModifiers.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/util/Loadable.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/util/Loadable.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/util/Loadable.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/util/Loadable.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/util/SingleSelection.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/util/SingleSelection.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/util/SingleSelection.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/util/SingleSelection.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/util/TextLines.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/util/TextLines.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/util/TextLines.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/util/TextLines.kt diff --git a/examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/util/VerticalSplittable.kt b/examples/codeviewer/shared/src/org/jetbrains/codeviewer/util/VerticalSplittable.kt similarity index 100% rename from examples/codeviewer/shared/src/commonMain/kotlin/org/jetbrains/codeviewer/util/VerticalSplittable.kt rename to examples/codeviewer/shared/src/org/jetbrains/codeviewer/util/VerticalSplittable.kt diff --git a/examples/codeviewer/shared/src/androidMain/kotlin/main.android.kt b/examples/codeviewer/shared/src@android/main.android.kt similarity index 100% rename from examples/codeviewer/shared/src/androidMain/kotlin/main.android.kt rename to examples/codeviewer/shared/src@android/main.android.kt diff --git a/examples/codeviewer/shared/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/File.kt b/examples/codeviewer/shared/src@android/org/jetbrains/codeviewer/platform/File.kt similarity index 100% rename from examples/codeviewer/shared/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/File.kt rename to examples/codeviewer/shared/src@android/org/jetbrains/codeviewer/platform/File.kt diff --git a/examples/codeviewer/shared/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Mouse.kt b/examples/codeviewer/shared/src@android/org/jetbrains/codeviewer/platform/Mouse.kt similarity index 100% rename from examples/codeviewer/shared/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Mouse.kt rename to examples/codeviewer/shared/src@android/org/jetbrains/codeviewer/platform/Mouse.kt diff --git a/examples/codeviewer/shared/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt b/examples/codeviewer/shared/src@android/org/jetbrains/codeviewer/platform/Scrollbar.kt similarity index 100% rename from examples/codeviewer/shared/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt rename to examples/codeviewer/shared/src@android/org/jetbrains/codeviewer/platform/Scrollbar.kt diff --git a/examples/codeviewer/shared/src/iosMain/kotlin/org/jetbrains/codeviewer/platform/File.kt b/examples/codeviewer/shared/src@ios/org/jetbrains/codeviewer/platform/File.kt similarity index 95% rename from examples/codeviewer/shared/src/iosMain/kotlin/org/jetbrains/codeviewer/platform/File.kt rename to examples/codeviewer/shared/src@ios/org/jetbrains/codeviewer/platform/File.kt index 2a1dee9218d..a45227e3145 100644 --- a/examples/codeviewer/shared/src/iosMain/kotlin/org/jetbrains/codeviewer/platform/File.kt +++ b/examples/codeviewer/shared/src@ios/org/jetbrains/codeviewer/platform/File.kt @@ -34,7 +34,7 @@ actual val HomeFolder: File get() = VirtualFile("files", VirtualFile("EditorView.kt", isDirectory = false, textLines = runBlocking { - Res.readBytes("EditorView.kt") + Res.readBytes("files/EditorView.kt") }.toTextLines() ) ) diff --git a/examples/codeviewer/shared/src/iosMain/kotlin/org/jetbrains/codeviewer/platform/Mouse.kt b/examples/codeviewer/shared/src@ios/org/jetbrains/codeviewer/platform/Mouse.kt similarity index 100% rename from examples/codeviewer/shared/src/iosMain/kotlin/org/jetbrains/codeviewer/platform/Mouse.kt rename to examples/codeviewer/shared/src@ios/org/jetbrains/codeviewer/platform/Mouse.kt diff --git a/examples/codeviewer/shared/src/iosMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt b/examples/codeviewer/shared/src@ios/org/jetbrains/codeviewer/platform/Scrollbar.kt similarity index 100% rename from examples/codeviewer/shared/src/iosMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt rename to examples/codeviewer/shared/src@ios/org/jetbrains/codeviewer/platform/Scrollbar.kt diff --git a/examples/codeviewer/shared/src/desktopMain/kotlin/main.desktop.kt b/examples/codeviewer/shared/src@jvm/main.desktop.kt similarity index 100% rename from examples/codeviewer/shared/src/desktopMain/kotlin/main.desktop.kt rename to examples/codeviewer/shared/src@jvm/main.desktop.kt diff --git a/examples/codeviewer/shared/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/File.kt b/examples/codeviewer/shared/src@jvm/org/jetbrains/codeviewer/platform/File.kt similarity index 100% rename from examples/codeviewer/shared/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/File.kt rename to examples/codeviewer/shared/src@jvm/org/jetbrains/codeviewer/platform/File.kt diff --git a/examples/codeviewer/shared/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Mouse.kt b/examples/codeviewer/shared/src@jvm/org/jetbrains/codeviewer/platform/Mouse.kt similarity index 100% rename from examples/codeviewer/shared/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Mouse.kt rename to examples/codeviewer/shared/src@jvm/org/jetbrains/codeviewer/platform/Mouse.kt diff --git a/examples/codeviewer/shared/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt b/examples/codeviewer/shared/src@jvm/org/jetbrains/codeviewer/platform/Scrollbar.kt similarity index 100% rename from examples/codeviewer/shared/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt rename to examples/codeviewer/shared/src@jvm/org/jetbrains/codeviewer/platform/Scrollbar.kt diff --git a/examples/codeviewer/shared/src/jvmMain/kotlin/org/jetbrains/codeviewer/platform/JvmFile.kt b/examples/codeviewer/shared/src@jvmAndAndroid/org/jetbrains/codeviewer/platform/JvmFile.kt similarity index 100% rename from examples/codeviewer/shared/src/jvmMain/kotlin/org/jetbrains/codeviewer/platform/JvmFile.kt rename to examples/codeviewer/shared/src@jvmAndAndroid/org/jetbrains/codeviewer/platform/JvmFile.kt diff --git a/examples/validateExamples.sh b/examples/validateExamples.sh index e398a58cb88..b664c71236f 100755 --- a/examples/validateExamples.sh +++ b/examples/validateExamples.sh @@ -32,8 +32,17 @@ runGradle() { popd } +# Examples built with the Kotlin Toolchain use the Compose and Kotlin versions from their configuration +runKotlin() { + local example="$1" + local platform="$2" + pushd "$example" + ./kotlin build -p "$platform" + popd +} + runGradle chat packageDistributionForCurrentOS -runGradle codeviewer packageDistributionForCurrentOS +runKotlin codeviewer jvm runGradle imageviewer packageDistributionForCurrentOS runGradle issues packageDistributionForCurrentOS runGradle graphics-2d packageDistributionForCurrentOS diff --git a/examples/validateExamplesAndroid.sh b/examples/validateExamplesAndroid.sh index aeab9104b7d..5acfb8789d5 100755 --- a/examples/validateExamplesAndroid.sh +++ b/examples/validateExamplesAndroid.sh @@ -32,8 +32,17 @@ runGradle() { popd } +# Examples built with the Kotlin Toolchain use the Compose and Kotlin versions from their configuration +runKotlin() { + local example="$1" + local platform="$2" + pushd "$example" + ./kotlin build -p "$platform" + popd +} + runGradle chat assembleDebug -runGradle codeviewer assembleDebug +runKotlin codeviewer android runGradle imageviewer assembleDebug runGradle issues assembleDebug runGradle graphics-2d assembleDebug diff --git a/examples/validateExamplesIos.sh b/examples/validateExamplesIos.sh index 5fd23b337d6..8b0af479f64 100755 --- a/examples/validateExamplesIos.sh +++ b/examples/validateExamplesIos.sh @@ -32,7 +32,16 @@ runGradle() { popd } +# Examples built with the Kotlin Toolchain use the Compose and Kotlin versions from their configuration +runKotlin() { + local example="$1" + local platform="$2" + pushd "$example" + ./kotlin build -p "$platform" + popd +} + runGradle chat -runGradle codeviewer +runKotlin codeviewer iosSimulatorArm64 runGradle imageviewer runGradle graphics-2d From 297574c072eff990ff9d91a74c77da8b3e4dabfe Mon Sep 17 00:00:00 2001 From: Victor Kropp Date: Tue, 6 Oct 2026 16:30:41 +0200 Subject: [PATCH 2/4] update validation for Kotlin Toolchain based examples Since it is not possible to override Compose and Kotlin versions via the command line, copy them to a temporary directory and modify configuration in place --- examples/buildWithKotlinToolchain.sh | 56 ++++++++++++++++++++++ examples/codeviewer/androidApp/module.yaml | 3 ++ examples/validateExamples.sh | 7 ++- examples/validateExamplesAndroid.sh | 7 ++- examples/validateExamplesIos.sh | 7 ++- 5 files changed, 68 insertions(+), 12 deletions(-) create mode 100755 examples/buildWithKotlinToolchain.sh diff --git a/examples/buildWithKotlinToolchain.sh b/examples/buildWithKotlinToolchain.sh new file mode 100755 index 00000000000..d1b34eae5b3 --- /dev/null +++ b/examples/buildWithKotlinToolchain.sh @@ -0,0 +1,56 @@ +#!/bin/bash + +# Script to build an example with the Kotlin Toolchain, optionally with the given Compose and Kotlin versions. +# The Kotlin Toolchain can't override versions from the command line, so in that case the example is copied +# to a temporary directory, and every module there applies a template with the versions and the dev maven repo. + +set -euo pipefail + +if [ "$#" -lt 2 ] || [ "$#" -gt 4 ]; then + echo "Specify the example, the platform and optionally Compose and Kotlin versions. For example: ./buildWithKotlinToolchain.sh codeviewer jvm 1.13.0-alpha03 2.3.20" + exit 1 +fi + +example="$1" +platform="$2" +compose_version="${3:-}" +kotlin_version="${4:-}" +build_dir="$example" + +if [ -n "$compose_version" ]; then + temp_dir="$(mktemp -d)" + # Keep the copy if the build fails, so that its logs can be inspected + trap 'if [ "$?" -eq 0 ]; then rm -rf "$temp_dir"; else echo "Failed $example, its copy is kept in $temp_dir"; fi' EXIT + + tar -C "$example" --exclude=./build -cf - . | tar -C "$temp_dir" -xf - + echo "Building a copy of $example in $temp_dir with Compose $compose_version${kotlin_version:+ and Kotlin $kotlin_version}" + + template="validation-versions.module-template.yaml" + { + echo "repositories:" + echo " - https://packages.jetbrains.team/maven/p/cmp/dev" + echo + echo "settings:" + echo " compose:" + echo " version: $compose_version" + if [ -n "$kotlin_version" ]; then + echo " kotlin:" + echo " version: $kotlin_version" + fi + } > "$temp_dir/$template" + + find "$temp_dir" -name module.yaml | while read -r module; do + { printf 'apply:\n - //%s\n\n' "$template"; cat "$module"; } > "$module.tmp" + mv "$module.tmp" "$module" + done + + if [ -f "$temp_dir/libs.versions.toml" ]; then + sed -E "s/^(compose-multiplatform[[:space:]]*=[[:space:]]*).*/\1\"$compose_version\"/" "$temp_dir/libs.versions.toml" > "$temp_dir/libs.versions.toml.tmp" + mv "$temp_dir/libs.versions.toml.tmp" "$temp_dir/libs.versions.toml" + fi + + build_dir="$temp_dir" +fi + +cd "$build_dir" +./kotlin build -p "$platform" diff --git a/examples/codeviewer/androidApp/module.yaml b/examples/codeviewer/androidApp/module.yaml index 6b2f42aec4b..621d4e0e660 100644 --- a/examples/codeviewer/androidApp/module.yaml +++ b/examples/codeviewer/androidApp/module.yaml @@ -10,5 +10,8 @@ settings: namespace: org.jetbrains.codeviewer applicationId: org.jetbrains.Codeviewer minSdk: 26 + compileSdk: + apiLevel: 37 + minorApiLevel: 1 versionCode: 1 versionName: "1.0" diff --git a/examples/validateExamples.sh b/examples/validateExamples.sh index b664c71236f..09fe752335c 100755 --- a/examples/validateExamples.sh +++ b/examples/validateExamples.sh @@ -19,6 +19,8 @@ if [ "$#" -eq 2 ]; then version_args=("-Pcompose.version=$1" "-Pkotlin.version=$2") fi +compose_version="${1:-}" +kotlin_version="${2:-}" runGradle() { local example="$1" @@ -32,13 +34,10 @@ runGradle() { popd } -# Examples built with the Kotlin Toolchain use the Compose and Kotlin versions from their configuration runKotlin() { local example="$1" local platform="$2" - pushd "$example" - ./kotlin build -p "$platform" - popd + ./buildWithKotlinToolchain.sh "$example" "$platform" "$compose_version" "$kotlin_version" } runGradle chat packageDistributionForCurrentOS diff --git a/examples/validateExamplesAndroid.sh b/examples/validateExamplesAndroid.sh index 5acfb8789d5..46f6c5732e1 100755 --- a/examples/validateExamplesAndroid.sh +++ b/examples/validateExamplesAndroid.sh @@ -19,6 +19,8 @@ if [ "$#" -eq 2 ]; then version_args=("-Pcompose.version=$1" "-Pkotlin.version=$2") fi +compose_version="${1:-}" +kotlin_version="${2:-}" runGradle() { local example="$1" @@ -32,13 +34,10 @@ runGradle() { popd } -# Examples built with the Kotlin Toolchain use the Compose and Kotlin versions from their configuration runKotlin() { local example="$1" local platform="$2" - pushd "$example" - ./kotlin build -p "$platform" - popd + ./buildWithKotlinToolchain.sh "$example" "$platform" "$compose_version" "$kotlin_version" } runGradle chat assembleDebug diff --git a/examples/validateExamplesIos.sh b/examples/validateExamplesIos.sh index 8b0af479f64..7d19d54720b 100755 --- a/examples/validateExamplesIos.sh +++ b/examples/validateExamplesIos.sh @@ -19,6 +19,8 @@ if [ "$#" -eq 2 ]; then version_args=("-Pcompose.version=$1" "-Pkotlin.version=$2") fi +compose_version="${1:-}" +kotlin_version="${2:-}" runGradle() { local example="$1" @@ -32,13 +34,10 @@ runGradle() { popd } -# Examples built with the Kotlin Toolchain use the Compose and Kotlin versions from their configuration runKotlin() { local example="$1" local platform="$2" - pushd "$example" - ./kotlin build -p "$platform" - popd + ./buildWithKotlinToolchain.sh "$example" "$platform" "$compose_version" "$kotlin_version" } runGradle chat From 438f9cf7d07f62b206714803125b30e1a79a5ea6 Mon Sep 17 00:00:00 2001 From: Victor Kropp Date: Wed, 7 Oct 2026 14:06:28 +0200 Subject: [PATCH 3/4] add wasmJs target --- examples/README.md | 2 +- examples/codeviewer/README.md | 8 ++- examples/codeviewer/project.yaml | 1 + examples/codeviewer/shared/module.yaml | 2 +- .../org/jetbrains/codeviewer/platform/File.kt | 52 +++++++++++++++++++ .../jetbrains/codeviewer/platform/Mouse.kt | 5 ++ .../codeviewer/platform/Scrollbar.kt | 25 +++++++++ examples/codeviewer/webApp/module.yaml | 8 +++ .../codeviewer/webApp/resources/index.html | 20 +++++++ .../src/org/jetbrains/codeviewer/main.kt | 10 ++++ examples/validateExamplesWithJs.sh | 9 ++++ 11 files changed, 139 insertions(+), 3 deletions(-) create mode 100644 examples/codeviewer/shared/src@wasmJs/org/jetbrains/codeviewer/platform/File.kt create mode 100644 examples/codeviewer/shared/src@wasmJs/org/jetbrains/codeviewer/platform/Mouse.kt create mode 100644 examples/codeviewer/shared/src@wasmJs/org/jetbrains/codeviewer/platform/Scrollbar.kt create mode 100644 examples/codeviewer/webApp/module.yaml create mode 100644 examples/codeviewer/webApp/resources/index.html create mode 100644 examples/codeviewer/webApp/src/org/jetbrains/codeviewer/main.kt diff --git a/examples/README.md b/examples/README.md index 55f75e587dc..3743dd4a7e9 100644 --- a/examples/README.md +++ b/examples/README.md @@ -2,7 +2,7 @@ | Sample | Description | Platforms | | ------------------------------------ | -------------------------------------------------------------------------------------------- | --------------------- | | [Imageviewer](imageviewer) | Image Viewer application | Android, iOS, Desktop | -| [Codeviewer](codeviewer) | File browser and code viewer application | Android, iOS, Desktop | +| [Codeviewer](codeviewer) | File browser and code viewer application | Android, iOS, Desktop, Web | | [Chat](chat) | A simple chat | Android, iOS, Desktop | | [Graphics2D](graphics-2d) | 2D Games and graphics examples | Android, iOS, Desktop | | [Nav Cupcake](nav_cupcake) | Multiscreen app to demonstrate the use of Compose Navigation | Android, iOS, Desktop | diff --git a/examples/codeviewer/README.md b/examples/codeviewer/README.md index 1b2fa951cd9..f58ff7f4444 100644 --- a/examples/codeviewer/README.md +++ b/examples/codeviewer/README.md @@ -1,5 +1,5 @@ # Code Viewer -Code Viewer example for Desktop, Android and iOS written in Compose Multiplatform. +Code Viewer example for Desktop, Android, iOS, and Web written in Compose Multiplatform. The project is built with the [Kotlin Toolchain](https://github.com/JetBrains/kotlin-toolchain). @@ -24,4 +24,10 @@ to launch the app on the target of your choice. or open `iosApp/module.xcodeproj` in Xcode. +## Run web app + +`./kotlin run -m webApp` + +and open the printed URL in a browser that supports [Wasm GC](https://kotl.in/wasm-help). + ![Desktop](screenshots/codeviewer.png) diff --git a/examples/codeviewer/project.yaml b/examples/codeviewer/project.yaml index 2b073b4c45c..e056ef58ed4 100644 --- a/examples/codeviewer/project.yaml +++ b/examples/codeviewer/project.yaml @@ -3,3 +3,4 @@ modules: - desktopApp - iosApp - shared + - webApp diff --git a/examples/codeviewer/shared/module.yaml b/examples/codeviewer/shared/module.yaml index 1656fb9b60e..f5701d43cc3 100644 --- a/examples/codeviewer/shared/module.yaml +++ b/examples/codeviewer/shared/module.yaml @@ -1,6 +1,6 @@ product: type: kmp/lib - platforms: [android, iosArm64, iosSimulatorArm64, jvm] + platforms: [android, iosArm64, iosSimulatorArm64, jvm, wasmJs] aliases: - jvmAndAndroid: [jvm, android] diff --git a/examples/codeviewer/shared/src@wasmJs/org/jetbrains/codeviewer/platform/File.kt b/examples/codeviewer/shared/src@wasmJs/org/jetbrains/codeviewer/platform/File.kt new file mode 100644 index 00000000000..595b847a9a8 --- /dev/null +++ b/examples/codeviewer/shared/src@wasmJs/org/jetbrains/codeviewer/platform/File.kt @@ -0,0 +1,52 @@ +package org.jetbrains.codeviewer.platform + +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import codeviewer.shared.generated.resources.Res +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.launch +import org.jetbrains.codeviewer.util.EmptyTextLines +import org.jetbrains.codeviewer.util.TextLines + +class VirtualFolder(override val name: String, override val children: List) : File { + override val isDirectory: Boolean + get() = true + + override val hasChildren: Boolean + get() = children.isNotEmpty() + + override fun readLines(scope: CoroutineScope): TextLines = EmptyTextLines +} + +class ResourceFile(override val name: String, private val path: String) : File { + override val isDirectory: Boolean + get() = false + + override val children: List + get() = emptyList() + + override val hasChildren: Boolean + get() = false + + // Resources are fetched over the network on the web, so lines are loaded in background + override fun readLines(scope: CoroutineScope): TextLines { + var lines by mutableStateOf(emptyList()) + + scope.launch { + lines = Res.readBytes(path).decodeToString().split("\n") + } + + return object : TextLines { + override val size get() = lines.size + + override fun get(index: Int): String = lines[index] + } + } +} + +actual val HomeFolder: File get() = VirtualFolder("files", + children = listOf( + ResourceFile("EditorView.kt", "files/EditorView.kt") + ) +) diff --git a/examples/codeviewer/shared/src@wasmJs/org/jetbrains/codeviewer/platform/Mouse.kt b/examples/codeviewer/shared/src@wasmJs/org/jetbrains/codeviewer/platform/Mouse.kt new file mode 100644 index 00000000000..3a8174f63cf --- /dev/null +++ b/examples/codeviewer/shared/src@wasmJs/org/jetbrains/codeviewer/platform/Mouse.kt @@ -0,0 +1,5 @@ +package org.jetbrains.codeviewer.platform + +import androidx.compose.ui.Modifier + +actual fun Modifier.cursorForHorizontalResize(): Modifier = this diff --git a/examples/codeviewer/shared/src@wasmJs/org/jetbrains/codeviewer/platform/Scrollbar.kt b/examples/codeviewer/shared/src@wasmJs/org/jetbrains/codeviewer/platform/Scrollbar.kt new file mode 100644 index 00000000000..c8af7f095c3 --- /dev/null +++ b/examples/codeviewer/shared/src@wasmJs/org/jetbrains/codeviewer/platform/Scrollbar.kt @@ -0,0 +1,25 @@ +package org.jetbrains.codeviewer.platform + +import androidx.compose.foundation.ScrollState +import androidx.compose.foundation.lazy.LazyListState +import androidx.compose.foundation.rememberScrollbarAdapter +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier + +@Composable +actual fun VerticalScrollbar( + modifier: Modifier, + scrollState: ScrollState +) = androidx.compose.foundation.VerticalScrollbar( + rememberScrollbarAdapter(scrollState), + modifier +) + +@Composable +actual fun VerticalScrollbar( + modifier: Modifier, + scrollState: LazyListState +) = androidx.compose.foundation.VerticalScrollbar( + rememberScrollbarAdapter(scrollState), + modifier +) \ No newline at end of file diff --git a/examples/codeviewer/webApp/module.yaml b/examples/codeviewer/webApp/module.yaml new file mode 100644 index 00000000000..f6bb0a65c3f --- /dev/null +++ b/examples/codeviewer/webApp/module.yaml @@ -0,0 +1,8 @@ +product: wasm-js/app + +dependencies: + - //shared + - $libs.compose.ui + +settings: + compose: enabled diff --git a/examples/codeviewer/webApp/resources/index.html b/examples/codeviewer/webApp/resources/index.html new file mode 100644 index 00000000000..de4f11d9af2 --- /dev/null +++ b/examples/codeviewer/webApp/resources/index.html @@ -0,0 +1,20 @@ + + + + + + Code Viewer + + + +{{kotlin.scripts}} + + diff --git a/examples/codeviewer/webApp/src/org/jetbrains/codeviewer/main.kt b/examples/codeviewer/webApp/src/org/jetbrains/codeviewer/main.kt new file mode 100644 index 00000000000..587b61b408b --- /dev/null +++ b/examples/codeviewer/webApp/src/org/jetbrains/codeviewer/main.kt @@ -0,0 +1,10 @@ +package org.jetbrains.codeviewer + +import androidx.compose.ui.ExperimentalComposeUiApi +import androidx.compose.ui.window.ComposeViewport +import org.jetbrains.codeviewer.ui.MainView + +@OptIn(ExperimentalComposeUiApi::class) +fun main() = ComposeViewport { + MainView() +} diff --git a/examples/validateExamplesWithJs.sh b/examples/validateExamplesWithJs.sh index 5636a251556..ed2e378d0f5 100755 --- a/examples/validateExamplesWithJs.sh +++ b/examples/validateExamplesWithJs.sh @@ -19,6 +19,8 @@ if [ "$#" -eq 2 ]; then version_args=("-Pcompose.version=$1" "-Pkotlin.version=$2") fi +compose_version="${1:-}" +kotlin_version="${2:-}" runGradle() { local example="$1" @@ -32,7 +34,14 @@ runGradle() { popd } +runKotlin() { + local example="$1" + local platform="$2" + ./buildWithKotlinToolchain.sh "$example" "$platform" "$compose_version" "$kotlin_version" +} + runGradle html/compose-bird build runGradle html/landing build runGradle html/with-react build runGradle imageviewer :webApp:wasmJsBrowserDistribution +runKotlin codeviewer wasmJs From fed313a0051f5395ab978979dcc14f2069fda300 Mon Sep 17 00:00:00 2001 From: Victor Kropp Date: Wed, 7 Oct 2026 14:55:12 +0200 Subject: [PATCH 4/4] update README and Web examples validation script --- examples/README.md | 18 +++++++++--------- examples/html/compose-in-js/build.gradle.kts | 2 +- examples/validateExamplesWithJs.sh | 4 ++++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/examples/README.md b/examples/README.md index 3743dd4a7e9..85b7003168c 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,10 +1,10 @@ # Samples -| Sample | Description | Platforms | -| ------------------------------------ | -------------------------------------------------------------------------------------------- | --------------------- | -| [Imageviewer](imageviewer) | Image Viewer application | Android, iOS, Desktop | -| [Codeviewer](codeviewer) | File browser and code viewer application | Android, iOS, Desktop, Web | -| [Chat](chat) | A simple chat | Android, iOS, Desktop | -| [Graphics2D](graphics-2d) | 2D Games and graphics examples | Android, iOS, Desktop | -| [Nav Cupcake](nav_cupcake) | Multiscreen app to demonstrate the use of Compose Navigation | Android, iOS, Desktop | -| [Issues tracker](issues) | GitHub issue tracker with an adaptive UI and ktor-client | Android, Desktop | -| [HTML based samples](html/README.md) | Examples written with Compose HTML Library | +| Sample | Description | Platforms | +| -------------------------------------- |:---------------------------------------------------------| -------------------------- | +| [Imageviewer](imageviewer) | Image Viewer | Android, iOS, Desktop, Web | +| [Codeviewer](codeviewer) | File browser and code viewer | Android, iOS, Desktop, Web | +| [Chat](chat) | A simple chat | Android, iOS, Desktop, Web | +| [Graphics2D](graphics-2d) | 2D Games and graphics examples | Android, iOS, Desktop, Web | +| [Nav Cupcake](nav_cupcake) | Multiscreen app using Compose Navigation 2 | Android, iOS, Desktop, Web | +| [Issues tracker](issues) | GitHub issue tracker with an adaptive UI and ktor-client | Android, Desktop | +| [Compose HTML samples](html/README.md) | Examples written with Compose HTML Library | Web | diff --git a/examples/html/compose-in-js/build.gradle.kts b/examples/html/compose-in-js/build.gradle.kts index a49d05e325a..4baf71022ca 100644 --- a/examples/html/compose-in-js/build.gradle.kts +++ b/examples/html/compose-in-js/build.gradle.kts @@ -30,7 +30,7 @@ kotlin { sourceSets { val jsMain by getting { dependencies { - implementation(compose.web.core) + implementation(compose.html.core) implementation(compose.runtime) } } diff --git a/examples/validateExamplesWithJs.sh b/examples/validateExamplesWithJs.sh index ed2e378d0f5..af9e12910f9 100755 --- a/examples/validateExamplesWithJs.sh +++ b/examples/validateExamplesWithJs.sh @@ -41,7 +41,11 @@ runKotlin() { } runGradle html/compose-bird build +runGradle html/compose-in-js build runGradle html/landing build runGradle html/with-react build +runGradle chat :jsApp:jsBrowserDistribution +runGradle graphics-2d :jsApp:jsBrowserDistribution runGradle imageviewer :webApp:wasmJsBrowserDistribution +runGradle nav_cupcake :webApp:wasmJsBrowserDistribution runKotlin codeviewer wasmJs