Skip to content

Commit

Permalink
Merge pull request #568 from daltoniam/swift_4.2
Browse files Browse the repository at this point in the history
Swift 4.2 and example project
  • Loading branch information
fassko committed Oct 8, 2018
2 parents 384b803 + b0729b1 commit 2022e6f
Show file tree
Hide file tree
Showing 36 changed files with 1,203 additions and 10 deletions.
95 changes: 93 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
#
# Pods/
Pods/

# Xcode
.DS_Store
Expand All @@ -24,4 +24,95 @@ DerivedData
.idea/
*.hmap
*.xccheckout
*.xcodeproj/*.xcworkspace
*.xcodeproj/*.xcworkspace


# Created by https://www.gitignore.io/api/swift,swiftpm

### Swift ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/

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

## 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/
# Package.pins
# Package.resolved
.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/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
#
# 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://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/

### SwiftPM ###
Packages
xcuserdata
*.xcodeproj


# End of https://www.gitignore.io/api/swift,swiftpm
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
osx_image: xcode10
language: objective-c
before_install:
- gem install cocoapods --pre
- gem cleanup
script:
- ./build.sh
8 changes: 8 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"object": {
"pins": [

]
},
"version": 1
}
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:4.0
// swift-tools-version:4.2

//
// Package.Swift
Expand All @@ -25,10 +25,10 @@ import PackageDescription
let package = Package(
name: "Starscream",
products: [
.library(name: "Starscream", targets: ["Starscream"])
.library(name: "Starscream", targets: ["Starscream"])
],
dependencies: [],
targets: [
.target(name: "Starscream")
.target(name: "Starscream")
]
)
6 changes: 2 additions & 4 deletions Starscream.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Starscream"
s.version = "3.0.5"
s.version = "3.0.6"
s.summary = "A conforming WebSocket RFC 6455 client library in Swift."
s.homepage = "https://github.com/daltoniam/Starscream"
s.license = 'Apache License, Version 2.0'
Expand All @@ -12,7 +12,5 @@ Pod::Spec.new do |s|
s.tvos.deployment_target = '9.0'
s.watchos.deployment_target = '2.0'
s.source_files = 'Sources/**/*.swift'
s.pod_target_xcconfig = {
'SWIFT_VERSION' => '4.1'
}
s.swift_version = '4.2'
end
6 changes: 6 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

set -o pipefail && xcodebuild -project Starscream.xcodeproj -scheme Starscream CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build | xcpretty
swift build
pod repo update
pod lib lint --verbose
11 changes: 11 additions & 0 deletions examples/WebSocketsOrgEcho/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Uncomment the next line to define a global platform for your project
# platform :ios, '9.0'

target 'WebSocketsOrgEcho' do
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
use_frameworks!

# Pods for WebSocketsOrgEcho

pod 'Starscream', :path => '../../'
end
16 changes: 16 additions & 0 deletions examples/WebSocketsOrgEcho/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
PODS:
- Starscream (3.0.6)

DEPENDENCIES:
- Starscream (from `../../`)

EXTERNAL SOURCES:
Starscream:
:path: "../../"

SPEC CHECKSUMS:
Starscream: 96cd79a6b7ef6a2ff2d00638c73bd195a5322586

PODFILE CHECKSUM: 96d91933fe13671aaa81af8a8675ff7698068845

COCOAPODS: 1.6.0.beta.1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions examples/WebSocketsOrgEcho/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2022e6f

Please sign in to comment.