Skip to content

Commit

Permalink
Update deployment target to 10.8
Browse files Browse the repository at this point in the history
  • Loading branch information
armadsen committed Jun 14, 2019
1 parent cdf5f8e commit 58a8cc4
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ This section is for changes commited to the ORSSerialPort repository, but not ye
## [2.1.0] - 2019-06-13

### CHANGED
- ORSSerialPort now supports deployment to mac OS 10.8 Mountain Lion or later. Support for 10.7 has been dropped.
- Updated Swift examples to Swift 4.2 and otherwise modernized them
- Updated all projects to more recent Xcode versions

Expand Down
2 changes: 1 addition & 1 deletion Framework Project/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
8 changes: 6 additions & 2 deletions Framework Project/ORSSerialPort.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand Down Expand Up @@ -436,7 +436,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -448,6 +448,7 @@
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 365;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -460,6 +461,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 2.1.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.openreelsoftware.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -470,6 +472,7 @@
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 365;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -479,6 +482,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 2.1.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.openreelsoftware.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down
4 changes: 2 additions & 2 deletions ORSSerialPort.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "ORSSerialPort"
s.version = "2.1.0"
s.version = "2.1"
s.summary = "Easy to use serial port library for Objective-C and Swift Mac apps."

s.description = <<-DESC
Expand All @@ -13,7 +13,7 @@ Pod::Spec.new do |s|
s.author = { "Andrew Madsen" => "[email protected]" }
s.social_media_url = 'https://twitter.com/armadsen'

s.platform = :osx, "10.7"
s.platform = :osx, "10.8"

s.source = { :git => "https://github.com/armadsen/ORSSerialPort.git", :tag => s.version.to_s }
s.source_files = "Source/**/*.{h,m}"
Expand Down
4 changes: 0 additions & 4 deletions Source/ORSSerialPort.h
Original file line number Diff line number Diff line change
Expand Up @@ -342,11 +342,7 @@ NS_ASSUME_NONNULL_BEGIN
* The delegate for the serial port object. Must implement the `ORSSerialPortDelegate` protocol.
*
*/
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
@property (nonatomic, weak, nullable) id<ORSSerialPortDelegate> delegate;
#else
@property (nonatomic, unsafe_unretained, nullable) id<ORSSerialPortDelegate> delegate;
#endif

/** ---------------------------------------------------------------------------------------
* @name Request/Response Properties
Expand Down
4 changes: 0 additions & 4 deletions Source/ORSSerialPort.m
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,7 @@ - (instancetype)initWithDevice:(io_object_t)device;
self.path = bsdPath;
self.name = [[self class] modemNameFromDevice:device];
self.requestHandlingQueue = dispatch_queue_create("com.openreelsoftware.ORSSerialPort.requestHandlingQueue", 0);
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
self.packetDescriptorsAndBuffers = [NSMapTable strongToStrongObjectsMapTable];
#else
self.packetDescriptorsAndBuffers = [NSMapTable mapTableWithStrongToStrongObjects]; // Deprecated in 10.8.
#endif
self.requestsQueue = [NSMutableArray array];
self.baudRate = @B19200;
self.allowsNonStandardBaudRates = NO;
Expand Down

0 comments on commit 58a8cc4

Please sign in to comment.