diff --git a/.gitignore b/.gitignore index f086bf2..3efa3fc 100755 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ Pods Packages .build +.swiftpm diff --git a/.swift-version b/.swift-version index 819e07a..c7cb131 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -5.0 +5.3.1 diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..d646789 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,25 @@ +{ + "object": { + "pins": [ + { + "package": "Nimble", + "repositoryURL": "https://github.com/Quick/Nimble.git", + "state": { + "branch": null, + "revision": "7a46a5fc86cb917f69e3daf79fcb045283d8f008", + "version": "8.1.2" + } + }, + { + "package": "Quick", + "repositoryURL": "https://github.com/Quick/Quick.git", + "state": { + "branch": null, + "revision": "09b3becb37cb2163919a3842a4c5fa6ec7130792", + "version": "2.2.1" + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift index eb32ebd..6351743 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.0 +// swift-tools-version:5.3 import PackageDescription @@ -14,7 +14,7 @@ let package = Package( ], targets: [ - .target(name: "Fakery"), + .target(name: "Fakery", resources: [.copy("Resources")]), .testTarget(name: "FakeryTests", dependencies: ["Fakery","Quick", "Nimble"], path: "Tests/Fakery") ] ) diff --git a/Resources b/Resources new file mode 120000 index 0000000..e4fce79 --- /dev/null +++ b/Resources @@ -0,0 +1 @@ +Sources/Fakery/Resources \ No newline at end of file diff --git a/Sources/Fakery/Data/Provider.swift b/Sources/Fakery/Data/Provider.swift index 421f778..38e4d41 100644 --- a/Sources/Fakery/Data/Provider.swift +++ b/Sources/Fakery/Data/Provider.swift @@ -11,7 +11,11 @@ public final class Provider { if let translationData = translations[locale] { translation = translationData } else { + #if SWIFT_PACKAGE + let bundle = Bundle.module + #else let bundle = Bundle(for: Provider.self) + #endif var path = bundle.path(forResource: locale, ofType: Config.pathExtension, diff --git a/Resources/Locales/de-AT.json b/Sources/Fakery/Resources/Locales/de-AT.json similarity index 100% rename from Resources/Locales/de-AT.json rename to Sources/Fakery/Resources/Locales/de-AT.json diff --git a/Resources/Locales/de-CH.json b/Sources/Fakery/Resources/Locales/de-CH.json similarity index 100% rename from Resources/Locales/de-CH.json rename to Sources/Fakery/Resources/Locales/de-CH.json diff --git a/Resources/Locales/de.json b/Sources/Fakery/Resources/Locales/de.json similarity index 100% rename from Resources/Locales/de.json rename to Sources/Fakery/Resources/Locales/de.json diff --git a/Resources/Locales/en-AU.json b/Sources/Fakery/Resources/Locales/en-AU.json similarity index 100% rename from Resources/Locales/en-AU.json rename to Sources/Fakery/Resources/Locales/en-AU.json diff --git a/Resources/Locales/en-CA.json b/Sources/Fakery/Resources/Locales/en-CA.json similarity index 100% rename from Resources/Locales/en-CA.json rename to Sources/Fakery/Resources/Locales/en-CA.json diff --git a/Resources/Locales/en-GB.json b/Sources/Fakery/Resources/Locales/en-GB.json similarity index 100% rename from Resources/Locales/en-GB.json rename to Sources/Fakery/Resources/Locales/en-GB.json diff --git a/Resources/Locales/en-IND.json b/Sources/Fakery/Resources/Locales/en-IND.json similarity index 100% rename from Resources/Locales/en-IND.json rename to Sources/Fakery/Resources/Locales/en-IND.json diff --git a/Resources/Locales/en-TEST.json b/Sources/Fakery/Resources/Locales/en-TEST.json similarity index 100% rename from Resources/Locales/en-TEST.json rename to Sources/Fakery/Resources/Locales/en-TEST.json diff --git a/Resources/Locales/en-US.json b/Sources/Fakery/Resources/Locales/en-US.json similarity index 100% rename from Resources/Locales/en-US.json rename to Sources/Fakery/Resources/Locales/en-US.json diff --git a/Resources/Locales/en.json b/Sources/Fakery/Resources/Locales/en.json similarity index 100% rename from Resources/Locales/en.json rename to Sources/Fakery/Resources/Locales/en.json diff --git a/Resources/Locales/es.json b/Sources/Fakery/Resources/Locales/es.json similarity index 100% rename from Resources/Locales/es.json rename to Sources/Fakery/Resources/Locales/es.json diff --git a/Resources/Locales/fa.json b/Sources/Fakery/Resources/Locales/fa.json similarity index 100% rename from Resources/Locales/fa.json rename to Sources/Fakery/Resources/Locales/fa.json diff --git a/Resources/Locales/fr.json b/Sources/Fakery/Resources/Locales/fr.json similarity index 100% rename from Resources/Locales/fr.json rename to Sources/Fakery/Resources/Locales/fr.json diff --git a/Resources/Locales/it.json b/Sources/Fakery/Resources/Locales/it.json similarity index 100% rename from Resources/Locales/it.json rename to Sources/Fakery/Resources/Locales/it.json diff --git a/Resources/Locales/ja.json b/Sources/Fakery/Resources/Locales/ja.json similarity index 100% rename from Resources/Locales/ja.json rename to Sources/Fakery/Resources/Locales/ja.json diff --git a/Resources/Locales/ko.json b/Sources/Fakery/Resources/Locales/ko.json similarity index 100% rename from Resources/Locales/ko.json rename to Sources/Fakery/Resources/Locales/ko.json diff --git a/Resources/Locales/nb-NO.json b/Sources/Fakery/Resources/Locales/nb-NO.json similarity index 100% rename from Resources/Locales/nb-NO.json rename to Sources/Fakery/Resources/Locales/nb-NO.json diff --git a/Resources/Locales/nl.json b/Sources/Fakery/Resources/Locales/nl.json similarity index 100% rename from Resources/Locales/nl.json rename to Sources/Fakery/Resources/Locales/nl.json diff --git a/Resources/Locales/pl.json b/Sources/Fakery/Resources/Locales/pl.json similarity index 100% rename from Resources/Locales/pl.json rename to Sources/Fakery/Resources/Locales/pl.json diff --git a/Resources/Locales/pt-BR.json b/Sources/Fakery/Resources/Locales/pt-BR.json similarity index 100% rename from Resources/Locales/pt-BR.json rename to Sources/Fakery/Resources/Locales/pt-BR.json diff --git a/Resources/Locales/ru.json b/Sources/Fakery/Resources/Locales/ru.json similarity index 100% rename from Resources/Locales/ru.json rename to Sources/Fakery/Resources/Locales/ru.json diff --git a/Resources/Locales/sk.json b/Sources/Fakery/Resources/Locales/sk.json similarity index 100% rename from Resources/Locales/sk.json rename to Sources/Fakery/Resources/Locales/sk.json diff --git a/Resources/Locales/sv.json b/Sources/Fakery/Resources/Locales/sv.json similarity index 100% rename from Resources/Locales/sv.json rename to Sources/Fakery/Resources/Locales/sv.json diff --git a/Resources/Locales/tr-TR.json b/Sources/Fakery/Resources/Locales/tr-TR.json similarity index 100% rename from Resources/Locales/tr-TR.json rename to Sources/Fakery/Resources/Locales/tr-TR.json diff --git a/Resources/Locales/uk.json b/Sources/Fakery/Resources/Locales/uk.json similarity index 100% rename from Resources/Locales/uk.json rename to Sources/Fakery/Resources/Locales/uk.json diff --git a/Resources/Locales/zh-CN.json b/Sources/Fakery/Resources/Locales/zh-CN.json similarity index 100% rename from Resources/Locales/zh-CN.json rename to Sources/Fakery/Resources/Locales/zh-CN.json diff --git a/Resources/Locales/zh-TW.json b/Sources/Fakery/Resources/Locales/zh-TW.json similarity index 100% rename from Resources/Locales/zh-TW.json rename to Sources/Fakery/Resources/Locales/zh-TW.json