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
1070 changed files with 90 additions and 34 deletions
@@ -31,3 +31,7 @@ DerivedData
 # Carthage/Checkouts

 Carthage/Build
+
+# SPM
+.swiftpm
+.build/
@@ -7,4 +7,4 @@ env:
  - "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
@@ -78,11 +78,11 @@ This set currently includes the 255 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
@@ -1,7 +1,8 @@
 Pod::Spec.new do |s|
  s.name = "FlagKit"
-  s.version = "2.2"
+  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,7 +260,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1240;
 				ORGANIZATIONNAME = Bowtie;
 				TargetAttributes = {
 					3A49DD801F2F63F90007E46E = {
@@ -407,6 +407,7 @@
 				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;
@@ -441,6 +442,7 @@
 				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;
@@ -508,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;
@@ -520,7 +523,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -571,9 +574,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 = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.madebybowtie.FlagKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -581,7 +585,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -738,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;
@@ -790,7 +794,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 = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.madebybowtie.FlagKitDemo-iOS";
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   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"
@@ -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