diff --git a/Dip.podspec b/Dip.podspec index 4a9a853..6bea031 100644 --- a/Dip.podspec +++ b/Dip.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Dip" - s.version = "7.1.1" + s.version = "7.1.2" s.summary = "Dependency Injection for Swift made easy." s.description = <<-DESC @@ -19,6 +19,7 @@ Pod::Spec.new do |s| s.osx.deployment_target = '10.9' s.tvos.deployment_target = '9.0' s.watchos.deployment_target = '2.0' + s.visionos.deployment_target = '1.1' s.requires_arc = true diff --git a/Dip/Dip.xcodeproj/project.pbxproj b/Dip/Dip.xcodeproj/project.pbxproj index 1ed94f1..c2e3366 100644 --- a/Dip/Dip.xcodeproj/project.pbxproj +++ b/Dip/Dip.xcodeproj/project.pbxproj @@ -361,7 +361,10 @@ PRODUCT_BUNDLE_IDENTIFIER = com.alisoftware.Dip; PRODUCT_NAME = Dip; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3,4,7"; }; name = Debug; }; @@ -381,7 +384,10 @@ PRODUCT_BUNDLE_IDENTIFIER = com.alisoftware.Dip; PRODUCT_NAME = Dip; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3,4,7"; }; name = Release; }; diff --git a/SampleApp/DipSampleApp.xcodeproj/project.pbxproj b/SampleApp/DipSampleApp.xcodeproj/project.pbxproj index 5fbac3d..1fa6994 100644 --- a/SampleApp/DipSampleApp.xcodeproj/project.pbxproj +++ b/SampleApp/DipSampleApp.xcodeproj/project.pbxproj @@ -401,7 +401,9 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.alisoftware.DipSampleApp; PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = NO; + TARGETED_DEVICE_FAMILY = "1,2,7"; }; name = Debug; }; @@ -414,8 +416,10 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.alisoftware.DipSampleApp; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,7"; }; name = Release; }; @@ -536,6 +540,9 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; + TARGETED_DEVICE_FAMILY = "1,7"; }; name = Debug; }; @@ -546,7 +553,10 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + TARGETED_DEVICE_FAMILY = "1,7"; }; name = Release; }; diff --git a/SampleApp/DipSampleApp.xcodeproj/xcshareddata/xcschemes/DipSampleApp.xcscheme b/SampleApp/DipSampleApp.xcodeproj/xcshareddata/xcschemes/DipSampleApp.xcscheme index 8b30355..c6b4335 100644 --- a/SampleApp/DipSampleApp.xcodeproj/xcshareddata/xcschemes/DipSampleApp.xcscheme +++ b/SampleApp/DipSampleApp.xcodeproj/xcshareddata/xcschemes/DipSampleApp.xcscheme @@ -40,8 +40,8 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - codeCoverageEnabled = "YES" - shouldUseLaunchSchemeArgsEnv = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES" + codeCoverageEnabled = "YES"> @@ -54,17 +54,6 @@ - - - - - - - - .allocate(capacity: 1) extension NSObject { @@ -207,7 +208,7 @@ func log(_ message: Any) { } } -#else +#elseif os(watchOS) import WatchKit let swizzleAwakeWithContext: Void = { diff --git a/Tests/DipTests/AutoInjectionTests.swift b/Tests/DipTests/AutoInjectionTests.swift index ef9f065..befc266 100644 --- a/Tests/DipTests/AutoInjectionTests.swift +++ b/Tests/DipTests/AutoInjectionTests.swift @@ -51,12 +51,12 @@ private class ClientImp: Client { @Injected(didInject: { _ in AutoInjectionTests.serverDidInjectCalled = true - }) var server: Server + }) var server: Server? @Injected(required: false) var _optionalProperty: AnyObject? - @Injected(tag: "tagged") var taggedServer: Server - @Injected(tag: nil) var nilTaggedServer: Server + @Injected(tag: "tagged") var taggedServer: Server? + @Injected(tag: nil) var nilTaggedServer: Server? var anotherServer: Server! }