Skip to content

Commit

Permalink
Merge ab8d4d4 into 2dfc9a8
Browse files Browse the repository at this point in the history
  • Loading branch information
@matelo
matelo committed Dec 18, 2019
2 parents 2dfc9a8 + ab8d4d4 commit 8cfa76b
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .env
View file
@@ -1 +1 @@
CONTENTFUL_SDK_VERSION=5.0.5
CONTENTFUL_SDK_VERSION=5.0.6
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Config.xcconfig
View file
@@ -1 +1 @@
CONTENTFUL_SDK_VERSION=5.0.5
CONTENTFUL_SDK_VERSION=5.0.6
4 changes: 1 addition & 3 deletions Contentful.podspec
View file
Expand Up @@ -19,11 +19,9 @@ Pod::Spec.new do |spec|
:tag => spec.version.to_s }
spec.requires_arc = true

spec.swift_version = '4.2'
spec.swift_version = '5'
spec.source_files = 'Sources/Contentful/*.swift'

spec.frameworks = 'CoreLocation'

## Platform specific source code.
spec.ios.source_files = 'Sources/Contentful/UIKit/*.swift'
spec.watchos.source_files = 'Sources/Contentful/UIKit/*.swift'
Expand Down
12 changes: 12 additions & 0 deletions Contentful.xcodeproj/project.pbxproj
View file
Expand Up @@ -1283,6 +1283,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info_tvOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 5.0.6;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.contentful.Contentful-tvOS";
Expand Down Expand Up @@ -1316,6 +1317,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info_tvOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 5.0.6;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.contentful.Contentful-tvOS";
PRODUCT_NAME = Contentful;
Expand Down Expand Up @@ -1348,6 +1350,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info_tvOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 5.0.6;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.contentful.Contentful-tvOS";
PRODUCT_NAME = Contentful;
Expand Down Expand Up @@ -1580,6 +1583,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 5.0.6;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.contentful.Contentful;
PRODUCT_NAME = Contentful;
Expand Down Expand Up @@ -1607,6 +1611,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 5.0.6;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.contentful.Contentful;
PRODUCT_NAME = Contentful;
Expand Down Expand Up @@ -1739,6 +1744,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info_watchOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 5.0.6;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.contentful.Contentful-watchOS";
PRODUCT_NAME = Contentful;
Expand Down Expand Up @@ -1767,6 +1773,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info_watchOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 5.0.6;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.contentful.Contentful-watchOS";
PRODUCT_NAME = Contentful;
Expand Down Expand Up @@ -1798,6 +1805,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 5.0.6;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.contentful.Contentful-macOS";
PRODUCT_NAME = Contentful;
Expand Down Expand Up @@ -1827,6 +1835,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 5.0.6;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.contentful.Contentful-macOS";
PRODUCT_NAME = Contentful;
Expand Down Expand Up @@ -1924,6 +1933,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 5.0.6;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.contentful.Contentful;
PRODUCT_NAME = Contentful;
Expand Down Expand Up @@ -1974,6 +1984,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info_watchOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 5.0.6;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.contentful.Contentful-watchOS";
PRODUCT_NAME = Contentful;
Expand Down Expand Up @@ -2008,6 +2019,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 5.0.6;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.contentful.Contentful-macOS";
PRODUCT_NAME = Contentful;
Expand Down
2 changes: 1 addition & 1 deletion Supporting Files/Info_iOS.plist
View file
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>$(CONTENTFUL_SDK_VERSION)</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Supporting Files/Info_macOS.plist
View file
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>$(CONTENTFUL_SDK_VERSION)</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
Expand Down
2 changes: 1 addition & 1 deletion Supporting Files/Info_tvOS.plist
View file
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>$(CONTENTFUL_SDK_VERSION)</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Supporting Files/Info_watchOS.plist
View file
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>$(CONTENTFUL_SDK_VERSION)</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down

0 comments on commit 8cfa76b

Please sign in to comment.