Browse Source

Fix more examples after Kotlin 2.2 update (#5411)

## Release Notes
N/A
andrei.salavei/fix-PR_FORMAT-path v1.10.0+dev2887
Ivan Matkov 4 months ago committed by GitHub
parent
commit
783612a0b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 782
      examples/imageviewer/kotlin-js-store/yarn.lock
  2. 9
      examples/imageviewer/shared/build.gradle.kts
  3. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/ImageBitmap.web.kt
  4. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/ImageStorage.web.kt
  5. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/PopupNotification.web.kt
  6. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/SharePicture.web.kt
  7. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/filter/BitmapFilter.web.kt
  8. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/model/Page.web.kt
  9. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/platform.web.kt
  10. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/utils/GraphicsMath.web.kt
  11. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/utils/UUID.web.kt
  12. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/CameraView.web.kt
  13. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/EditMemoryDialog.web.kt
  14. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/GalleryScreen.web.kt
  15. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/LocationVisualizer.web.kt
  16. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/ScrollableColumn.web.kt
  17. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/Tooltip.web.kt
  18. 0
      examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/ZoomControllerView.web.kt
  19. 7
      examples/imageviewer/webApp/build.gradle.kts
  20. 0
      examples/imageviewer/webApp/src/webMain/kotlin/Common.kt
  21. 10
      examples/jetsnack/common/build.gradle.kts
  22. 8
      examples/jetsnack/desktop/build.gradle.kts

782
examples/imageviewer/kotlin-js-store/yarn.lock

File diff suppressed because it is too large Load Diff

9
examples/imageviewer/shared/build.gradle.kts

@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
plugins {
kotlin("multiplatform")
kotlin("plugin.compose")
@ -16,6 +18,7 @@ kotlin { @@ -16,6 +18,7 @@ kotlin {
browser()
useEsModules()
}
@OptIn(ExperimentalWasmDsl::class)
wasmJs { browser() }
listOf(
@ -62,7 +65,7 @@ kotlin { @@ -62,7 +65,7 @@ kotlin {
implementation("com.google.maps.android:maps-compose:2.11.2")
}
val jsWasmMain by creating {
val webMain by creating {
dependsOn(commonMain.get())
dependencies {
implementation(npm("uuid", "^9.0.1"))
@ -70,11 +73,11 @@ kotlin { @@ -70,11 +73,11 @@ kotlin {
}
val jsMain by getting {
dependsOn(jsWasmMain)
dependsOn(webMain)
}
val wasmJsMain by getting {
dependsOn(jsWasmMain)
dependsOn(webMain)
}
val desktopMain by getting

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/ImageBitmap.jsWasm.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/ImageBitmap.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/ImageStorage.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/ImageStorage.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/PopupNotification.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/PopupNotification.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/SharePicture.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/SharePicture.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/filter/BitmapFilter.jsWasm.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/filter/BitmapFilter.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/model/Page.jsWasm.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/model/Page.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/platform.jsWasm.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/platform.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/utils/GraphicsMath.jsWasm.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/utils/GraphicsMath.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/utils/uuid.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/utils/UUID.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/view/CameraView.jsWasm.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/CameraView.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/view/EditMemoryDialog.jsWasm.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/EditMemoryDialog.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/view/GalleryScreen.jsWasm.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/GalleryScreen.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/view/LocationVisualizer.jsWasm.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/LocationVisualizer.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/view/ScrollableColumn.jsWasm.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/ScrollableColumn.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/view/Tooltip.jsWasm.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/Tooltip.web.kt

0
examples/imageviewer/shared/src/jsWasmMain/kotlin/example/imageviewer/view/ZoomControllerView.jsWasm.kt → examples/imageviewer/shared/src/webMain/kotlin/example/imageviewer/view/ZoomControllerView.web.kt

7
examples/imageviewer/webApp/build.gradle.kts

@ -42,7 +42,8 @@ kotlin { @@ -42,7 +42,8 @@ kotlin {
}
sourceSets {
val jsWasmMain by creating {
val webMain by creating {
dependsOn(commonMain.get())
dependencies {
implementation(project(":shared"))
implementation(compose.runtime)
@ -54,10 +55,10 @@ kotlin { @@ -54,10 +55,10 @@ kotlin {
}
}
val jsMain by getting {
dependsOn(jsWasmMain)
dependsOn(webMain)
}
val wasmJsMain by getting {
dependsOn(jsWasmMain)
dependsOn(webMain)
}
}
}

0
examples/imageviewer/webApp/src/jsWasmMain/kotlin/Common.kt → examples/imageviewer/webApp/src/webMain/kotlin/Common.kt

10
examples/jetsnack/common/build.gradle.kts

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
import org.jetbrains.compose.compose
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
kotlin("multiplatform")
@ -12,11 +13,16 @@ version = "1.0-SNAPSHOT" @@ -12,11 +13,16 @@ version = "1.0-SNAPSHOT"
kotlin {
androidTarget()
@OptIn(ExperimentalWasmDsl::class)
wasmJs { browser() }
jvm("desktop") {
compilations.all {
kotlinOptions.jvmTarget = "17"
compileTaskProvider.configure {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}
}
}

8
examples/jetsnack/desktop/build.gradle.kts

@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
import org.jetbrains.compose.compose
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
@ -15,9 +16,12 @@ version = "1.0-SNAPSHOT" @@ -15,9 +16,12 @@ version = "1.0-SNAPSHOT"
kotlin {
jvm {
compilations.all {
kotlinOptions.jvmTarget = "17"
compileTaskProvider.configure {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}
}
withJava()
}
sourceSets {
val jvmMain by getting {

Loading…
Cancel
Save