XCFramework Unit Tests

Author: csjones

Exhaustive/Package/Tests/secp256k1Tests/XCTestManifests.swift

@@ -7,8 +7,9 @@ let package = Package(
     products: [
         // WARNING: These APIs should not be considered stable and may change at any time.
         .library(name: "libsecp256k1", targets: ["libsecp256k1"]),
+        .library(name: "libsecp256k1_zkp", targets: ["libsecp256k1_zkp"]),
         .library(name: "P256K", targets: ["P256K"]),
-        .library(name: "zkp", targets: ["zkp"])
+        .library(name: "ZKP", targets: ["ZKP"])
     ],
     dependencies: [
         // Dependencies used for package development
@@ -19,13 +20,13 @@ let package = Package(
     ],
     targets: [
         .target(name: "P256K", dependencies: ["libsecp256k1"]),
-        .target(name: "zkp", dependencies: ["zkp_bindings"]),
+        .target(name: "ZKP", dependencies: ["libsecp256k1_zkp"]),
         .target(
             name: "libsecp256k1",
             cSettings: PackageDescription.CSetting.baseSettings
         ),
         .target(
-            name: "zkp_bindings",
+            name: "libsecp256k1_zkp",
             cSettings: PackageDescription.CSetting.baseSettings + [
                 .define("ENABLE_MODULE_BPPP"),
                 .define("ENABLE_MODULE_ECDSA_ADAPTOR"),
@@ -40,7 +41,7 @@ let package = Package(
                 .headerSearchPath("../../Submodules/secp256k1-zkp/src")
             ]
         ),
-        .testTarget(name: "zkpTests", dependencies: ["zkp"])
+        .testTarget(name: "ZKPTests", dependencies: ["ZKP"])
     ],
     swiftLanguageModes: [.v5],
     cLanguageStandard: .c89

Exhaustive/Package/Tests/secp256k1Tests/secp256k1Tests.swift

@@ -1,5 +1,13 @@
 import ProjectDescription
 
+let deploymentTargets = ProjectDescription.DeploymentTargets.multiplatform(
+    iOS: "18.0",
+    macOS: "15.0",
+    watchOS: "11.0",
+    tvOS: "18.0",
+    visionOS: "2.0"
+)
+
 let project = Project(
     name: "XCFramework",
     packages: [
@@ -17,14 +25,7 @@ let project = Project(
             destinations: [.iPhone, .iPad, .mac, .appleWatch, .appleTv, .appleVision],
             product: .staticFramework,
             bundleId: "dev.21.P256K",
-            deploymentTargets:
-                    .multiplatform(
-                        iOS: "18.0",
-                        macOS: "15.0",
-                        watchOS: "11.0",
-                        tvOS: "18.0",
-                        visionOS: "2.0"
-                    ),
+            deploymentTargets: deploymentTargets,
             sources: ["Sources/P256K/**"],
             resources: [],
             dependencies: [
@@ -38,48 +39,40 @@ let project = Project(
             )
         ),
         .target(
-            name: "XCFrameworkApp",
+            name: "P256KTests",
             destinations: [.iPhone, .iPad, .mac, .appleWatch, .appleTv, .appleVision],
+            product: .unitTests,
+            bundleId: "dev.21.P256KTests",
+            deploymentTargets: deploymentTargets,
+            sources: ["Sources/P256KTests/**"],
+            dependencies: [.target(name: "P256K")],
+            settings: .settings(
+                configurations: [
+                    .debug(name: "Debug", xcconfig: "Resources/P256KTests/Debug.xcconfig"),
+                    .release(name: "Release", xcconfig: "Resources/P256KTests/Release.xcconfig")
+                ]
+            )
+        ),
+        .target(
+            name: "XCFrameworkApp",
+            destinations: [.iPhone, .iPad, .mac, .appleTv, .appleVision],
             product: .app,
             bundleId: "dev.21.XCFrameworkApp",
-            infoPlist: .extendingDefault(
-                with: [
-                    "UILaunchScreen": [
-                        "UIColorName": "",
-                        "UIImageName": "",
-                    ],
-                ]
-            ),
             sources: ["Sources/XCFrameworkApp/**"],
-            resources: ["Resources/XCFrameworkApp/**"],
+            resources: [
+                "Resources/XCFrameworkApp/Assets.xcassets/**",
+                "Resources/XCFrameworkApp/Preview Content/**"
+            ],
+            entitlements: "Resources/XCFrameworkApp/XCFrameworkApp.entitlements",
             dependencies: [
                 .target(name: "P256K")
             ],
             settings: .settings(
                 configurations: [
-                    .debug(name: "Debug", xcconfig: "Resources/P256K/Debug.xcconfig"),
-                    .release(name: "Release", xcconfig: "Resources/P256K/Release.xcconfig")
+                    .debug(name: "Debug", xcconfig: "Resources/XCFrameworkApp/Debug.xcconfig"),
+                    .release(name: "Release", xcconfig: "Resources/XCFrameworkApp/Release.xcconfig")
                 ]
             )
         )
-//        .target(
-//            name: "XCFrameworkTests",
-//            destinations: .iOS,
-//            product: .unitTests,
-//            bundleId: "dev.21.XCFrameworkTests",
-//            infoPlist: nil,
-//            sources: ["Sources/XCFrameworkTests/**"],
-//            resources: ["Resources/XCFrameworkTests/**"],
-//            dependencies: [.target(name: "secp256k1")],
-//            settings: .settings(
-//                base: [
-//                    "SDKROOT": "auto"
-//                ],
-//                configurations: [
-//                    .debug(name: "Debug", xcconfig: "Resources/XCFrameworkTests/Debug.xcconfig"),
-//                    .release(name: "Release", xcconfig: "Resources/XCFrameworkTests/Release.xcconfig")
-//                ]
-//            )
-//        ),
     ]
 )

Package.swift

@@ -66,18 +66,4 @@ ENABLE_TESTABILITY = YES
 // 
 // If enabled, perform validation checks on the product as part of the build process.
 
-VALIDATE_PRODUCT =  NO
-
-
-//********************************************//
-//*         Swift Compiler - General         *//
-//********************************************//
-
-
-// Install Generated Header
-//
-// For frameworks, install the C++/Objective-C generated header describing bridged
-// Swift types into the PUBLIC_HEADERS_FOLDER_PATH so they may be accessed from
-// Objective-C or C++ code using the framework. Defaults to YES.
-
-SWIFT_INSTALL_OBJC_HEADER = YES
+VALIDATE_PRODUCT =  NO

Exhaustive/Package/Dockerfile Projects/Dockerfile

@@ -131,17 +131,3 @@ ENABLE_NS_ASSERTIONS = NO
 // Space-separated list of preprocessor macros of the form foo or foo=bar.
 
 GCC_PREPROCESSOR_DEFINITIONS = 
-
-
-//********************************************//
-//*         Swift Compiler - General         *//
-//********************************************//
-
-
-// Install Generated Header
-//
-// For frameworks, install the C++/Objective-C generated header describing bridged
-// Swift types into the PUBLIC_HEADERS_FOLDER_PATH so they may be accessed from
-// Objective-C or C++ code using the framework. Defaults to YES.
-
-SWIFT_INSTALL_OBJC_HEADER = YES

Exhaustive/Package/Package.swift Projects/Package.swift

@@ -243,6 +243,20 @@ MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = gnu99 gnu++20
 MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c objective-c++
 
 
+//********************************************//
+//*         Swift Compiler - General         *//
+//********************************************//
+
+
+// Install Generated Header
+//
+// For frameworks, install the C++/Objective-C generated header describing bridged
+// Swift types into the PUBLIC_HEADERS_FOLDER_PATH so they may be accessed from
+// Objective-C or C++ code using the framework. Defaults to YES.
+
+SWIFT_INSTALL_OBJC_HEADER = YES
+
+
 //********************************************//
 //*   Static Analysis - Issues - Security    *//
 //********************************************//

Projects/Project.swift

@@ -0,0 +1,12 @@
+//
+// Debug.xcconfig
+//
+// Generated by BuildSettingExtractor on 2/3/25
+// https://buildsettingextractor.com
+//
+
+#include "Shared.xcconfig"
+
+//********************************************//
+//* Currently no build settings in this file *//
+//********************************************//

Exhaustive/Package/README.md Projects/README.md

@@ -0,0 +1,12 @@
+//
+// Release.xcconfig
+//
+// Generated by BuildSettingExtractor on 2/3/25
+// https://buildsettingextractor.com
+//
+
+#include "Shared.xcconfig"
+
+//********************************************//
+//* Currently no build settings in this file *//
+//********************************************//

Projects/Resources/P256K/Debug.xcconfig

@@ -0,0 +1,116 @@
+//
+// Shared.xcconfig
+//
+// Generated by BuildSettingExtractor on 2/3/25
+// https://buildsettingextractor.com
+//
+
+// Code Signing Style
+// 
+// This setting specifies the method used to acquire and locate signing assets. Choose
+// `Automatic` to let Xcode automatically create and update profiles, app IDs, and
+// certificates. Choose `Manual` to create and update these yourself on the developer
+// website.
+
+CODE_SIGN_STYLE = Automatic
+
+
+
+// Current Project Version
+// 
+// This setting defines the current version of the project. The value must be a integer
+// or floating point number, such as `57` or `365.8`.
+// 
+// When `GENERATE_INFOPLIST_FILE` is enabled, sets the value of the
+// [CFBundleVersion](https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleversion)
+// key in the `Info.plist` file to the value of this build setting.
+
+CURRENT_PROJECT_VERSION = 1
+
+
+
+// Generate Info.plist File
+// 
+// If enabled, automatically generate an Info.plist file with content from build
+// settings, and from content in the file pointed to by `INFOPLIST_FILE`, if defined.
+
+GENERATE_INFOPLIST_FILE = YES
+
+
+
+// Marketing Version
+// 
+// This setting defines the user-visible version of the project.
+// 
+// When `GENERATE_INFOPLIST_FILE` is enabled, sets the value of the
+// [CFBundleShortVersionString](https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring)
+// key in the `Info.plist` file to the value of this build setting.
+
+MARKETING_VERSION = 1.0
+
+
+
+// Product Bundle Identifier
+// 
+// A string that uniquely identifies the bundle. The string should be in reverse DNS
+// format using only alphanumeric characters (`A-Z`, `a-z`, `0-9`), the dot (`.`), and
+// the hyphen (`-`).
+// 
+// When `GENERATE_INFOPLIST_FILE` is enabled, sets the value of the
+// [CFBundleIdentifier](https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleidentifier)
+// key in the `Info.plist` file to the value of this build setting.
+
+PRODUCT_BUNDLE_IDENTIFIER = dev.21.P256KTests
+
+
+
+// Product Name
+// 
+// This is the basename of the product generated by the target.
+// 
+// When `GENERATE_INFOPLIST_FILE` is enabled, sets the value of the
+// [CFBundleName](https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundlename)
+// key in the `Info.plist` file to the value of this build setting.
+
+PRODUCT_NAME = $(TARGET_NAME)
+
+
+
+// Use Compiler to Extract Swift Strings
+// 
+// When enabled, the Swift compiler will be used to extract Swift string literal and
+// interpolation `LocalizedStringKey` and `LocalizationKey` types during localization
+// export.
+
+SWIFT_EMIT_LOC_STRINGS = NO
+
+
+
+// Swift Language Version
+// 
+// The language version used to compile the target's Swift code.
+
+SWIFT_VERSION = 5.0
+
+
+
+// Targeted Device Families
+// 
+// Comma-separated list of integers corresponding to device families supported by this
+// target.
+// 
+// The build system uses this information to set the correct value for the
+// `UIDeviceFamily` key it adds to the target's `Info.plist` file. Values inapplicable to
+// the current platform will be removed automatically. This also drives the
+// `--target-device` flag to actool, which determines the idioms selected during catalog
+// compilation.
+// 
+// Possible values include:
+// * *1*: iPhone, iPod touch
+// * *2*: iPad, Mac Catalyst using "Scaled to Match iPad" Interface
+// * *3*: Apple TV
+// * *4*: Apple Watch
+// * *6*: Mac Catalyst using "Optimize for Mac" Interface
+// * *7*: Apple Vision
+
+TARGETED_DEVICE_FAMILY = 1,2

Projects/Resources/P256K/Release.xcconfig

@@ -60,7 +60,7 @@ CURRENT_PROJECT_VERSION = 1
 // Files and directories used only for development. Archive and install builds will
 // exclude this content.
 
-DEVELOPMENT_ASSET_PATHS = "XCFrameworkApp/Preview Content"
+DEVELOPMENT_ASSET_PATHS = "Resources/XCFrameworkApp/Preview Content"
 
 
 
@@ -269,7 +269,7 @@ SWIFT_VERSION = 5.0
 // * *6*: Mac Catalyst using "Optimize for Mac" Interface
 // * *7*: Apple Vision
 
-TARGETED_DEVICE_FAMILY = 1,2,7
+TARGETED_DEVICE_FAMILY = 1,2,3,6,7
 
 
 

Projects/Resources/P256K/Shared.xcconfig

@@ -0,0 +1 @@
+../../../Tests/ZKPTests/P256KTests.swift