Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update swift5 #9

Merged
merged 5 commits into from
Aug 15, 2019
Merged

Update swift5 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc025eb
Update swift5
funzin Aug 15, 2019
0577420
Update carthage
funzin Aug 15, 2019
1f4d04c
Fix
funzin Aug 15, 2019
807437d
Update xcode10.3
funzin Aug 15, 2019
f631322
Remove install carthage
funzin Aug 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .swiftlint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
excluded:
- Pods/
- Demo/
- Carthage/
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode10
osx_image: xcode10.3
xcode_workspace: StackBarButtonItem.xcworkspace
xcode_scheme: StackBarButtonItem-iOS
xcode_sdk: iphonesimulator
Expand All @@ -8,7 +8,6 @@ before_install:
- gem install cocoapods --pre
- pod repo update
- brew update
- brew upgrade carthage
- carthage update --no-use-binaries --platform iOS
before_script:
- set -o pipefail
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" ~> 4.3.1
github "ReactiveX/RxSwift" ~> 5.0.1
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" "4.3.1"
github "ReactiveX/RxSwift" "5.0.1"
4 changes: 2 additions & 2 deletions Demo/Demo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.funzin.Demo;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -344,7 +344,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.funzin.Demo;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
22 changes: 14 additions & 8 deletions StackBarButtonItem.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
314AF962214666F70008202E /* StackBarButtonItemTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4EC7A502136B7EE0034767C /* StackBarButtonItemTests.swift */; };
314AF9662146783F0008202E /* DeviceExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 314AF9652146783F0008202E /* DeviceExtension.swift */; };
31658C74217B0AEF00FD3E18 /* UINavigationItem+StackBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31658C73217B0AEF00FD3E18 /* UINavigationItem+StackBarButtonItem.swift */; };
3176E4C1230541DA00CB14B0 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4EC7A992136BC5C0034767C /* RxCocoa.framework */; };
3176E4C2230541DA00CB14B0 /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3176E4BC2305411300CB14B0 /* RxRelay.framework */; };
3176E4C3230541DA00CB14B0 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4EC7A9B2136BC5C0034767C /* RxSwift.framework */; };
D4EC7A912136BA8F0034767C /* StackBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4EC7A5E2136B8070034767C /* StackBarButtonItem.swift */; };
D4EC7A9E2136BC5D0034767C /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4EC7A992136BC5C0034767C /* RxCocoa.framework */; };
D4EC7AA02136BC5D0034767C /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4EC7A9B2136BC5C0034767C /* RxSwift.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -33,6 +34,7 @@
314AF9392146666B0008202E /* StackBarButtonItemTests-iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "StackBarButtonItemTests-iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
314AF9652146783F0008202E /* DeviceExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceExtension.swift; sourceTree = "<group>"; };
31658C73217B0AEF00FD3E18 /* UINavigationItem+StackBarButtonItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationItem+StackBarButtonItem.swift"; sourceTree = "<group>"; };
3176E4BC2305411300CB14B0 /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = Carthage/Build/iOS/RxRelay.framework; sourceTree = "<group>"; };
D4EC7A452136B7EE0034767C /* StackBarButtonItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StackBarButtonItem.h; sourceTree = "<group>"; };
D4EC7A502136B7EE0034767C /* StackBarButtonItemTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StackBarButtonItemTests.swift; sourceTree = "<group>"; };
D4EC7A5E2136B8070034767C /* StackBarButtonItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StackBarButtonItem.swift; sourceTree = "<group>"; };
Expand All @@ -58,8 +60,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D4EC7A9E2136BC5D0034767C /* RxCocoa.framework in Frameworks */,
D4EC7AA02136BC5D0034767C /* RxSwift.framework in Frameworks */,
3176E4C1230541DA00CB14B0 /* RxCocoa.framework in Frameworks */,
3176E4C2230541DA00CB14B0 /* RxRelay.framework in Frameworks */,
3176E4C3230541DA00CB14B0 /* RxSwift.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -126,6 +129,7 @@
D4EC7A962136BC5C0034767C /* Frameworks */ = {
isa = PBXGroup;
children = (
3176E4BC2305411300CB14B0 /* RxRelay.framework */,
D4EC7A972136BC5C0034767C /* NSObject_Rx.framework */,
D4EC7A982136BC5C0034767C /* RxBlocking.framework */,
D4EC7A992136BC5C0034767C /* RxCocoa.framework */,
Expand Down Expand Up @@ -211,6 +215,7 @@
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = D4EC7A382136B7EE0034767C;
productRefGroup = D4EC7A432136B7EE0034767C /* Products */;
Expand Down Expand Up @@ -249,6 +254,7 @@
inputPaths = (
"$(SRCROOT)/Carthage/Build/iOS/RxSwift.framework",
"$(SRCROOT)/Carthage/Build/iOS/RxCocoa.framework",
"$(SRCROOT)/Carthage/Build/iOS/RxRelay.framework",
);
outputPaths = (
);
Expand Down Expand Up @@ -303,7 +309,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "com.funzin.StackBarButtonItemTests-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -322,7 +328,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "com.funzin.StackBarButtonItemTests-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down Expand Up @@ -473,7 +479,7 @@
PRODUCT_NAME = "$(PROJECT_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand Down Expand Up @@ -504,7 +510,7 @@
PRODUCT_NAME = "$(PROJECT_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down