Update NPM Dependency Timeout & Install Depenencies before

Author: steve-the-edwards

.github/actions/gradle-task/action.yml

@@ -20,6 +20,9 @@ inputs:
   write-cache-key:
     description: 'The unique identifier for the associated cache.  Any other consumers or producers for this cache must use the same name.'
     default: 'null'
+  failure-path-upload:
+    description: 'The relative path to a desired log for upload if the task fails.'
+    default: 'null'
 
 runs:
   using: 'composite'
@@ -128,9 +131,24 @@ runs:
           ./**/.gradle
         key: ${{runner.os}}-${{inputs.write-cache-key}}-${{hashFiles('**/libs.versions.toml')}}-${{hashFiles('**/gradle.properties')}}-${{hashFiles('**/*.gradle.kts')}}-${{hashFiles('**/src/**/*.kt')}}
 
-    - name: Upload heap dump
+    - name: Upload Logs
+      if: failure()
+      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+      with:
+        name: log-upload
+        path: ${{github.workspace}}/**/*.log
+
+    - name: Upload Heap Dumps
       if: failure()
       uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
       with:
-        name: heap-dump
-        path: ${{github.workspace}}/**/*{.hprof,.log}
+        name: hprof-upload
+        path: ${{github.workspace}}/**/*.hprof
+
+    - name: Upload Specified
+      if: failure() && inputs.failure-path-upload != 'null'
+      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+      with:
+        name: specified-upload
+        path: ${{github.workspace}}/${{inputs.failure-path-upload}}
+

.github/workflows/kotlin.yml

@@ -138,10 +138,30 @@ jobs :
           task : lint
           write-cache-key : main-build-artifacts
 
+  npm-dependencies :
+    name : Install NPM Dependencies
+    runs-on : macos-latest
+    timeout-minutes: 20
+    steps :
+      - name: Checkout
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      ## Configure yarn so it does not timeout updating dependencies.
+      - name: Configure Yarn
+        run: echo "network-timeout 600000" >> ~/.yarnrc
+
+      - name: Install NPM Dependencies
+        uses: ./.github/actions/gradle-task
+        with:
+          task: kotlinNpmInstall --debug
+          write-cache-key : npm-dependencies
+
   check :
     name : Check
-    runs-on : ubuntu-latest
-    needs : build-all
+    runs-on : macos-latest
+    needs :
+      - build-all
+      - npm-dependencies
     timeout-minutes : 20
     steps :
       - name: Checkout
@@ -329,8 +349,9 @@ jobs :
 
   js-tests :
     name : JS Tests
-    runs-on : ubuntu-latest
-    timeout-minutes : 20
+    runs-on : macos-latest
+    needs: npm-dependencies
+    timeout-minutes : 30
     steps :
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

build-logic/settings.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   // Hardcoded as this is upstream of the version catalog. Keep this in sync with that.
-  kotlin("jvm") version "2.1.20" apply false
+  kotlin("jvm") version "2.1.21" apply false
 }
 
 dependencyResolutionManagement {

dependencies/classpath.txt

@@ -58,9 +58,9 @@ com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.11.0
 com.google.crypto.tink:tink:1.7.0
 com.google.dagger:dagger:2.28.3
-com.google.devtools.ksp:symbol-processing-api:2.1.20-1.0.32
-com.google.devtools.ksp:symbol-processing-common-deps:2.1.20-1.0.32
-com.google.devtools.ksp:symbol-processing-gradle-plugin:2.1.20-1.0.32
+com.google.devtools.ksp:symbol-processing-api:2.1.21-2.0.1
+com.google.devtools.ksp:symbol-processing-common-deps:2.1.21-2.0.1
+com.google.devtools.ksp:symbol-processing-gradle-plugin:2.1.21-2.0.1
 com.google.errorprone:error_prone_annotations:2.27.0
 com.google.flatbuffers:flatbuffers-java:1.12.0
 com.google.guava:failureaccess:1.0.1
@@ -137,33 +137,33 @@ org.glassfish.jaxb:txw2:2.3.2
 org.jdom:jdom2:2.0.6
 org.jetbrains.dokka:dokka-core:2.0.0
 org.jetbrains.dokka:dokka-gradle-plugin:2.0.0
-org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.1.20
-org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.20
-org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.1.20
-org.jetbrains.kotlin:kotlin-bom:2.1.20
-org.jetbrains.kotlin:kotlin-build-statistics:2.1.20
-org.jetbrains.kotlin:kotlin-build-tools-api:2.1.20
-org.jetbrains.kotlin:kotlin-compiler-runner:2.1.20
-org.jetbrains.kotlin:kotlin-daemon-client:2.1.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.1.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.1.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.1.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.1.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.1.20
-org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20
-org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.1.20
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.1.20
-org.jetbrains.kotlin:kotlin-native-utils:2.1.20
+org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.1.21
+org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21
+org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.1.21
+org.jetbrains.kotlin:kotlin-bom:2.1.21
+org.jetbrains.kotlin:kotlin-build-statistics:2.1.21
+org.jetbrains.kotlin:kotlin-build-tools-api:2.1.21
+org.jetbrains.kotlin:kotlin-compiler-runner:2.1.21
+org.jetbrains.kotlin:kotlin-daemon-client:2.1.21
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.1.21
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.1.21
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.1.21
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.1.21
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.1.21
+org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.1.21
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.1.21
+org.jetbrains.kotlin:kotlin-native-utils:2.1.21
 org.jetbrains.kotlin:kotlin-reflect:2.0.20
-org.jetbrains.kotlin:kotlin-serialization:2.1.20
-org.jetbrains.kotlin:kotlin-stdlib-common:2.1.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20
+org.jetbrains.kotlin:kotlin-serialization:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
 org.jetbrains.kotlin:kotlin-stdlib:2.0.20
-org.jetbrains.kotlin:kotlin-tooling-core:2.1.20
-org.jetbrains.kotlin:kotlin-util-io:2.1.20
-org.jetbrains.kotlin:kotlin-util-klib-metadata:2.1.20
-org.jetbrains.kotlin:kotlin-util-klib:2.1.20
+org.jetbrains.kotlin:kotlin-tooling-core:2.1.21
+org.jetbrains.kotlin:kotlin-util-io:2.1.21
+org.jetbrains.kotlin:kotlin-util-klib-metadata:2.1.21
+org.jetbrains.kotlin:kotlin-util-klib:2.1.21
 org.jetbrains.kotlinx:binary-compatibility-validator:0.17.0
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0

gradle/libs.versions.toml

@@ -42,7 +42,7 @@ dependencyGuard = "0.5.0"
 
 google-accompanist = "0.18.0"
 google-dagger = "2.40.5"
-google-ksp = "2.1.20-1.0.32"
+google-ksp = "2.1.21-2.0.1"
 google-material = "1.4.0"
 
 groovy = "3.0.9"
@@ -53,7 +53,7 @@ kgx = "0.1.12"
 kotest = "5.1.0"
 # Keep this in sync with what is hard-coded in build-logic/settings.gradle.kts as that is upstream
 # of loading the library versions from this file but should be the same.
-kotlin = "2.1.20"
+kotlin = "2.1.21"
 
 kotlinx-binary-compatibility = "0.17.0"
 kotlinx-coroutines = "1.7.3"

internal-testing-utils/dependencies/runtimeClasspath.txt

@@ -1,5 +1,5 @@
-org.jetbrains.kotlin:kotlin-bom:2.1.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20
-org.jetbrains.kotlin:kotlin-stdlib:2.1.20
+org.jetbrains.kotlin:kotlin-bom:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib:2.1.21
 org.jetbrains:annotations:13.0