- [Versions] Doodle -> 0.10.1

- [Build] Allow Node download - [Build] Increase RAM
nacular · May 7, 2024 · cb4102e · cb4102e
1 parent b328136
commit cb4102e
Show file tree

Hide file tree

Showing 22 changed files with 40 additions and 37 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,6 @@ subprojects {
 }
 
 rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
-    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().download                    = false
     rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion                 = "16.0.0"
     rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().versions.webpackCli.version = "4.10.0"
     rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().versions.webpack.version    = "5.74.0"

diff --git a/buildSrc/src/main/kotlin/Common.kt b/buildSrc/src/main/kotlin/Common.kt
@@ -44,26 +44,29 @@ fun KotlinMultiplatformExtension.wasmJsTargets(executable: Boolean = false) {
         }
         if (executable) {
             binaries.executable()
-
-            if (project.gradle.startParameter.taskNames.find { it.contains("wasmJsBrowserProductionWebpack") } != null) {
-                applyBinaryen {
-                    binaryenArgs = mutableListOf(
-                        "--enable-nontrapping-float-to-int",
-                        "--enable-gc",
-                        "--enable-reference-types",
-                        "--enable-exception-handling",
-                        "--enable-bulk-memory",
-                        "--inline-functions-with-loops",
-                        "--traps-never-happen",
-                        "--fast-math",
-                        "--closed-world",
-                        "--metrics",
-                        "-O3", "--gufa", "--metrics",
-                        "-O3", "--gufa", "--metrics",
-                        "-O3", "--gufa", "--metrics",
-                    )
-                }
-            }
+//            applyBinaryen {
+//                binaryenArgs += "-g" // keep original names
+//            }
+
+//            if (project.gradle.startParameter.taskNames.find { it.contains("wasmJsBrowserProductionWebpack") } != null) {
+//                applyBinaryen {
+//                    binaryenArgs = mutableListOf(
+//                        "--enable-nontrapping-float-to-int",
+//                        "--enable-gc",
+//                        "--enable-reference-types",
+//                        "--enable-exception-handling",
+//                        "--enable-bulk-memory",
+//                        "--inline-functions-with-loops",
+//                        "--traps-never-happen",
+//                        "--fast-math",
+//                        "--closed-world",
+//                        "--metrics",
+//                        "-O3", "--gufa", "--metrics",
+//                        "-O3", "--gufa", "--metrics",
+//                        "-O3", "--gufa", "--metrics",
+//                    )
+//                }
+//            }
         }
     }
 }

diff --git a/docs/calculator/CalculatorRunner.js b/docs/calculator/CalculatorRunner.js
diff --git a/docs/calculator_wasm/CalculatorRunner.js b/docs/calculator_wasm/CalculatorRunner.js
diff --git a/docs/calculator_wasm/doodle-tutorials-CalculatorRunner-wasm-js.wasm b/docs/calculator_wasm/doodle-tutorials-CalculatorRunner-wasm-js.wasm
diff --git a/docs/contacts/ContactsRunner.js b/docs/contacts/ContactsRunner.js
diff --git a/docs/contacts_wasm/ContactsRunner.js b/docs/contacts_wasm/ContactsRunner.js
diff --git a/docs/contacts_wasm/doodle-tutorials-ContactsRunner-wasm-js.wasm b/docs/contacts_wasm/doodle-tutorials-ContactsRunner-wasm-js.wasm
diff --git a/docs/photos/PhotosRunner.js b/docs/photos/PhotosRunner.js
diff --git a/docs/photos_wasm/PhotosRunner.js b/docs/photos_wasm/PhotosRunner.js
diff --git a/docs/photos_wasm/doodle-tutorials-PhotosRunner-wasm-js.wasm b/docs/photos_wasm/doodle-tutorials-PhotosRunner-wasm-js.wasm
diff --git a/docs/tabstrip/TabStripRunner.js b/docs/tabstrip/TabStripRunner.js
diff --git a/docs/tabstrip_wasm/doodle-tutorials-TabStripRunner-wasm-js.wasm b/docs/tabstrip_wasm/doodle-tutorials-TabStripRunner-wasm-js.wasm
diff --git a/docs/timedcards/TimedCardsRunner.js b/docs/timedcards/TimedCardsRunner.js
diff --git a/docs/timedcards_wasm/TimedCardsRunner.js b/docs/timedcards_wasm/TimedCardsRunner.js
diff --git a/docs/timedcards_wasm/doodle-tutorials-TimedCardsRunner-wasm-js.wasm b/docs/timedcards_wasm/doodle-tutorials-TimedCardsRunner-wasm-js.wasm
diff --git a/docs/todo/TodoRunner.js b/docs/todo/TodoRunner.js
diff --git a/docs/todo_wasm/TodoRunner.js b/docs/todo_wasm/TodoRunner.js
diff --git a/docs/todo_wasm/doodle-tutorials-TodoRunner-wasm-js.wasm b/docs/todo_wasm/doodle-tutorials-TodoRunner-wasm-js.wasm
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-version              = 0.10.0
-group                = io.nacular.doodle-tutorials
+version = 0.10.1
+group   = io.nacular.doodle-tutorials
 
-org.gradle.jvmargs          = -Xmx1024m
+org.gradle.jvmargs          = -Xmx2048m
 kotlin.mpp.stability.nowarn = true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlinVersion                    = { strictly = "1.9.22" }
 coroutinesVersion                = { strictly = "1.8.0"  }
 kodeinVersion                    = { strictly = "7.21.1" }
-doodleVersion                    = { strictly = "0.10.0" }
+doodleVersion                    = { strictly = "0.10.1" }
 slf4jVersion                     = { strictly = "2.0.9"  }
 mockkVersion                     = { strictly = "1.13.7" }
 jupiterVersion                   = { strictly = "5.10.0" }
@@ -32,6 +32,7 @@ logback-classic                  = { module = "ch.qos.logback:logback-classic",
 ktor-serialization               = { module = "io.ktor:ktor-client-serialization",                version.ref = "ktorVersion"          }
 serialization-json               = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serializationVersion" }
 coroutines-core                  = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core",    version.ref = "coroutinesVersion"    }
+date-time                        = { module = "org.jetbrains.kotlinx:kotlinx-datetime",           version.ref = "dateTimeVersion"      }
 
 [bundles]
 ktor-client                      = ["ktor-client-core", "ktor-client-content", "ktor-serialization-json"]

diff --git a/site/src/components/DocApps.js b/site/src/components/DocApps.js