Skip to content

Commit

Permalink
Merge pull request #89 from KarinBerg/xcode-14-3-support
Browse files Browse the repository at this point in the history
Increase deployment targets of all platforms to lowest possible version which is compatible with xCode 14.3
  • Loading branch information
maxim-chipeev authored Mar 28, 2024
2 parents 00d1e1a + c8f265e commit 89f9357
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .Package.test.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let package = Package(
targets: ["SwinjectAutoregistration"])
],
dependencies: [
.package(url: "https://github.com/Swinject/Swinject.git", from: "2.8.3")
.package(url: "https://github.com/Swinject/Swinject.git", from: "2.8.4")
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "Swinject/Swinject" ~> 2.8.3
github "Swinject/Swinject" ~> 2.8.4
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "Swinject/Swinject" "2.8.3"
github "Swinject/Swinject" "2.8.4"
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ let package = Package(
name: "SwinjectAutoregistration-Dynamic",
type: .dynamic,
targets: ["SwinjectAutoregistration"])

],
dependencies: [
.package(url: "https://github.com/Swinject/Swinject.git", from: "2.8.3")
.package(url: "https://github.com/Swinject/Swinject.git", from: "2.8.4")
],
targets: [
.target(
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ SwinjectAutoregistration is an extension of Swinject that allows to automaticall

## Requirements

- iOS 9.0+ / Mac OS X 10.10+ / tvOS 9.0+
- Xcode 8+
- iOS 11.0+ / Mac OS X 10.13+ / tvOS 11.0+
- Xcode 14.3+

## Installation

Expand All @@ -24,8 +24,8 @@ Swinject is available through [Carthage](https://github.com/Carthage/Carthage),
To install Swinject with Carthage, add the following line to your `Cartfile`.

```
github "Swinject/Swinject" "2.8.3"
github "Swinject/SwinjectAutoregistration" "2.8.3"
github "Swinject/Swinject" "2.8.4"
github "Swinject/SwinjectAutoregistration" "2.8.4"
```

Then run `carthage update --use-xcframeworks --no-use-binaries` command or just `carthage update --use-xcframeworks`. For details of the installation and usage of Carthage, visit [its project page](https://github.com/Carthage/Carthage).
Expand All @@ -36,11 +36,11 @@ To install Swinject with CocoaPods, add the following lines to your `Podfile`.

```ruby
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '9.0' # or platform :osx, '10.10' if your target is OS X.
platform :ios, '11.0' # or platform :osx, '10.13' if your target is OS X.
use_frameworks!

pod 'Swinject', '2.8.3'
pod 'SwinjectAutoregistration', '2.8.3'
pod 'Swinject', '2.8.4'
pod 'SwinjectAutoregistration', '2.8.4'
```

Then run `pod install` command. For details of the installation and usage of CocoaPods, visit [its official website](https://cocoapods.org).
Expand All @@ -51,7 +51,7 @@ in `Package.swift` add the following:

```swift
dependencies: [
.package(url: "https://github.com/Swinject/SwinjectAutoregistration.git", from: "2.8.3")
.package(url: "https://github.com/Swinject/SwinjectAutoregistration.git", from: "2.8.4")
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion Sources/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>2.8.3</string>
<string>2.8.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
12 changes: 6 additions & 6 deletions SwinjectAutoregistration.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'SwinjectAutoregistration'
s.version = "2.8.3"
s.version = "2.8.4"
s.summary = 'Autoregistration for Swinject'
s.description = <<-DESC
SwinjectAutoregistration is an extension of Swinject that allows to automatically inject dependencies into registered services.
Expand All @@ -11,12 +11,12 @@ SwinjectAutoregistration is an extension of Swinject that allows to automaticall
s.author = 'Swinject Contributors'
s.source = { :git => 'https://github.com/Swinject/SwinjectAutoregistration.git', :tag => s.version.to_s }

s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
s.watchos.deployment_target = '2.0'
s.tvos.deployment_target = '9.0'
s.ios.deployment_target = '11.0'
s.osx.deployment_target = '10.13'
s.watchos.deployment_target = '4.0'
s.tvos.deployment_target = '11.0'
s.requires_arc = true
s.swift_version = '5.0'
s.source_files = 'Sources/**/*.{swift,h}'
s.dependency 'Swinject', '~> 2.8.3'
s.dependency 'Swinject', '~> 2.8.4'
end
22 changes: 12 additions & 10 deletions SwinjectAutoregistration.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
WATCHOS_DEPLOYMENT_TARGET = 4.0;
};
name = Debug;
};
Expand Down Expand Up @@ -997,7 +997,7 @@
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
VALIDATE_PRODUCT = YES;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
WATCHOS_DEPLOYMENT_TARGET = 4.0;
};
name = Release;
};
Expand Down Expand Up @@ -1044,7 +1044,7 @@
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = Sources/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.swinject.SwinjectAutoregistration-iOS";
};
name = Debug;
Expand All @@ -1058,7 +1058,7 @@
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = Sources/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.swinject.SwinjectAutoregistration-iOS";
};
name = Release;
Expand Down Expand Up @@ -1184,7 +1184,7 @@
);
INFOPLIST_FILE = Sources/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "org.swinject.SwinjectAutoregistration-watchOS";
WATCHOS_DEPLOYMENT_TARGET = 2.0;
WATCHOS_DEPLOYMENT_TARGET = 4.0;
};
name = Debug;
};
Expand All @@ -1198,7 +1198,7 @@
);
INFOPLIST_FILE = Sources/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "org.swinject.SwinjectAutoregistration-watchOS";
WATCHOS_DEPLOYMENT_TARGET = 2.0;
WATCHOS_DEPLOYMENT_TARGET = 4.0;
};
name = Release;
};
Expand All @@ -1212,7 +1212,7 @@
);
INFOPLIST_FILE = Sources/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "org.swinject.SwinjectAutoregistration-tvOS";
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 11.0;
};
name = Debug;
};
Expand All @@ -1226,7 +1226,7 @@
);
INFOPLIST_FILE = Sources/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "org.swinject.SwinjectAutoregistration-tvOS";
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 11.0;
};
name = Release;
};
Expand Down Expand Up @@ -1348,6 +1348,7 @@
"$(PROJECT_DIR)/Carthage/Build",
);
INFOPLIST_FILE = Sources/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = "org.swinject.SwinjectAutoregistration-OSX";
};
name = Debug;
Expand All @@ -1361,6 +1362,7 @@
"$(PROJECT_DIR)/Carthage/Build",
);
INFOPLIST_FILE = Sources/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = "org.swinject.SwinjectAutoregistration-OSX";
};
name = Release;
Expand Down Expand Up @@ -1414,7 +1416,7 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.11;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "org.swinject.SwinjectAutoregistration-OSXTests";
Expand Down Expand Up @@ -1468,7 +1470,7 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.11;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "org.swinject.SwinjectAutoregistration-OSXTests";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
2 changes: 1 addition & 1 deletion Tests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>2.8.3</string>
<string>2.8.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit 89f9357

Please sign in to comment.