diff --git a/gradle.properties b/gradle.properties index a2bbd66..823542f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4g # Publishing : Required GROUP=io.eqoty.secretk -VERSION_NAME=1.1.0 +VERSION_NAME=1.2.0 POM_ARTIFACT_ID=client # Publishing : Optional diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6c10920..156eb89 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -58,7 +58,9 @@ vanniktech-publish = "0.21.0" ## ⬆ = "0.23.1" ## ⬆ = "0.23.2-SNAPSHOT" ## ⬆ = "0.24.0-SNAPSHOT" -swift-package = "2.1.1" +swift-package = "2.0.5-arm64" +## ⬆ = "2.1.0" +## ⬆ = "2.1.1" okio = "3.2.0" ##⬆ = "3.3.0-SNAPSHOT" ##⬆ = "3.3.0" diff --git a/secretk.xcframework/Info.plist b/secretk.xcframework/Info.plist index 04a25a7..32f876f 100644 --- a/secretk.xcframework/Info.plist +++ b/secretk.xcframework/Info.plist @@ -5,22 +5,23 @@ AvailableLibraries - DebugSymbolsPath - dSYMs LibraryIdentifier - ios-arm64 + macos-arm64_x86_64 LibraryPath secretk.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform - ios + macos + DebugSymbolsPath + dSYMs LibraryIdentifier - macos-arm64_x86_64 + ios-arm64_x86_64-simulator LibraryPath secretk.framework SupportedArchitectures @@ -29,24 +30,23 @@ x86_64 SupportedPlatform - macos + ios + SupportedPlatformVariant + simulator DebugSymbolsPath dSYMs LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64 LibraryPath secretk.framework SupportedArchitectures arm64 - x86_64 SupportedPlatform ios - SupportedPlatformVariant - simulator CFBundlePackageType diff --git a/secretk.xcframework/ios-arm64/dSYMs/secretk.framework.dSYM/Contents/Resources/DWARF/secretk b/secretk.xcframework/ios-arm64/dSYMs/secretk.framework.dSYM/Contents/Resources/DWARF/secretk index c665045..df530cb 100644 Binary files a/secretk.xcframework/ios-arm64/dSYMs/secretk.framework.dSYM/Contents/Resources/DWARF/secretk and b/secretk.xcframework/ios-arm64/dSYMs/secretk.framework.dSYM/Contents/Resources/DWARF/secretk differ diff --git a/secretk.xcframework/ios-arm64/secretk.framework/Headers/secretk.h b/secretk.xcframework/ios-arm64/secretk.framework/Headers/secretk.h index d52f8fd..854d5d2 100644 --- a/secretk.xcframework/ios-arm64/secretk.framework/Headers/secretk.h +++ b/secretk.xcframework/ios-arm64/secretk.framework/Headers/secretk.h @@ -2730,6 +2730,7 @@ __attribute__((swift_name("Wallet"))) __attribute__((swift_name("BaseWallet"))) @interface SecretkBaseWallet : SecretkBase - (SecretkAccountSigningData *)addAccountMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("addAccount(mnemonic:)"))); +- (SecretkAccountSigningData *)addAccountPrivkey:(id)privkey __attribute__((swift_name("addAccount(privkey:)"))); /** * @note This method converts instances of CancellationException to errors. @@ -2766,9 +2767,10 @@ __attribute__((swift_name("AminoWallet"))) __attribute__((objc_subclassing_restricted)) __attribute__((swift_name("DirectSigningWallet"))) @interface SecretkDirectSigningWallet : SecretkBaseWallet +- (instancetype)initWithMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("init(mnemonic:)"))) __attribute__((objc_designated_initializer)); +- (instancetype)initWithPrivkey:(id)privkey __attribute__((swift_name("init(privkey:)"))) __attribute__((objc_designated_initializer)); - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); + (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); -- (instancetype)initWithMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("init(mnemonic:)"))) __attribute__((objc_designated_initializer)); /** * @note This method converts instances of CancellationException to errors. diff --git a/secretk.xcframework/ios-arm64/secretk.framework/secretk b/secretk.xcframework/ios-arm64/secretk.framework/secretk index df003d6..a78731e 100755 Binary files a/secretk.xcframework/ios-arm64/secretk.framework/secretk and b/secretk.xcframework/ios-arm64/secretk.framework/secretk differ diff --git a/secretk.xcframework/ios-arm64_x86_64-simulator/dSYMs/secretk.framework.dSYM/Contents/Resources/DWARF/secretk b/secretk.xcframework/ios-arm64_x86_64-simulator/dSYMs/secretk.framework.dSYM/Contents/Resources/DWARF/secretk index 5ee2c9c..537c319 100644 Binary files a/secretk.xcframework/ios-arm64_x86_64-simulator/dSYMs/secretk.framework.dSYM/Contents/Resources/DWARF/secretk and b/secretk.xcframework/ios-arm64_x86_64-simulator/dSYMs/secretk.framework.dSYM/Contents/Resources/DWARF/secretk differ diff --git a/secretk.xcframework/ios-arm64_x86_64-simulator/secretk.framework/Headers/secretk.h b/secretk.xcframework/ios-arm64_x86_64-simulator/secretk.framework/Headers/secretk.h index d52f8fd..854d5d2 100644 --- a/secretk.xcframework/ios-arm64_x86_64-simulator/secretk.framework/Headers/secretk.h +++ b/secretk.xcframework/ios-arm64_x86_64-simulator/secretk.framework/Headers/secretk.h @@ -2730,6 +2730,7 @@ __attribute__((swift_name("Wallet"))) __attribute__((swift_name("BaseWallet"))) @interface SecretkBaseWallet : SecretkBase - (SecretkAccountSigningData *)addAccountMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("addAccount(mnemonic:)"))); +- (SecretkAccountSigningData *)addAccountPrivkey:(id)privkey __attribute__((swift_name("addAccount(privkey:)"))); /** * @note This method converts instances of CancellationException to errors. @@ -2766,9 +2767,10 @@ __attribute__((swift_name("AminoWallet"))) __attribute__((objc_subclassing_restricted)) __attribute__((swift_name("DirectSigningWallet"))) @interface SecretkDirectSigningWallet : SecretkBaseWallet +- (instancetype)initWithMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("init(mnemonic:)"))) __attribute__((objc_designated_initializer)); +- (instancetype)initWithPrivkey:(id)privkey __attribute__((swift_name("init(privkey:)"))) __attribute__((objc_designated_initializer)); - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); + (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); -- (instancetype)initWithMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("init(mnemonic:)"))) __attribute__((objc_designated_initializer)); /** * @note This method converts instances of CancellationException to errors. diff --git a/secretk.xcframework/ios-arm64_x86_64-simulator/secretk.framework/secretk b/secretk.xcframework/ios-arm64_x86_64-simulator/secretk.framework/secretk index a982ecc..76a02c6 100755 Binary files a/secretk.xcframework/ios-arm64_x86_64-simulator/secretk.framework/secretk and b/secretk.xcframework/ios-arm64_x86_64-simulator/secretk.framework/secretk differ diff --git a/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Headers/secretk.h b/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Headers/secretk.h index d52f8fd..854d5d2 100644 --- a/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Headers/secretk.h +++ b/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Headers/secretk.h @@ -2730,6 +2730,7 @@ __attribute__((swift_name("Wallet"))) __attribute__((swift_name("BaseWallet"))) @interface SecretkBaseWallet : SecretkBase - (SecretkAccountSigningData *)addAccountMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("addAccount(mnemonic:)"))); +- (SecretkAccountSigningData *)addAccountPrivkey:(id)privkey __attribute__((swift_name("addAccount(privkey:)"))); /** * @note This method converts instances of CancellationException to errors. @@ -2766,9 +2767,10 @@ __attribute__((swift_name("AminoWallet"))) __attribute__((objc_subclassing_restricted)) __attribute__((swift_name("DirectSigningWallet"))) @interface SecretkDirectSigningWallet : SecretkBaseWallet +- (instancetype)initWithMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("init(mnemonic:)"))) __attribute__((objc_designated_initializer)); +- (instancetype)initWithPrivkey:(id)privkey __attribute__((swift_name("init(privkey:)"))) __attribute__((objc_designated_initializer)); - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); + (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); -- (instancetype)initWithMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("init(mnemonic:)"))) __attribute__((objc_designated_initializer)); /** * @note This method converts instances of CancellationException to errors. diff --git a/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/A/Headers/secretk.h b/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/A/Headers/secretk.h index d52f8fd..854d5d2 100644 --- a/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/A/Headers/secretk.h +++ b/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/A/Headers/secretk.h @@ -2730,6 +2730,7 @@ __attribute__((swift_name("Wallet"))) __attribute__((swift_name("BaseWallet"))) @interface SecretkBaseWallet : SecretkBase - (SecretkAccountSigningData *)addAccountMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("addAccount(mnemonic:)"))); +- (SecretkAccountSigningData *)addAccountPrivkey:(id)privkey __attribute__((swift_name("addAccount(privkey:)"))); /** * @note This method converts instances of CancellationException to errors. @@ -2766,9 +2767,10 @@ __attribute__((swift_name("AminoWallet"))) __attribute__((objc_subclassing_restricted)) __attribute__((swift_name("DirectSigningWallet"))) @interface SecretkDirectSigningWallet : SecretkBaseWallet +- (instancetype)initWithMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("init(mnemonic:)"))) __attribute__((objc_designated_initializer)); +- (instancetype)initWithPrivkey:(id)privkey __attribute__((swift_name("init(privkey:)"))) __attribute__((objc_designated_initializer)); - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); + (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); -- (instancetype)initWithMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("init(mnemonic:)"))) __attribute__((objc_designated_initializer)); /** * @note This method converts instances of CancellationException to errors. diff --git a/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/A/secretk b/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/A/secretk index be085ac..1bf5f7c 100755 Binary files a/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/A/secretk and b/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/A/secretk differ diff --git a/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/Current/Headers/secretk.h b/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/Current/Headers/secretk.h index d52f8fd..854d5d2 100644 --- a/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/Current/Headers/secretk.h +++ b/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/Current/Headers/secretk.h @@ -2730,6 +2730,7 @@ __attribute__((swift_name("Wallet"))) __attribute__((swift_name("BaseWallet"))) @interface SecretkBaseWallet : SecretkBase - (SecretkAccountSigningData *)addAccountMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("addAccount(mnemonic:)"))); +- (SecretkAccountSigningData *)addAccountPrivkey:(id)privkey __attribute__((swift_name("addAccount(privkey:)"))); /** * @note This method converts instances of CancellationException to errors. @@ -2766,9 +2767,10 @@ __attribute__((swift_name("AminoWallet"))) __attribute__((objc_subclassing_restricted)) __attribute__((swift_name("DirectSigningWallet"))) @interface SecretkDirectSigningWallet : SecretkBaseWallet +- (instancetype)initWithMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("init(mnemonic:)"))) __attribute__((objc_designated_initializer)); +- (instancetype)initWithPrivkey:(id)privkey __attribute__((swift_name("init(privkey:)"))) __attribute__((objc_designated_initializer)); - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); + (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); -- (instancetype)initWithMnemonic:(NSString * _Nullable)mnemonic __attribute__((swift_name("init(mnemonic:)"))) __attribute__((objc_designated_initializer)); /** * @note This method converts instances of CancellationException to errors. diff --git a/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/Current/secretk b/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/Current/secretk index 835a8b6..96b639c 100755 Binary files a/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/Current/secretk and b/secretk.xcframework/macos-arm64_x86_64/secretk.framework/Versions/Current/secretk differ diff --git a/secretk/src/commonTest/kotlin/io/eqoty/ClientTests.kt b/secretk/src/commonTest/kotlin/io/eqoty/ClientTests.kt index ea55f8c..cd18f88 100644 --- a/secretk/src/commonTest/kotlin/io/eqoty/ClientTests.kt +++ b/secretk/src/commonTest/kotlin/io/eqoty/ClientTests.kt @@ -50,7 +50,7 @@ class ClientTests { val walletFromPrivKey = DirectSigningWallet(privKey) assertEquals(walletFromPrivKey.getAccounts()[0].address, wallet.getAccounts()[0].address) } - + @Test fun testCreateViewingKeyAndUseToQuery() = runTest { val contractAddress = "secret1lz4m46vpdn8f2aj8yhtnexus40663udv7hhprm"