Skip to content
This repository has been archived by the owner on Mar 6, 2018. It is now read-only.

Commit

Permalink
Swift 3.0 Support
Browse files Browse the repository at this point in the history
  • Loading branch information
@ivanbruel
ivanbruel committed Sep 28, 2016
1 parent afa82e3 commit d40a7f5
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 50 deletions.
4 changes: 3 additions & 1 deletion Example/Podfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
use_frameworks!

target 'RxPermission_Example', :exclusive => true do
target 'RxPermission_Example' do
pod 'RxPermission', :path => '../'
pod 'Permission', :git => 'https://github.com/delba/Permission', :branch => 'swift-3.0'
pod 'RxSwift', :git => 'https://github.com/ReactiveX/RxSwift'
end
37 changes: 27 additions & 10 deletions Example/Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,37 @@
PODS:
- Permission (1.2)
- RxPermission (0.1.0):
- Permission (~> 1.2)
- RxSwift (~> 2.4)
- RxSwift (2.4)
- Permission (1.5)
- RxPermission (0.2):
- Permission
- RxSwift
- RxSwift (3.0.0-beta.1)

DEPENDENCIES:
- Permission (from `https://github.com/delba/Permission`, branch `swift-3.0`)
- RxPermission (from `../`)
- RxSwift (from `https://github.com/ReactiveX/RxSwift`)

EXTERNAL SOURCES:
Permission:
:branch: swift-3.0
:git: https://github.com/delba/Permission
RxPermission:
:path: ../
:path: "../"
RxSwift:
:git: https://github.com/ReactiveX/RxSwift

CHECKOUT OPTIONS:
Permission:
:commit: 118772cc410e53acc9ec156d309448cf5861c329
:git: https://github.com/delba/Permission
RxSwift:
:commit: cb5ae2f31f520c0e5d3f75a6c3637cde1c3bbbaa
:git: https://github.com/ReactiveX/RxSwift

SPEC CHECKSUMS:
Permission: 690011e4d88f1afe47fad8207ec7d006b9eb8d0c
RxPermission: 8eb6468fff0a933fd02111f9a9f71c2917d3d703
RxSwift: 67b9ef4e8b34fb394e200e754c6a09cc16559f94
Permission: 2d9647f8b994a5faf7e1c5a40d4328fde158c2f2
RxPermission: ae4eb417194477024fe08443c99ce90dbcba9707
RxSwift: 0823e8d7969c23bfa9ddfb2afa4881e424a1a710

PODFILE CHECKSUM: 4b41159dbcdf90412fd7d5e568ebb98713a1704b

COCOAPODS: 0.39.0
COCOAPODS: 1.1.0.rc.2
69 changes: 33 additions & 36 deletions Example/RxPermission.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,52 +7,55 @@
objects = {

/* Begin PBXBuildFile section */
3A1FE0DB0147DCAD4B12D1DA /* Pods_RxPermission_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 921E9783E04197B4A06B6792 /* Pods_RxPermission_Example.framework */; };
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; };
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; };
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
66D1541A495555E508DB9ECB /* Pods_RxPermission_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B7A5B776CA50AAF65A199F9 /* Pods_RxPermission_Example.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0AF703E2FB4DDA97EDB48454 /* Pods-RxPermission_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxPermission_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RxPermission_Example/Pods-RxPermission_Example.debug.xcconfig"; sourceTree = "<group>"; };
12BC9517EB4AE168637B1398 /* Pods-RxPermission_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxPermission_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-RxPermission_Example/Pods-RxPermission_Example.release.xcconfig"; sourceTree = "<group>"; };
2A1A9A325D857E3D4CD7D64D /* Pods_RxPermission_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxPermission_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4842686CDFA817D6746D3D0A /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
4AD74263B87B6FE2FC011135 /* Pods-RxPermission_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxPermission_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RxPermission_Tests/Pods-RxPermission_Tests.debug.xcconfig"; sourceTree = "<group>"; };
607FACD01AFB9204008FA782 /* RxPermission_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RxPermission_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
607FACD71AFB9204008FA782 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
607FACDA1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
607FACDC1AFB9204008FA782 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
607FACDF1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
911BE0487ED3A3351F362192 /* Pods-RxPermission_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxPermission_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RxPermission_Tests/Pods-RxPermission_Tests.release.xcconfig"; sourceTree = "<group>"; };
921E9783E04197B4A06B6792 /* Pods_RxPermission_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxPermission_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6D532287AD26864757CF477D /* Pods-RxPermission_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxPermission_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-RxPermission_Example/Pods-RxPermission_Example.release.xcconfig"; sourceTree = "<group>"; };
7B7A5B776CA50AAF65A199F9 /* Pods_RxPermission_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxPermission_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BFC04ADA0C92DF6DDC7431B8 /* RxPermission.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = RxPermission.podspec; path = ../RxPermission.podspec; sourceTree = "<group>"; };
D233BF7234444300C5C72F92 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
F94059225A135AE33C5B7775 /* Pods-RxPermission_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxPermission_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RxPermission_Example/Pods-RxPermission_Example.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
607FACCD1AFB9204008FA782 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3A1FE0DB0147DCAD4B12D1DA /* Pods_RxPermission_Example.framework in Frameworks */,
66D1541A495555E508DB9ECB /* Pods_RxPermission_Example.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
604F24440FBB0DFE2E4E8BAB /* Pods */ = {
10397AFC8B96E8542ACA5A4A /* Frameworks */ = {
isa = PBXGroup;
children = (
0AF703E2FB4DDA97EDB48454 /* Pods-RxPermission_Example.debug.xcconfig */,
12BC9517EB4AE168637B1398 /* Pods-RxPermission_Example.release.xcconfig */,
4AD74263B87B6FE2FC011135 /* Pods-RxPermission_Tests.debug.xcconfig */,
911BE0487ED3A3351F362192 /* Pods-RxPermission_Tests.release.xcconfig */,
7B7A5B776CA50AAF65A199F9 /* Pods_RxPermission_Example.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
1C88B214D6CD8FCEAC62464F /* Pods */ = {
isa = PBXGroup;
children = (
F94059225A135AE33C5B7775 /* Pods-RxPermission_Example.debug.xcconfig */,
6D532287AD26864757CF477D /* Pods-RxPermission_Example.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand All @@ -63,8 +66,8 @@
607FACF51AFB993E008FA782 /* Podspec Metadata */,
607FACD21AFB9204008FA782 /* Example for RxPermission */,
607FACD11AFB9204008FA782 /* Products */,
604F24440FBB0DFE2E4E8BAB /* Pods */,
B01F413E745FAF2F6AF9D2C4 /* Frameworks */,
1C88B214D6CD8FCEAC62464F /* Pods */,
10397AFC8B96E8542ACA5A4A /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -108,28 +111,19 @@
name = "Podspec Metadata";
sourceTree = "<group>";
};
B01F413E745FAF2F6AF9D2C4 /* Frameworks */ = {
isa = PBXGroup;
children = (
921E9783E04197B4A06B6792 /* Pods_RxPermission_Example.framework */,
2A1A9A325D857E3D4CD7D64D /* Pods_RxPermission_Tests.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
607FACCF1AFB9204008FA782 /* RxPermission_Example */ = {
isa = PBXNativeTarget;
buildConfigurationList = 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "RxPermission_Example" */;
buildPhases = (
120B2F7369902BFCEC5C9D5E /* Check Pods Manifest.lock */,
422A467D66CCE09DD0F5E17B /* [CP] Check Pods Manifest.lock */,
607FACCC1AFB9204008FA782 /* Sources */,
607FACCD1AFB9204008FA782 /* Frameworks */,
607FACCE1AFB9204008FA782 /* Resources */,
D92A42A4900053518B3AB3BE /* Embed Pods Frameworks */,
E373817C20D5D1EE6ED8D628 /* Copy Pods Resources */,
6673305511CB14E00F9BCB43 /* [CP] Embed Pods Frameworks */,
AE2FF31485BE212218D8828C /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -152,6 +146,7 @@
TargetAttributes = {
607FACCF1AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 0800;
};
};
};
Expand Down Expand Up @@ -187,44 +182,44 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
120B2F7369902BFCEC5C9D5E /* Check Pods Manifest.lock */ = {
422A467D66CCE09DD0F5E17B /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
D92A42A4900053518B3AB3BE /* Embed Pods Frameworks */ = {
6673305511CB14E00F9BCB43 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxPermission_Example/Pods-RxPermission_Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
E373817C20D5D1EE6ED8D628 /* Copy Pods Resources */ = {
AE2FF31485BE212218D8828C /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -350,27 +345,29 @@
};
607FACF01AFB9204008FA782 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 0AF703E2FB4DDA97EDB48454 /* Pods-RxPermission_Example.debug.xcconfig */;
baseConfigurationReference = F94059225A135AE33C5B7775 /* Pods-RxPermission_Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = RxPermission/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
607FACF11AFB9204008FA782 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 12BC9517EB4AE168637B1398 /* Pods-RxPermission_Example.release.xcconfig */;
baseConfigurationReference = 6D532287AD26864757CF477D /* Pods-RxPermission_Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = RxPermission/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
6 changes: 3 additions & 3 deletions Example/RxPermission/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ class ViewController: UIViewController {
super.viewDidLoad()

Permission
.LocationAlways
.locationAlways
.rx_permission
.subscribeNext { status in
.subscribe(onNext: { status in
self.label.text = "Status: \(status)"
}
})
.addDisposableTo(disposeBag)
}
}
Expand Down

0 comments on commit d40a7f5

Please sign in to comment.