Adding support fro M1 macs.

Versionbump to 2.3
Adding SwiftPM instructions.
2021-05-04 13:24:23 +02:00 · 2021-03-13 21:16:40 +01:00 · 2021-03-13 21:09:54 +01:00 · 2021-03-13 21:04:29 +01:00 · 2021-03-13 20:49:27 +01:00 · 2019-09-05 09:59:30 +02:00
1090 changed files with 332 additions and 74 deletions
@@ -31,3 +31,7 @@ DerivedData
 # Carthage/Checkouts

 Carthage/Build
+
+# SPM
+.swiftpm
+.build/
@@ -1,10 +1,10 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode10.2

 env:
-  - "DESTINATION='platform=iOS Simulator,name=iPhone 7' ACTION=test"
-  - "DESTINATION='platform=OS X' ACTION=test"
-  - "DESTINATION='platform=tvOS Simulator,name=Apple TV 1080p' ACTION=test"
+  - "DESTINATION='OS=12.2,platform=iOS Simulator,name=iPhone 8' ACTION=test"
+  - "DESTINATION='platform=macOS' ACTION=test"
+  - "DESTINATION='OS=12.2,platform=tvOS Simulator,name=Apple TV' ACTION=test"

 script:
-  - set -o pipefail && xcodebuild -project Sources/Swift/FlagKit.xcodeproj -scheme FlagKit -destination "$DESTINATION" $ACTION | xcpretty
+  - set -o pipefail && xcodebuild -project Sources/FlagKit.xcodeproj -scheme FlagKit -destination "$DESTINATION" $ACTION | xcpretty
@@ -1,5 +1,5 @@
 # Flags
-This set currently includes the 253 flags below:
+This set currently includes the 255 flags below:

 | Flag | Code | Region |
 | :-------------: | :-------------: | ------------- |
@@ -78,11 +78,11 @@ This set currently includes the 253 flags below:
 | <img src='PNG/FR@2x.png?raw=true' width='21' height='15'> | FR | France
 | <img src='PNG/GA@2x.png?raw=true' width='21' height='15'> | GA | Gabon
 | <img src='PNG/GB@2x.png?raw=true' width='21' height='15'> | GB | United Kingdom
-| <img src='PNG/GB-ENG@2x.png?raw=true' width='21' height='15'> | GB-ENG | United Kingdom
-| <img src='PNG/GB-NIR@2x.png?raw=true' width='21' height='15'> | GB-NIR | United Kingdom
-| <img src='PNG/GB-SCT@2x.png?raw=true' width='21' height='15'> | GB-SCT | United Kingdom
-| <img src='PNG/GB-WLS@2x.png?raw=true' width='21' height='15'> | GB-WLS | United Kingdom
-| <img src='PNG/GB-ZET@2x.png?raw=true' width='21' height='15'> | GB-ZET | United Kingdom
+| <img src='PNG/GB-ENG@2x.png?raw=true' width='21' height='15'> | GB-ENG | England
+| <img src='PNG/GB-NIR@2x.png?raw=true' width='21' height='15'> | GB-NIR | Northern Ireland
+| <img src='PNG/GB-SCT@2x.png?raw=true' width='21' height='15'> | GB-SCT | Scotland
+| <img src='PNG/GB-WLS@2x.png?raw=true' width='21' height='15'> | GB-WLS | Wales
+| <img src='PNG/GB-ZET@2x.png?raw=true' width='21' height='15'> | GB-ZET | Shetland
 | <img src='PNG/GD@2x.png?raw=true' width='21' height='15'> | GD | Grenada
 | <img src='PNG/GE@2x.png?raw=true' width='21' height='15'> | GE | Georgia
 | <img src='PNG/GF@2x.png?raw=true' width='21' height='15'> | GF | French Guiana
@@ -147,6 +147,7 @@ This set currently includes the 253 flags below:
 | <img src='PNG/MC@2x.png?raw=true' width='21' height='15'> | MC | Monaco
 | <img src='PNG/MD@2x.png?raw=true' width='21' height='15'> | MD | Moldova
 | <img src='PNG/ME@2x.png?raw=true' width='21' height='15'> | ME | Montenegro
+| <img src='PNG/MF@2x.png?raw=true' width='21' height='15'> | MF | St. Martin
 | <img src='PNG/MG@2x.png?raw=true' width='21' height='15'> | MG | Madagascar
 | <img src='PNG/MH@2x.png?raw=true' width='21' height='15'> | MH | Marshall Islands
 | <img src='PNG/MK@2x.png?raw=true' width='21' height='15'> | MK | Macedonia
@@ -204,6 +205,7 @@ This set currently includes the 253 flags below:
 | <img src='PNG/SD@2x.png?raw=true' width='21' height='15'> | SD | Sudan
 | <img src='PNG/SE@2x.png?raw=true' width='21' height='15'> | SE | Sweden
 | <img src='PNG/SG@2x.png?raw=true' width='21' height='15'> | SG | Singapore
+| <img src='PNG/SH@2x.png?raw=true' width='21' height='15'> | SH | St. Helena
 | <img src='PNG/SI@2x.png?raw=true' width='21' height='15'> | SI | Slovenia
 | <img src='PNG/SJ@2x.png?raw=true' width='21' height='15'> | SJ | Svalbard & Jan Mayen
 | <img src='PNG/SK@2x.png?raw=true' width='21' height='15'> | SK | Slovakia
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="15px" viewBox="0 0 21 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+    <title>MF</title>
+    <desc>Created with sketchtool.</desc>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#F0F0F0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
+            <stop stop-color="#F44653" offset="0%"></stop>
+            <stop stop-color="#EE2A39" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
+            <stop stop-color="#1035BB" offset="0%"></stop>
+            <stop stop-color="#042396" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="MF">
+            <rect id="FlagBackground" fill="url(#linearGradient-1)" x="0" y="0" width="21" height="15"></rect>
+            <rect id="Mask" fill="url(#linearGradient-2)" x="10" y="0" width="11" height="15"></rect>
+            <rect id="Rectangle-2" fill="url(#linearGradient-3)" x="0" y="0" width="7" height="15"></rect>
+            <rect id="Rectangle-2-Copy" fill="url(#linearGradient-1)" x="7" y="0" width="7" height="15"></rect>
+        </g>
+    </g>
+</svg>
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="15px" viewBox="0 0 21 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+    <title>SH</title>
+    <desc>Created with sketchtool.</desc>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#F0F0F0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
+            <stop stop-color="#07319C" offset="0%"></stop>
+            <stop stop-color="#00247E" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
+            <stop stop-color="#A7D2FF" offset="0%"></stop>
+            <stop stop-color="#91C6FD" offset="100%"></stop>
+        </linearGradient>
+        <path d="M0,3.5 L1.54164674e-17,0.509643555 C6.90218757e-18,0.228175192 0.21484375,0 0.497698784,0 L4.50230122,0 C4.77717266,0 5,0.226606369 5,0.509643555 L5,3.5 C5,5.5 2.5,6 2.5,6 C2.5,6 0,5.5 0,3.5 Z" id="path-4"></path>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-6">
+            <stop stop-color="#EE7B2D" offset="0%"></stop>
+            <stop stop-color="#CC621A" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-7">
+            <stop stop-color="#FFFC4B" offset="0%"></stop>
+            <stop stop-color="#FFFC38" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-8">
+            <stop stop-color="#DB1E36" offset="0%"></stop>
+            <stop stop-color="#D51931" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="SH">
+            <rect id="FlagBackground" fill="url(#linearGradient-1)" x="0" y="0" width="21" height="15"></rect>
+            <rect id="Mask-Copy" fill="url(#linearGradient-2)" x="0" y="0" width="21" height="15"></rect>
+            <g id="Rectangle-1105" transform="translate(13.000000, 6.000000)">
+                <mask id="mask-5" fill="white">
+                    <use xlink:href="#path-4"></use>
+                </mask>
+                <use id="Combined-Shape" fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
+                <path d="M0.5,6.5 C1.32842712,6.5 1.5,5.1045695 1.5,4 C1.5,2.8954305 1.32842712,2.5 0.5,2.5 C-0.328427125,2.5 -1,2.8954305 -1,4 C-1,5.1045695 -0.328427125,6.5 0.5,6.5 Z" id="Oval" fill="url(#linearGradient-6)" mask="url(#mask-5)"></path>
+                <ellipse id="Oval-2" fill="#A75113" mask="url(#mask-5)" cx="2.5" cy="4.5" rx="1.5" ry="1"></ellipse>
+                <ellipse id="Oval-2" fill="#FFFFFF" mask="url(#mask-5)" cx="2.5" cy="3.5" rx="1" ry="1"></ellipse>
+                <rect id="Rectangle" fill="url(#linearGradient-7)" mask="url(#mask-5)" x="0" y="0" width="5" height="2"></rect>
+            </g>
+            <path d="M3,3.22996746 L-1.3516287,-0.5 L0.660232527,-0.5 L4.16023253,2 L4.85660189,2 L9.5,-0.902123821 L9.5,0.25 C9.5,0.552509227 9.33308555,0.876533554 9.08215972,1.05576629 L6,3.25730895 L6,3.77003254 L9.13722049,6.45907867 C9.59934261,6.85518335 9.34102897,7.5 8.75,7.5 C8.50478614,7.5 8.2052751,7.40393402 8.00092153,7.25796718 L4.83976747,5 L4.14339811,5 L-0.5,7.90212382 L-0.5,6.24269105 L3,3.74269105 L3,3.22996746 Z" id="Rectangle-36" fill="url(#linearGradient-1)" fill-rule="nonzero"></path>
+            <path d="M3.5,3 L-4.4408921e-16,0 L0.5,0 L4,2.5 L5,2.5 L9,0 L9,0.25 C9,0.388071187 8.91348267,0.561798096 8.79154062,0.648899555 L5.5,3 L5.5,4 L8.8118248,6.83870697 C8.91575109,6.92778665 8.8840332,7 8.75,7 L8.75,7 C8.61192881,7 8.41348267,6.9382019 8.29154062,6.85110044 L5,4.5 L4,4.5 L-4.4408921e-16,7 L-4.4408921e-16,6.5 L3.5,4 L3.5,3 Z" id="Rectangle-36" fill="url(#linearGradient-8)"></path>
+            <path d="M-4.4408921e-16,2.5 L-4.4408921e-16,4.5 L3.5,4.5 L3.5,7.00461102 C3.5,7.2782068 3.71403503,7.5 4.00468445,7.5 L4.99531555,7.5 C5.27404508,7.5 5.5,7.2842474 5.5,7.00461102 L5.5,4.5 L9.00952148,4.5 C9.28040529,4.5 9.5,4.28596497 9.5,3.99531555 L9.5,3.00468445 C9.5,2.72595492 9.28494263,2.5 9.00952148,2.5 L5.5,2.5 L5.5,0 L3.5,0 L3.5,2.5 L-4.4408921e-16,2.5 Z" id="Rectangle-2" fill="url(#linearGradient-1)"></path>
+            <polygon id="Rectangle-36" fill="url(#linearGradient-8)" points="-4.4408921e-16 3 4 3 4 2.5 4 0 5 0 5 2.5 5 3 9 3 9 4 5 4 5 4.5 5 7 4 7 4 4.5 4 4 -4.4408921e-16 4"></polygon>
+        </g>
+    </g>
+</svg>
@@ -1,7 +1,8 @@
 Pod::Spec.new do |s|
  s.name = "FlagKit"
-  s.version = "2.0"
+  s.version = "2.3"
  s.summary = "Beautiful flag icons for usage in apps and on the web."
+  s.swift_versions = ['5.0', '5.1', '5.2', '5.3']

  s.homepage = "https://github.com/madebybowtie/FlagKit"
  s.license = { :type => "MIT", :file => "LICENSE" }
@@ -14,6 +15,6 @@ Pod::Spec.new do |s|
  s.tvos.deployment_target = "10.0"

  s.source = { :git => "https://github.com/madebybowtie/FlagKit.git", :tag => "v#{s.version}" }
-  s.source_files = "Sources/Swift/FlagKit/*.swift"
-  s.resource = "Assets/FlagKit.xcassets"
+  s.source_files = "Sources/FlagKit/*.swift"
+  s.resource = "Sources/FlagKit/FlagKit.xcassets"
 end
@@ -0,0 +1,36 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "FlagKit",
+    platforms: [
+        .iOS(.v12),
+        .tvOS(.v12),
+        .macOS(.v10_12)
+    ],
+    products: [
+        .library(name: "FlagKit", targets: ["FlagKit"]),
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "FlagKit",
+            dependencies: [],
+            exclude: [
+                "Info.plist",
+                "FlagKitFramework.xcconfig"
+            ]
+        ),
+        .testTarget(
+            name: "FlagKitTests",
+            dependencies: ["FlagKit"],
+            exclude: [
+                "Info.plist",
+                "FlagKitTests.xcconfig",
+                "ObjectiveCTests.m"
+            ]
+        )
+    ]
+)
@@ -22,6 +22,13 @@ Beautiful flag icons for usage in apps and on the web. All flags are provided as

 FlagKit provides a framework for easy installation as a dependency. You can also manually copy the Asset Catalog into your project.

+### SwiftPM
+Add the folowinig as repository URL:
+
+```
+https://github.com/madebybowtie/FlagKit.git
+```
+
 ### Carthage
 Add the following line to your `Cartfile`:

@@ -67,7 +67,7 @@
 		3A49DD841F2F63F90007E46E /* FlagKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FlagKit.h; sourceTree = "<group>"; };
 		3A49DD851F2F63F90007E46E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3A49DD8A1F2F64BC0007E46E /* FlagKitFramework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = FlagKitFramework.xcconfig; sourceTree = "<group>"; };
-		3A49DD8D1F2F665E0007E46E /* FlagKit.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = FlagKit.xcassets; path = ../../../Assets/FlagKit.xcassets; sourceTree = "<group>"; };
+		3A49DD8D1F2F665E0007E46E /* FlagKit.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = FlagKit.xcassets; sourceTree = "<group>"; };
 		3A49DD8F1F2F6B760007E46E /* UIImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIImage.swift; sourceTree = "<group>"; };
 		3A49DD921F2F6C1F0007E46E /* FlagKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlagKit.swift; sourceTree = "<group>"; };
 		3A49DD941F2F6F010007E46E /* NSImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSImage.swift; sourceTree = "<group>"; };
@@ -260,28 +260,29 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 1240;
 				ORGANIZATIONNAME = Bowtie;
 				TargetAttributes = {
 					3A49DD801F2F63F90007E46E = {
 						CreatedOnToolsVersion = 8.3.2;
-						LastSwiftMigration = 0830;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					3A59879C1F306C260097DB64 = {
 						CreatedOnToolsVersion = 8.3.2;
-						LastSwiftMigration = 0830;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					3AF78CE01F31CE0400BD3D10 = {
 						CreatedOnToolsVersion = 8.3.2;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = 3A49DD5E1F2F62D10007E46E /* Build configuration list for PBXProject "FlagKit" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -393,12 +394,68 @@
 		3A49DD5F1F2F62D10007E46E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				ONLY_ACTIVE_ARCH = YES;
 			};
 			name = Debug;
 		};
 		3A49DD601F2F62D10007E46E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
 			};
 			name = Release;
 		};
@@ -453,9 +510,10 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = FlagKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MARKETING_VERSION = 2.3;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.madebybowtie.FlagKit;
@@ -464,8 +522,8 @@
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
+				SWIFT_VERSION = 5.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -516,17 +574,18 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = FlagKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MARKETING_VERSION = 2.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.madebybowtie.FlagKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
+				SWIFT_VERSION = 5.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -585,7 +644,7 @@
 				SDKROOT = macosx;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -634,7 +693,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -683,7 +742,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "FlagKitDemo-iOS/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -692,7 +751,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -735,14 +794,14 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "FlagKitDemo-iOS/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.madebybowtie.FlagKitDemo-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "1240"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3A49DD801F2F63F90007E46E"
+            BuildableName = "FlagKit.framework"
+            BlueprintName = "FlagKit"
+            ReferencedContainer = "container:FlagKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
      <Testables>
         <TestableReference
            skipped = "NO">
@@ -53,17 +62,6 @@
            </BuildableReference>
         </TestableReference>
      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "3A49DD801F2F63F90007E46E"
-            BuildableName = "FlagKit.framework"
-            BlueprintName = "FlagKit"
-            ReferencedContainer = "container:FlagKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
@@ -84,8 +82,6 @@
            ReferencedContainer = "container:FlagKit.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
      buildConfiguration = "Release"
@@ -15,18 +15,18 @@ public class Flag: NSObject {
    /**
     Country code of the flag
     */
-    public let countryCode: String
+    @objc public let countryCode: String

 #if os(iOS) || os(tvOS)
    /**
     Original unstyled flag image
     */
-    public let originalImage: UIImage
+    @objc public let originalImage: UIImage
    
    /**
     Returns a flag if the country code is supported, otherwise it returns nil
     */
-    public init?(countryCode: String) {
+    @objc public init?(countryCode: String) {
        guard let image = UIImage(named: countryCode, in: FlagKit.assetBundle, compatibleWith: nil) else {
            return nil
        }
@@ -39,7 +39,7 @@ public class Flag: NSObject {
     Returns a styled flag according to the provided style
     - parameter style: Desired flag style
     */
-    public func image(style: FlagStyle) -> UIImage {
+    @objc public func image(style: FlagStyle) -> UIImage {
        return originalImage.rendereredImage(size: style.size, action: { (context) in
            switch style {
            case .none:
@@ -60,12 +60,12 @@ public class Flag: NSObject {
    /**
     Original unstyled flag image
     */
-    public let originalImage: NSImage
+    @objc public let originalImage: NSImage
    
    /**
     Returns a flag if the country code is supported, otherwise it returns nil
     */
-    public init?(countryCode: String) {
+    @objc public init?(countryCode: String) {
        guard let image = FlagKit.assetBundle.image(forResource: countryCode) else {
            return nil
        }
@@ -7,7 +7,11 @@ import Foundation
 public class FlagKit {
    public static var assetBundle: Bundle {
        get {
+            #if SWIFT_PACKAGE
+            return Bundle.module
+            #else
            return Bundle(for: FlagKit.self)
+            #endif
        }
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Simon Blommegård	f12111d919	Adding support fro M1 macs.	2021-05-04 13:24:23 +02:00
Simon Blommegård	7b2e6f85f7	Versionbump to 2.3	2021-03-13 21:16:40 +01:00
Simon Blommegård	b40544c0ea	Adding SwiftPM instructions.	2021-03-13 21:09:54 +01:00
Simon Blommegård	b4a733f096	Update project and adding swift version to podspec.	2021-03-13 21:04:29 +01:00
Mateusz Matrejek	0eb5111605	Adds SPM Support (#87 )	2021-03-13 20:49:27 +01:00
James Harris	1597c88721	Correct GB subdivision names in Flags.md (#72 )	2019-09-05 09:59:30 +02:00
Simon Blommegård	fd87cc857a	Version bump to 2.2	2019-03-26 14:19:29 +01:00
Simon Blommegård	776b5738d6	More Swift 5 migration	2019-03-26 14:05:23 +01:00
Hannes Ljungberg	2960e987b0	Migrate to Swift 5 (#68 ) * Upgrade to recommended settings * Swift 5 migration * Run tests on latest xcode * Update fixtures	2019-03-26 14:01:36 +01:00
Simon Blommegård	4408c2dab3	Swift 4 migration of demo.	2018-02-06 14:33:45 +01:00
Simon Blommegård	ba7bb956a4	Fixing travis config.	2017-12-12 10:02:41 +01:00
Simon Blommegård	eabd1307c8	Version bump to 2.1	2017-12-11 15:09:09 +01:00
Simon Blommegård	0daff70461	Updating travis config.	2017-12-11 14:55:11 +01:00
Simon Blommegård	c024e356bf	New fixtures generated	2017-12-11 14:53:30 +01:00
Simon Blommegård	e044a46c0e	Swift 4 migration	2017-12-11 14:53:11 +01:00
Anton Tingström	948c02cf92	Bumping version in podspec	2017-08-22 16:33:20 +02:00
Anton Tingström	e0073bc421	Adding flags for St Martin and St Helena	2017-08-22 13:53:22 +02:00
Anton Tingström	c024a4827c	Empty commit to trigger Travis	2017-08-09 14:54:30 +02:00