Merge pull request #184 from square/dfed--fix-spm

Do not use a local SPM file
square · Aug 16, 2019 · 0e3d9a9 · 0e3d9a9
2 parents 1d7f401 + ab187cf
commit 0e3d9a9
Show file tree

Hide file tree

Showing 21 changed files with 126 additions and 352 deletions.
diff --git a/LegacyValet/Package.swift b/LegacyValet/Package.swift
diff --git a/Package.swift b/Package.swift
@@ -16,16 +16,17 @@ let package = Package(
             name: "Valet",
             targets: ["Valet"]),
     ],
-    dependencies: [
-        Package.Dependency.package(path: "LegacyValet"),
-    ],
     targets: [
         .target(
             name: "Valet",
             dependencies: []),
+        .target(
+            name: "LegacyValet",
+            dependencies: [],
+            publicHeadersPath: "Public"),
         .testTarget(
             name: "ValetTests",
-            dependencies: ["Valet", "LegacyValet"])
+            dependencies: ["Valet"])
     ],
     swiftLanguageVersions: [.v4, .v4_2, .v5]
 )

diff --git a/...cyValet/Sources/LegacyValet/LegacyValet.h → Sources/LegacyValet/Public/LegacyValet.h b/...cyValet/Sources/LegacyValet/LegacyValet.h → Sources/LegacyValet/Public/LegacyValet.h
diff --git a/...alet/Public/VALLegacySecureEnclaveValet.h → ...alet/Public/VALLegacySecureEnclaveValet.h b/...alet/Public/VALLegacySecureEnclaveValet.h → ...alet/Public/VALLegacySecureEnclaveValet.h
diff --git a/...VALLegacySinglePromptSecureEnclaveValet.h → ...VALLegacySinglePromptSecureEnclaveValet.h b/...VALLegacySinglePromptSecureEnclaveValet.h → ...VALLegacySinglePromptSecureEnclaveValet.h
diff --git a/...urces/LegacyValet/Public/VALLegacyValet.h → Sources/LegacyValet/Public/VALLegacyValet.h b/...urces/LegacyValet/Public/VALLegacyValet.h → Sources/LegacyValet/Public/VALLegacyValet.h
diff --git a/...gacyValet/Public/VALSynchronizableValet.h → ...gacyValet/Public/VALSynchronizableValet.h b/...gacyValet/Public/VALSynchronizableValet.h → ...gacyValet/Public/VALSynchronizableValet.h
diff --git a/...LegacyValet/VALLegacySecureEnclaveValet.m → ...LegacyValet/VALLegacySecureEnclaveValet.m b/...LegacyValet/VALLegacySecureEnclaveValet.m → ...LegacyValet/VALLegacySecureEnclaveValet.m
diff --git a/...t/VALLegacySecureEnclaveValet_Protected.h → ...t/VALLegacySecureEnclaveValet_Protected.h b/...t/VALLegacySecureEnclaveValet_Protected.h → ...t/VALLegacySecureEnclaveValet_Protected.h
diff --git a/...VALLegacySinglePromptSecureEnclaveValet.m → ...VALLegacySinglePromptSecureEnclaveValet.m b/...VALLegacySinglePromptSecureEnclaveValet.m → ...VALLegacySinglePromptSecureEnclaveValet.m
diff --git a/...alet/Sources/LegacyValet/VALLegacyValet.m → Sources/LegacyValet/VALLegacyValet.m b/...alet/Sources/LegacyValet/VALLegacyValet.m → Sources/LegacyValet/VALLegacyValet.m
diff --git a/...es/LegacyValet/VALLegacyValet_Protected.h → ...es/LegacyValet/VALLegacyValet_Protected.h b/...es/LegacyValet/VALLegacyValet_Protected.h → ...es/LegacyValet/VALLegacyValet_Protected.h
diff --git a/...rces/LegacyValet/VALSynchronizableValet.m → Sources/LegacyValet/VALSynchronizableValet.m b/...rces/LegacyValet/VALSynchronizableValet.m → Sources/LegacyValet/VALSynchronizableValet.m
diff --git a/...yValet/Sources/LegacyValet/ValetDefines.h → Sources/LegacyValet/ValetDefines.h b/...yValet/Sources/LegacyValet/ValetDefines.h → Sources/LegacyValet/ValetDefines.h
diff --git a/Valet.podspec b/Valet.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'Valet'
-  s.version  = '3.2.5'
+  s.version  = '3.2.6'
   s.license  = 'Apache License, Version 2.0'
   s.summary  = 'Securely store data on iOS, tvOS, watchOS, or macOS without knowing a thing about how the Keychain works. It\'s easy. We promise.'
   s.homepage = 'https://github.com/square/Valet'

diff --git a/Valet.xcodeproj/GeneratedModuleMap/LegacyValet/module.modulemap b/Valet.xcodeproj/GeneratedModuleMap/LegacyValet/module.modulemap
diff --git a/Valet.xcodeproj/LegacyValet_Info.plist b/Valet.xcodeproj/LegacyValet_Info.plist
diff --git a/Valet.xcodeproj/ValetTests_Info.plist b/Valet.xcodeproj/ValetTests_Info.plist
diff --git a/Valet.xcodeproj/Valet_Info.plist b/Valet.xcodeproj/Valet_Info.plist
diff --git a/Valet.xcodeproj/project.pbxproj b/Valet.xcodeproj/project.pbxproj
diff --git a/Valet.xcodeproj/xcshareddata/xcschemes/Valet-Package.xcscheme b/Valet.xcodeproj/xcshareddata/xcschemes/Valet-Package.xcscheme