Skip to content

Commit e2549c1

Browse files
author
Michael Long
committed
Final updates for 1.1.3
1 parent d459eae commit e2549c1

File tree

6 files changed

+57
-5
lines changed

6 files changed

+57
-5
lines changed

CHANGELOG

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Resolver Changelog
22

3+
### 1.1.3
4+
5+
* Add @OptionalInjected attribute
6+
* Fixed Empty CURRENT_PROJECT_VERSION variable.
7+
* Mark framework to use application extension safe api only
8+
* Use fatalError message instead of print
9+
310
### 1.1.2
411

512
* Add @InjectedObject property wrapper for SwiftUI support

Resolver.podspec

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
Pod::Spec.new do |s|
22
s.name = "Resolver"
3-
s.version = "1.1.2"
3+
s.version = "1.1.3"
44
s.summary = "An ultralight Dependency Injection / Service Locator framework for Swift on iOS."
55
s.homepage = "https://github.com/hmlongco/Resolver"
66
s.license = "MIT"
77
s.author = "Michael Long"
8-
s.platform = :ios, "11.0"
98
s.source = { :git => "https://github.com/hmlongco/Resolver.git", :tag => "#{s.version}" }
109
s.source_files = "Classes", "Sources/Resolver/*.swift"
1110
s.swift_version = '5.1'
11+
12+
s.ios.deployment_target = "11.0"
1213
s.ios.framework = 'UIKit'
14+
e
15+
s.osx.deployment_target = "10.15"
16+
s.osx.framework = 'AppKit'
1317
end

Resolver/Resolver.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
4C87FD0E206BFD5800BF6798 /* Cycle.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Cycle.md; sourceTree = "<group>"; };
5353
4C87FD0F206D207600BF6798 /* Injection.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Injection.md; sourceTree = "<group>"; };
5454
4CA30FE41FBB6C8500217883 /* Resolver.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Resolver.framework; sourceTree = BUILT_PRODUCTS_DIR; };
55-
4CA30FE71FBB6C8500217883 /* Resolver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Resolver.h; sourceTree = "<group>"; };
55+
4CA30FE71FBB6C8500217883 /* Resolver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Resolver.h; path = ../../Sources/Resolver.h; sourceTree = "<group>"; };
5656
4CA30FE81FBB6C8500217883 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5757
4CA30FED1FBB6C8500217883 /* ResolverTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ResolverTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5858
4CA30FF21FBB6C8500217883 /* ResolverBasicTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResolverBasicTests.swift; sourceTree = "<group>"; };
5959
4CA30FF41FBB6C8500217883 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
60-
4CA30FFF1FBB6DFA00217883 /* Resolver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Resolver.swift; sourceTree = "<group>"; };
60+
4CA30FFF1FBB6DFA00217883 /* Resolver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Resolver.swift; path = Resolver/Resolver.swift; sourceTree = "<group>"; };
6161
4CD4F7FF206E99440090669A /* TestData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestData.swift; sourceTree = "<group>"; };
6262
4CD4F801206EA9DA0090669A /* ResolverScopeReferenceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResolverScopeReferenceTests.swift; sourceTree = "<group>"; };
6363
4CD4F803206EAC1E0090669A /* ResolverNameTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResolverNameTests.swift; sourceTree = "<group>"; };

Resolver/Resolver.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Resolver/Resolver/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0.7</string>
18+
<string>$(MARKETING_VERSION)</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSPrincipalClass</key>

Sources/Resolver.h

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
//
2+
// Resolver.h
3+
//
4+
// Copyright © 2017 Michael Long. All rights reserved.
5+
//
6+
// Permission is hereby granted, free of charge, to any person obtaining a copy
7+
// of this software and associated documentation files (the "Software"), to deal
8+
// in the Software without restriction, including without limitation the rights
9+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
// copies of the Software, and to permit persons to whom the Software is
11+
// furnished to do so, subject to the following conditions:
12+
//
13+
// The above copyright notice and this permission notice shall be included in
14+
// all copies or substantial portions of the Software.
15+
//
16+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
// THE SOFTWARE.
23+
//
24+
25+
#import <UIKit/UIKit.h>
26+
27+
//! Project version number for Resolver.
28+
FOUNDATION_EXPORT double ResolverVersionNumber;
29+
30+
//! Project version string for Resolver.
31+
FOUNDATION_EXPORT const unsigned char ResolverVersionString[];
32+
33+
// In this header, you should import all the public headers of your framework using statements like #import <Resolver/PublicHeader.h>
34+

0 commit comments

Comments
 (0)