feat(mnemonic): js doesnt handle List and swift doesnt handle Array t…

…his is the solution (#105)
hyperledger · Oct 30, 2023 · e65e0f0 · e65e0f0
1 parent 3f32662
commit e65e0f0
Show file tree

Hide file tree

Showing 33 changed files with 2,524 additions and 3,114 deletions.
diff --git a/.scripts/TemplatePackage.swift b/.scripts/TemplatePackage.swift
@@ -2,27 +2,27 @@
 import PackageDescription
 
 let package = Package(
-    name: "Apollo",
+    name: "ApolloLibrary",
     platforms: [
         .iOS(.v13),
         .macOS(.v11)
     ],
     products: [
         .library(
-            name: "Apollo",
-            targets: ["Apollo"]
+            name: "ApolloLibrary",
+            targets: ["ApolloBinary"]
         ),
     ],
     targets: [
         // LOCAL
         // .binaryTarget(
-        //     name: "Apollo",
-        //     path: "./Apollo.xcframework"
+        //     name: "ApolloBinary",
+        //     path: "./base-asymmetric-encryption/build/packages/ApolloSwift/Apollo.xcframework.zip"
         // ),
 
         // RELEASE
         .binaryTarget(
-            name: "Apollo",
+            name: "ApolloBinary",
             url: "https://github.com/input-output-hk/atala-prism-apollo/releases/download/<ref>/Apollo.xcframework.zip",
             checksum: "<checksum>"
         )

diff --git a/Package.swift b/Package.swift
@@ -2,29 +2,29 @@
 import PackageDescription
 
 let package = Package(
-    name: "Apollo",
+    name: "ApolloLibrary",
     platforms: [
         .iOS(.v13),
         .macOS(.v11)
     ],
     products: [
         .library(
-            name: "Apollo",
-            targets: ["Apollo"]
+            name: "ApolloLibrary",
+            targets: ["ApolloBinary"]
         ),
     ],
     targets: [
         // LOCAL
         // .binaryTarget(
-        //     name: "Apollo",
-        //     path: "./Apollo.xcframework"
+        //     name: "ApolloBinary",
+        //     path: "./base-asymmetric-encryption/build/packages/ApolloSwift/Apollo.xcframework.zip"
         // ),
 
         // RELEASE
         .binaryTarget(
-            name: "Apollo",
-            url: "https://github.com/input-output-hk/atala-prism-apollo/releases/download/1.0.3/Apollo.xcframework.zip",
-            checksum: "89989b558887431844d5395c845a098678577b3c1dc867146ca058f0ce9e63dd"
+            name: "ApolloBinary",
+            url: "https://github.com/input-output-hk/atala-prism-apollo/releases/download/testSwift2/Apollo.xcframework.zip",
+            checksum: "817420e940206f912c5dcf92acb3b38bd2b87caef6caebc707ff1ff98c5778b8"
         )
     ]
 )
diff --git a/aes/build.gradle.kts b/aes/build.gradle.kts
diff --git a/apollo/build.gradle.kts b/apollo/build.gradle.kts
@@ -27,10 +27,8 @@ kotlin {
     }
     if (os.isMacOsX) {
         ios()
-        if (System.getProperty("os.arch") != "x86_64") { // M1Chip
-            iosSimulatorArm64()
-            macosArm64()
-        }
+        iosSimulatorArm64()
+        macosArm64()
     }
     js(IR) {
         this.moduleName = currentModuleName
@@ -99,27 +97,23 @@ kotlin {
             val iosMain by getting
             val iosTest by getting
 
-            if (System.getProperty("os.arch") != "x86_64") { // M1Chip
-                val iosSimulatorArm64Main by getting {
-                    this.dependsOn(iosMain)
-                }
-                val iosSimulatorArm64Test by getting {
-                    this.dependsOn(iosTest)
-                }
-                val macosArm64Main by getting
-                val macosArm64Test by getting
+            val iosSimulatorArm64Main by getting {
+                this.dependsOn(iosMain)
             }
+            val iosSimulatorArm64Test by getting {
+                this.dependsOn(iosTest)
+            }
+            val macosArm64Main by getting
+            val macosArm64Test by getting
         }
     }
 
     if (os.isMacOsX) {
         tasks.getByName<org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest>("iosX64Test") {
             device.set("iPhone 14 Plus")
         }
-        if (System.getProperty("os.arch") != "x86_64") { // M1Chip
-            tasks.getByName<org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest>("iosSimulatorArm64Test") {
-                device.set("iPhone 14 Plus")
-            }
+        tasks.getByName<org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest>("iosSimulatorArm64Test") {
+            device.set("iPhone 14 Plus")
         }
     }
 }