Merge branch 'release/3.0.0'

SRGSSR · Oct 23, 2020 · 46c8b53 · 46c8b53
2 parents dc497a5 + 0be5c3c
commit 46c8b53
Show file tree

Hide file tree

Showing 189 changed files with 2,169 additions and 2,559 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,15 +1,13 @@
 .DS_Store
 
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+
 *.xcscmblueprint
 xcuserdata
 
-/archive
-/build
-
-/Carthage
-/Cartfile.private
-/Cartfile.resolved
-
 /fastlane/*.xcresult
 /fastlane/*.xml
 

diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/.swiftpm/xcode/package.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/.swiftpm/xcode/package.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -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>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<false/>
+</dict>
+</plist>
diff --git a/Cartfile b/Cartfile
diff --git a/Cartfile.private.common b/Cartfile.private.common
diff --git a/Cartfile.private.proprietary b/Cartfile.private.proprietary
diff --git a/Cartfile.private.public b/Cartfile.private.public
diff --git a/Cartfile.resolved.proprietary b/Cartfile.resolved.proprietary
diff --git a/Cartfile.resolved.public b/Cartfile.resolved.public
diff --git a/Common.xcconfig b/Common.xcconfig
diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig
@@ -1,7 +1,31 @@
-#include "../Common.xcconfig"
+// Version information
+MARKETING_VERSION = 3.0.0
+
+// Deployment targets
+IPHONEOS_DEPLOYMENT_TARGET = 9.0
+TVOS_DEPLOYMENT_TARGET = 12.0
+
+// Configuration to have a single target built for all platforms
+// See https://davedelong.com/blog/2018/11/15/building-a-crossplatform-framework/
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator appletvos appletvsimulator
+TARGETED_DEVICE_FAMILY = 1,2,3
+
+// Setup to enable plaform suffixes to enable sources or resources for a specific platform only
+// See https://davedelong.com/blog/2018/07/25/conditional-compilation-in-swift-part-2/
+IOS_FILES = *~ios.*
+TVOS_FILES = *~tvos.*
+
+EXCLUDED_SOURCE_FILE_NAMES = $(IOS_FILES) $(TVOS_FILES)
+
+INCLUDED_SOURCE_FILE_NAMES =
+INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(IOS_FILES)
+INCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = $(TVOS_FILES)
 
 LAUNCH_SCREEN[sdk=iphone*] = LaunchScreen~ios
 LAUNCH_SCREEN[sdk=appletv*] =
 
 APP_ICONS_SOURCE[sdk=iphone*] = AppIcon
 APP_ICONS_SOURCE[sdk=appletv*] = App Icon & Top Shelf Image
+
+REQUIRED_DEVICE_CAPABILITY[sdk=iphone*] = armv7
+REQUIRED_DEVICE_CAPABILITY[sdk=appletv*] = arm64