Skip to content

Commit f4cb5ac

Browse files
authored
Merge pull request Swinject#393 from jakubvano/bump-version
Bump version
2 parents da354b6 + 613f091 commit f4cb5ac

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

.travis.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
language: objective-c
2-
osx_image: xcode10
32
env:
43
global:
54
- LC_CTYPE=en_US.UTF-8
@@ -20,19 +19,34 @@ matrix:
2019
- swift build
2120
- swift test
2221
- env: JOB="POD_LINT"
22+
osx_image: xcode10
2323
script:
2424
- bundle exec pod lib lint
25-
# - env: JOB="XCODE" DEST="OS=8.4,name=iPhone 5" SCHEME="Swinject-iOS" SDK="iphonesimulator" ACTION="test"
2625
- env: JOB="XCODE" DEST="OS=9.3,name=iPhone 6" SCHEME="Swinject-iOS" SDK="iphonesimulator" ACTION="test"
26+
osx_image: xcode10
2727
- env: JOB="XCODE" DEST="OS=10.3.1,name=iPhone 7 Plus" SCHEME="Swinject-iOS" SDK="iphonesimulator" ACTION="test"
28+
osx_image: xcode10
2829
- env: JOB="XCODE" DEST="OS=11.2,name=iPhone 8 Plus" SCHEME="Swinject-iOS" SDK="iphonesimulator" ACTION="test"
30+
osx_image: xcode10
31+
- env: JOB="XCODE" DEST="OS=12.2,name=iPhone X" SCHEME="Swinject-iOS" SDK="iphonesimulator" ACTION="test"
32+
osx_image: xcode10.2
2933
- env: JOB="XCODE" DEST="arch=x86_64" SCHEME="Swinject-OSX" SDK="macosx" ACTION="test"
34+
osx_image: xcode10
35+
- env: JOB="XCODE" DEST="arch=x86_64" SCHEME="Swinject-OSX" SDK="macosx" ACTION="test"
36+
osx_image: xcode10.2
3037
- env: JOB="XCODE" DEST="OS=9.2,name=Apple TV 1080p" SCHEME="Swinject-tvOS" SDK="appletvsimulator" ACTION="test"
38+
osx_image: xcode10
3139
- env: JOB="XCODE" DEST="OS=10.2,name=Apple TV 1080p" SCHEME="Swinject-tvOS" SDK="appletvsimulator" ACTION="test"
40+
osx_image: xcode10
3241
- env: JOB="XCODE" DEST="OS=11.0,name=Apple TV 4K" SCHEME="Swinject-tvOS" SDK="appletvsimulator" ACTION="test"
42+
osx_image: xcode10
3343
- env: JOB="XCODE" DEST="OS=2.2,name=Apple Watch - 42mm" SCHEME="Swinject-watchOS" SDK="watchsimulator" ACTION="build"
44+
osx_image: xcode10
3445
- env: JOB="XCODE" DEST="OS=3.2,name=Apple Watch - 42mm" SCHEME="Swinject-watchOS" SDK="watchsimulator" ACTION="build"
46+
osx_image: xcode10
3547
- env: JOB="XCODE" DEST="OS=4.0,name=Apple Watch - 42mm" SCHEME="Swinject-watchOS" SDK="watchsimulator" ACTION="build"
48+
osx_image: xcode10
49+
3650
before_install:
3751
- curl -L -O https://github.com/Carthage/Carthage/releases/download/0.28.0/Carthage.pkg
3852
- sudo installer -pkg Carthage.pkg -target /

Sources/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>2.5.0</string>
18+
<string>2.6.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

Swinject.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Swinject"
3-
s.version = "2.5.0"
3+
s.version = "2.6.0"
44
s.summary = "Dependency injection framework for Swift"
55
s.description = <<-DESC
66
Swinject is a dependency injection framework for Swift, to manage the dependencies of types in your system.

Tests/SwinjectTests/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>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.5.0</string>
18+
<string>2.6.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)