From 5c4038ff90d0e57a26b6c6e4683f027bd84761d7 Mon Sep 17 00:00:00 2001 From: Jacky Date: Wed, 7 Oct 2020 14:41:39 +0900 Subject: [PATCH 01/10] SPM --- Package.swift | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..d63a182 --- /dev/null +++ b/Package.swift @@ -0,0 +1,22 @@ +// swift-tools-version:5.3 +import PackageDescription + +let package = Package( + name: "MnemonicKit", + products: [ + .library( + name: "MnemonicKit", + targets: ["MnemonicKit_iOS"]), + ], + targets: [ + .target( + name: "MnemonicKit", + dependencies: ["CryptoSwift"], + path: "MnemonicKit", + exclude: ["Info.plist"]), + .testTarget( + name: "MnemonicKitTests", + dependencies: ["MnemonicKit"], + exclude: ["Info.plist"]), + ] +) \ No newline at end of file From 7d0e7eeea261b2e8ce987eb19a089d47c9d9cc95 Mon Sep 17 00:00:00 2001 From: Jacky Date: Wed, 7 Oct 2020 14:46:29 +0900 Subject: [PATCH 02/10] Update SPM --- Package.swift | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index d63a182..9136498 100644 --- a/Package.swift +++ b/Package.swift @@ -6,11 +6,16 @@ let package = Package( products: [ .library( name: "MnemonicKit", - targets: ["MnemonicKit_iOS"]), + targets: ["MnemonicKit_iOS", "MnemonicKit_macOS"]), ], targets: [ .target( - name: "MnemonicKit", + name: "MnemonicKit_iOS", + dependencies: ["CryptoSwift"], + path: "MnemonicKit", + exclude: ["Info.plist"]), + .target( + name: "MnemonicKit_macOS", dependencies: ["CryptoSwift"], path: "MnemonicKit", exclude: ["Info.plist"]), From 12cdcc015cd1f8b492d132b5f496082830f981f3 Mon Sep 17 00:00:00 2001 From: Jacky Date: Wed, 7 Oct 2020 14:49:57 +0900 Subject: [PATCH 03/10] update SPM dependencies --- Package.swift | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 9136498..6080273 100644 --- a/Package.swift +++ b/Package.swift @@ -11,12 +11,22 @@ let package = Package( targets: [ .target( name: "MnemonicKit_iOS", - dependencies: ["CryptoSwift"], + dependencies: [ + .package( + url: "https://github.com/krzyzanowskim/CryptoSwift", + from: "1.3.2" + ) + ], path: "MnemonicKit", exclude: ["Info.plist"]), .target( name: "MnemonicKit_macOS", - dependencies: ["CryptoSwift"], + dependencies: [ + .package( + url: "https://github.com/krzyzanowskim/CryptoSwift", + from: "1.3.2" + ) + ], path: "MnemonicKit", exclude: ["Info.plist"]), .testTarget( From 681c5423e844f8e58e9f815f4e17db8f4dddfca0 Mon Sep 17 00:00:00 2001 From: Jacky Date: Wed, 7 Oct 2020 14:53:37 +0900 Subject: [PATCH 04/10] update SPM --- Package.swift | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Package.swift b/Package.swift index 6080273..28251dc 100644 --- a/Package.swift +++ b/Package.swift @@ -8,25 +8,21 @@ let package = Package( name: "MnemonicKit", targets: ["MnemonicKit_iOS", "MnemonicKit_macOS"]), ], + dependencies: [ + .package( + url: "https://github.com/krzyzanowskim/CryptoSwift", + from: "1.3.2" + ) + ], targets: [ .target( name: "MnemonicKit_iOS", - dependencies: [ - .package( - url: "https://github.com/krzyzanowskim/CryptoSwift", - from: "1.3.2" - ) - ], + dependencies: ["CryptoSwift"], path: "MnemonicKit", exclude: ["Info.plist"]), .target( name: "MnemonicKit_macOS", - dependencies: [ - .package( - url: "https://github.com/krzyzanowskim/CryptoSwift", - from: "1.3.2" - ) - ], + dependencies: ["CryptoSwift"], path: "MnemonicKit", exclude: ["Info.plist"]), .testTarget( From e899e7620436378f46d9a60a10f803e09fa9d803 Mon Sep 17 00:00:00 2001 From: Jacky Date: Wed, 7 Oct 2020 14:55:29 +0900 Subject: [PATCH 05/10] update SPM --- Package.swift | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Package.swift b/Package.swift index 28251dc..ef3253c 100644 --- a/Package.swift +++ b/Package.swift @@ -25,9 +25,5 @@ let package = Package( dependencies: ["CryptoSwift"], path: "MnemonicKit", exclude: ["Info.plist"]), - .testTarget( - name: "MnemonicKitTests", - dependencies: ["MnemonicKit"], - exclude: ["Info.plist"]), ] ) \ No newline at end of file From 52a0622c9d9418740049fd74c9e8f9051e135297 Mon Sep 17 00:00:00 2001 From: Jacky Date: Wed, 7 Oct 2020 15:03:31 +0900 Subject: [PATCH 06/10] update SPM --- Package.swift | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index ef3253c..6ce895b 100644 --- a/Package.swift +++ b/Package.swift @@ -3,6 +3,10 @@ import PackageDescription let package = Package( name: "MnemonicKit", + platforms: [ + .macOS(.v10_12), + .iOS(.v8)//, + ], products: [ .library( name: "MnemonicKit", @@ -20,10 +24,5 @@ let package = Package( dependencies: ["CryptoSwift"], path: "MnemonicKit", exclude: ["Info.plist"]), - .target( - name: "MnemonicKit_macOS", - dependencies: ["CryptoSwift"], - path: "MnemonicKit", - exclude: ["Info.plist"]), ] ) \ No newline at end of file From b4bef95f45ae82e8e43502c366625b2843d1a883 Mon Sep 17 00:00:00 2001 From: Jacky Date: Wed, 7 Oct 2020 15:05:03 +0900 Subject: [PATCH 07/10] update SPM --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 6ce895b..fea40c7 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let package = Package( products: [ .library( name: "MnemonicKit", - targets: ["MnemonicKit_iOS", "MnemonicKit_macOS"]), + targets: ["MnemonicKit_iOS"]), ], dependencies: [ .package( From b82cc3b142f4b2c878742b9e13c5c831946275f9 Mon Sep 17 00:00:00 2001 From: Jacky Date: Wed, 7 Oct 2020 15:07:24 +0900 Subject: [PATCH 08/10] update SPM --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index fea40c7..e1c77a8 100644 --- a/Package.swift +++ b/Package.swift @@ -5,7 +5,7 @@ let package = Package( name: "MnemonicKit", platforms: [ .macOS(.v10_12), - .iOS(.v8)//, + .iOS(.v9)//, ], products: [ .library( From 4644bf39f1473eec26ecd3be0b4f0e9db6ee7a0f Mon Sep 17 00:00:00 2001 From: Jacky Date: Wed, 7 Oct 2020 15:15:24 +0900 Subject: [PATCH 09/10] refactor project for SPM --- MnemonicKit-Info.plist | 22 ++++ MnemonicKit.xcodeproj/project.pbxproj | 153 +++++++++++++++++++++++++- Package.swift | 4 +- 3 files changed, 171 insertions(+), 8 deletions(-) create mode 100644 MnemonicKit-Info.plist diff --git a/MnemonicKit-Info.plist b/MnemonicKit-Info.plist new file mode 100644 index 0000000..e1fe4cf --- /dev/null +++ b/MnemonicKit-Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + + diff --git a/MnemonicKit.xcodeproj/project.pbxproj b/MnemonicKit.xcodeproj/project.pbxproj index e77ffac..7ff3a6a 100644 --- a/MnemonicKit.xcodeproj/project.pbxproj +++ b/MnemonicKit.xcodeproj/project.pbxproj @@ -14,6 +14,12 @@ 59FE4CF322226154B9B687CE /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8871A4FF644B8E4F13723E6 /* CryptoSwift.framework */; }; 5A11F552AAEA9E58CE8CC50D /* CryptoSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F8871A4FF644B8E4F13723E6 /* CryptoSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 81D18E658D26212E4D7647D8 /* String+MnemonicData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 256E6CB62D82160ACBA1512E /* String+MnemonicData.swift */; }; + 853046A6252D93D10045DC7E /* Chinese.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A5E025936BA30D49D80AF51 /* Chinese.swift */; }; + 853046A7252D93D10045DC7E /* Data+BitArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2D9394FFD7755F40E53D60E /* Data+BitArray.swift */; }; + 853046A8252D93D10045DC7E /* English.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D6F81AB601CF04F3F1E52E3 /* English.swift */; }; + 853046A9252D93D10045DC7E /* Mnemonic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12B9024EB02AB18E1F44789A /* Mnemonic.swift */; }; + 853046AA252D93D10045DC7E /* String+MnemonicData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 256E6CB62D82160ACBA1512E /* String+MnemonicData.swift */; }; + 853046AD252D93D10045DC7E /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA1EBAC8ABDF9E72ABA1B642 /* CryptoSwift.framework */; }; 8DC3D3DA23DBEAD93257DE4F /* MnemonicKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC7EE929BD11BA8AB38F9C19 /* MnemonicKit.framework */; }; 8EAFFDA8F2A30674EA9EBBBC /* Data+BitArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2D9394FFD7755F40E53D60E /* Data+BitArray.swift */; }; 934F1409AF864AAA0AB52FDA /* English.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D6F81AB601CF04F3F1E52E3 /* English.swift */; }; @@ -85,6 +91,8 @@ 256E6CB62D82160ACBA1512E /* String+MnemonicData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+MnemonicData.swift"; sourceTree = ""; }; 65B1627123A1131289B4110A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 7DCB97C4881969FDB72C61DB /* MnemonicKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MnemonicKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 853046B1252D93D10045DC7E /* MnemonicKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MnemonicKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 853046B2252D93D20045DC7E /* MnemonicKit-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "MnemonicKit-Info.plist"; path = "/Users/jacky/Desktop/Workspaces/tezos/MnemonicKit/MnemonicKit-Info.plist"; sourceTree = ""; }; BA1EBAC8ABDF9E72ABA1B642 /* CryptoSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CryptoSwift.framework; sourceTree = ""; }; C3E5287598681E0527694214 /* vectors.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = vectors.json; sourceTree = ""; }; D2D9394FFD7755F40E53D60E /* Data+BitArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+BitArray.swift"; sourceTree = ""; }; @@ -110,6 +118,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 853046AC252D93D10045DC7E /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 853046AD252D93D10045DC7E /* CryptoSwift.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; C8E8BDAC69770AAFEE241085 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -187,6 +203,7 @@ CBCDA5914B8679B57A496D9A /* Tests */ = { isa = PBXGroup; children = ( + 853046B2252D93D20045DC7E /* MnemonicKit-Info.plist */, 23F75813C686C37B78DE459E /* Info.plist */, 0A5EC633D7524CD344B44513 /* MnemonicKitTests.swift */, C3E5287598681E0527694214 /* vectors.json */, @@ -211,6 +228,7 @@ DC7EE929BD11BA8AB38F9C19 /* MnemonicKit.framework */, 1645FE576891F45DC72864F6 /* MnemonicKitTests.xctest */, EBA32888ED203FE1DA16BFF1 /* MnemonicKitTests.xctest */, + 853046B1252D93D10045DC7E /* MnemonicKit.framework */, ); name = Products; sourceTree = ""; @@ -271,6 +289,23 @@ productReference = EBA32888ED203FE1DA16BFF1 /* MnemonicKitTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; + 853046A4252D93D10045DC7E /* MnemonicKit */ = { + isa = PBXNativeTarget; + buildConfigurationList = 853046AE252D93D10045DC7E /* Build configuration list for PBXNativeTarget "MnemonicKit" */; + buildPhases = ( + 853046A5252D93D10045DC7E /* Sources */, + 853046AB252D93D10045DC7E /* SwiftLint */, + 853046AC252D93D10045DC7E /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = MnemonicKit; + productName = MnemonicKit_iOS; + productReference = 853046B1252D93D10045DC7E /* MnemonicKit.framework */; + productType = "com.apple.product-type.framework"; + }; D57DFC1DDD9E99A6F84A0A0B /* MnemonicKitTests_iOS */ = { isa = PBXNativeTarget; buildConfigurationList = 8D81EB8096D3E6550D6B8607 /* Build configuration list for PBXNativeTarget "MnemonicKitTests_iOS" */; @@ -297,8 +332,6 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 1020; - TargetAttributes = { - }; }; buildConfigurationList = F5079FB8BED8C51BDEEB8C7C /* Build configuration list for PBXProject "MnemonicKit" */; compatibilityVersion = "Xcode 10.0"; @@ -315,6 +348,7 @@ 6C3E5C33EDE0FF1268354BCC /* MnemonicKitTests_macOS */, 3965BB285FF94319B8863435 /* MnemonicKit_iOS */, 3A14B55BA3F3716B46D8CA3F /* MnemonicKit_macOS */, + 853046A4252D93D10045DC7E /* MnemonicKit */, ); }; /* End PBXProject section */ @@ -339,6 +373,24 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 853046AB252D93D10045DC7E /* SwiftLint */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = SwiftLint; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "swiftlint autocorrect --config .swiftlint.yml"; + }; 992C7E7D41706D89AF40F3B0 /* SwiftLint */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -402,6 +454,18 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 853046A5252D93D10045DC7E /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 853046A6252D93D10045DC7E /* Chinese.swift in Sources */, + 853046A7252D93D10045DC7E /* Data+BitArray.swift in Sources */, + 853046A8252D93D10045DC7E /* English.swift in Sources */, + 853046A9252D93D10045DC7E /* Mnemonic.swift in Sources */, + 853046AA252D93D10045DC7E /* String+MnemonicData.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 889B548685EC4F2922804A67 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -454,7 +518,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.keefertaylor.MnemonicKit-iOS"; + PRODUCT_BUNDLE_IDENTIFIER = com.keefertaylor.MnemonicKit; PRODUCT_NAME = MnemonicKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -581,7 +645,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.keefertaylor.MnemonicKit-iOS"; + PRODUCT_BUNDLE_IDENTIFIER = com.keefertaylor.MnemonicKit; PRODUCT_NAME = MnemonicKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -611,6 +675,64 @@ }; name = Debug; }; + 853046AF252D93D10045DC7E /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + INFOPLIST_FILE = "MnemonicKit_iOS copy-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "com.keefertaylor.MnemonicKit-iOS"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 853046B0252D93D10045DC7E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + INFOPLIST_FILE = "MnemonicKit_iOS copy-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "com.keefertaylor.MnemonicKit-iOS"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; 8B38DB2F96313C308F6E7C2E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -654,7 +776,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage/Build/iOS"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_VERSION = 5.0; @@ -711,7 +838,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage/Build/iOS"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -763,6 +895,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 853046AE252D93D10045DC7E /* Build configuration list for PBXNativeTarget "MnemonicKit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 853046AF252D93D10045DC7E /* Debug */, + 853046B0252D93D10045DC7E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; 8D81EB8096D3E6550D6B8607 /* Build configuration list for PBXNativeTarget "MnemonicKitTests_iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Package.swift b/Package.swift index e1c77a8..90dfdf7 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let package = Package( products: [ .library( name: "MnemonicKit", - targets: ["MnemonicKit_iOS"]), + targets: ["MnemonicKit"]), ], dependencies: [ .package( @@ -20,7 +20,7 @@ let package = Package( ], targets: [ .target( - name: "MnemonicKit_iOS", + name: "MnemonicKit", dependencies: ["CryptoSwift"], path: "MnemonicKit", exclude: ["Info.plist"]), From cfec6bb74fe87bc2be402ce31d4abfb4c7f4f48b Mon Sep 17 00:00:00 2001 From: Jacky Date: Wed, 7 Oct 2020 15:23:18 +0900 Subject: [PATCH 10/10] meta data updated --- MnemonicKit.xcodeproj/project.pbxproj | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/MnemonicKit.xcodeproj/project.pbxproj b/MnemonicKit.xcodeproj/project.pbxproj index 7ff3a6a..5508684 100644 --- a/MnemonicKit.xcodeproj/project.pbxproj +++ b/MnemonicKit.xcodeproj/project.pbxproj @@ -518,7 +518,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.keefertaylor.MnemonicKit; + PRODUCT_BUNDLE_IDENTIFIER = "com.keefertaylor.MnemonicKit-iOS"; PRODUCT_NAME = MnemonicKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -645,7 +645,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.keefertaylor.MnemonicKit; + PRODUCT_BUNDLE_IDENTIFIER = "com.keefertaylor.MnemonicKit-iOS"; PRODUCT_NAME = MnemonicKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -695,7 +695,8 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.keefertaylor.MnemonicKit-iOS"; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.keefertaylor.MnemonicKit; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -724,7 +725,8 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.keefertaylor.MnemonicKit-iOS"; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.keefertaylor.MnemonicKit; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SKIP_INSTALL = YES;