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.

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

Feature - (2.0.0-beta) 'node' connection mode #7

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3c0073c
Update for compatibility with swift 4.0 and swift 4.1, remove '(Void)…
Apr 16, 2018
215940b
Update projects settings and define as swift version to 4.1
Apr 16, 2018
410a6f9
+ 0.5.5 - Update with xcode-9.3.0 and swift 4.1 compatibility
Apr 16, 2018
dd389ae
+ 0.5.6 - Makes peerId accessible 'public' to the frameworks, doesn't…
Apr 16, 2018
6fba269
podspec
Geoffrey-T Apr 24, 2018
781ad80
Update .gitignore with our own version
Jun 7, 2018
46bb5e9
Specify only swift file for podspec sources
Jun 7, 2018
2723ce0
swift 4.2
fcarrar Sep 24, 2018
acbc99d
Update 'PeerSession' & 'PeerSessionEventProduce', producder now produ…
lifely Oct 25, 2018
4b07352
Update Advertiser and include 'discoveryInfo' in 'PeerAdvertiser' type
lifely Oct 25, 2018
6ed008d
Update demo application, probably doesn't work with refactored
lifely Oct 25, 2018
6863290
Comment playground code since most of it created build issue
lifely Oct 25, 2018
a357122
Update xcode projects configurations and file structures
lifely Oct 25, 2018
8ecaf0a
Update 'PeerBrowser' with 'discoverInfo' and 'sessionFactory'
lifely Oct 25, 2018
4626f5f
Update 'PeerConnectionEvent' with 'session' attributes on 'receive' e…
lifely Oct 25, 2018
e6bf32a
Update 'Peer' type with more 'convenience init' and 'discoveryInfo'
lifely Oct 25, 2018
b4e09ca
Split 'PeerConnectionManager' extensions in multiple files and update…
lifely Oct 25, 2018
c94d615
! 2.0.0-beta - first offical draft / review of this 2.0.0 with 'node'…
lifely Oct 25, 2018
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
169 changes: 137 additions & 32 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,65 +1,170 @@
# Xcode
####
# Global ignores - macOS X system ignores
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
# NB: https://github.com/github/gitignore/blob/master/Global/OSX.gitignore

## Build generated
build/
*.DS_Store
.AppleDouble
.LSOverride
profile

# Icon must end with two \r
Icon

# Thumbnails
._*
*.swp
*.lock
[Tt]humbs.db
*.bak*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

####
# Global for many version of Xcode - from different source in weird orders
#
# NB: https://github.com/github/gitignore/blob/master/Global/Xcode.gitignore
# NB: http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects - https://gist.github.com/adamgit/3786883

# Xcode temporary files that should never be committed
# NB: NIB/XIB files still exist even on Storyboard projects, so we want this...
*~.nib

## - Xcode build files

# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "DerivedData"
DerivedData/

## Various settings
# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "build"
build/
build/*

#####
# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups)
#
# This is complicated:
#
# SOMETIMES you need to put this file in version control.
# Apple designed it poorly - if you use "custom executables", they are saved in this file.
# 99% of projects do NOT use those, so they do NOT want to version control this file.
# ..but if you're in the 1%, comment out the line "*.pbxuser"
# NB: also, whitelist the default ones, some projects need to use these

*.pbxuser
!default.pbxuser
*.mode1
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspective
*.perspectivev3
!default.pbxuser
!default.mode1v3
!default.mode2v3
!default.perspectivev3
xcuserdata/

## Other
*.moved-aside
*.xcuserstate
*.xcscmblueprint

# XCode 4 build-schemes - PRIVATE ones are stored inside xcuserdata
!xcschemes

# Xcode 4 - semi-personal settings, often included in workspaces
# You can safely ignore the xcuserdata files - but do NOT ignore the files next to them
xcuserdata

####
# XCode 4 workspaces - more detailed
#
# Workspaces are important! They are a core feature of Xcode - don't exclude them :)
#
# Workspace layout is quite spammy. For reference:
#
# (root)/
# (project-name).xcodeproj/
# project.pbxproj
# project.xcworkspace/
# contents.xcworkspacedata
# xcuserdata/
# (your name)/xcuserdatad/
# xcuserdata/
# (your name)/xcuserdatad/
#
#
#
# Xcode 4 workspaces - SHARED
#
# This is UNDOCUMENTED (google: "developer.apple.com xcshareddata" - 0 results
# But if you're going to kill personal workspaces, at least keep the shared ones...
#
#
!xcshareddata
*.xcuserdatad

# Allegedly, if you manually "deprecate" your classes, they get moved here.
# We're using source-control, so this is a "feature" that we do not want!
*.moved-aside

# Xcode 5 introduced a new file type .xccheckout. This files contains VCS metadata
# and should therefore not be checked into the VCS.
*.xccheckout

####
# objective-c ignores - language related ignore, simplifies without previous ignored and focus on objective-c
#
# NB: https://github.com/github/gitignore/blob/master/Objective-C.gitignore


## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
Pods/
Podfile.local
*.xcworkspace
!Manifest.lock
!Podfile.lock

# Carthage
####
# Continuous Integration Ignore - Fastlane and other
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
# Bundler
.bundle

# fastlane specific & deliver temporary files
fastlane/report.xml
fastlane/Preview.html

# snapshot generated screenshots
fastlane/screenshots

# scan temporary files
fastlane/test_output

# Certificates and provisioning files
*.cer
*.mobileprovision

jenkins.keychain
Expand Down
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
4.0
17 changes: 11 additions & 6 deletions PeerConnectivity.podspec
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
Pod::Spec.new do |s|
s.name = "PeerConnectivity"
s.version = "0.5.4"
s.version = "2.0.0-beta"

s.summary = "Functional wrapper for Apple's MultipeerConnectivity framework."
s.description = <<-DESC
A functional wrapper around the MultipeerConnectivity framework that handles the edge cases of
mesh-networks.
DESC
s.homepage = "https://github.com/rchatham/PeerConnectivity"

s.license = "MIT"
s.author = { "Reid Chatham" => "reid.chatham@gmail.com" }
s.platform = :ios, "8.0"
s.source = { :git => "https://github.com/rchatham/PeerConnectivity.git", :tag => "#{s.version}" }
s.source_files = "Sources/*"
s.homepage = "https://github.com/tillersystems/PeerConnectivity"

s.swift_version = '4.2'
s.ios.deployment_target = '10.1'

s.source = { :git => "https://github.com/tillersystems/PeerConnectivity.git", :tag => "#{s.version}" }
s.source_files = "Sources/*.swift"
s.framework = "MultipeerConnectivity"
# s.documentation_url = "http://reidchatham.com/docs/PeerConnectivity/Classes/PeerConnectionManager.html"

end
Loading