fix: task dependency

.github/workflows/pull-request.yml

@@ -55,6 +55,22 @@ jobs:
         run: |
           /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 
+      - name: "Install Docker"
+        if: matrix.os-type == 'macos'
+        run: |
+          brew install --cask docker
+
+      - name: "Open Docker"
+        if: matrix.os-type == 'macos'
+        run: |
+          open --background /Applications/Docker.app --args --unattended &
+
+      - name: Wait for Docker
+        run: sleep 10
+
+      # - name: Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v3
+
       - name: "Install autoconf, automake, libtool"
         if: matrix.os-type == 'macos'
         run: |
@@ -75,6 +91,11 @@ jobs:
 
       - name: "Install wasm-pack"
         run: cargo install wasm-pack
+
+      - name: "Install Cross"
+        if: matrix.os-type == 'macos'
+        run: |
+          cargo install cross --git https://github.com/cross-rs/cross
 
       - name: "Test Kotlin code is properly formatted"
         run: ./gradlew ktlintCheck

.github/workflows/release-documentation.yml

@@ -38,7 +38,7 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
             ~/.konan
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          key: "${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}"
           restore-keys: |
             ${{ runner.os }}-gradle-
 

apollo/build.gradle.kts

@@ -533,7 +533,7 @@ kotlin {
                 implementation("org.kotlincrypto.macs:hmac-sha2:0.3.0")
                 implementation("org.kotlincrypto.hash:sha2:0.4.0")
                 implementation("com.squareup.okio:okio:3.7.0")
-                implementation("org.jetbrains.kotlinx:atomicfu:0.23.1")
+                implementation("org.jetbrains.kotlinx:atomicfu:0.23.2")
             }
         }
         val commonTest by getting {
@@ -646,6 +646,7 @@ kotlin {
                     .resolve("kotlin")
             )
         }
+        applyDefaultHierarchyTemplate()
 
         all {
             languageSettings {
@@ -846,8 +847,12 @@ afterEvaluate {
     tasks.withType<KtLintCheckTask> {
         // dependsOn(buildEd25519Bip32Task)
     }
-    tasks.getByName("androidDebugSourcesJar").dependsOn(copyEd25519Bip32GeneratedTask)
-    tasks.getByName("androidReleaseSourcesJar").dependsOn(copyEd25519Bip32GeneratedTask)
+    tasks.withType<org.gradle.jvm.tasks.Jar> {
+        dependsOn(copyEd25519Bip32GeneratedTask)
+    }
+
+    tasks.getByName("androidDebugSourcesJar").dependsOn(copyToAndroidSrc)
+    tasks.getByName("androidReleaseSourcesJar").dependsOn(copyToAndroidSrc)
 
     tasks.getByName("mergeDebugJniLibFolders").dependsOn(buildEd25519Bip32Task)
     tasks.getByName("mergeReleaseJniLibFolders").dependsOn(buildEd25519Bip32Task)