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

4.1.1 Release #1197

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ XMPPFramework*.zip

Pods/
Carthage/
.swiftpm/
.build/
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- xcodebuild -scheme SPM_XMPPFramework-Package -destination "name=iPhone 11 Pro" test

- stage: Xcode Tests
osx_image: xcode9.3
osx_image: xcode12.2
cache:
directories:
- Carthage
Expand All @@ -23,12 +23,12 @@ jobs:
before_install:
# - brew update
# - brew outdated carthage || brew upgrade carthage
- export IOS_SIMULATOR_DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.3"
- export IOS_SIMULATOR_DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=14.2"

install:
- carthage bootstrap --no-build
- cd Xcode
- bundle install
- cd Xcode
- bundle exec pod repo update --silent
- bundle exec pod install --project-directory=Testing-iOS/
- bundle exec pod install --project-directory=Testing-macOS/
Expand All @@ -47,3 +47,5 @@ jobs:
- xcodebuild -project Xcode/Testing-Carthage/XMPPFrameworkTests.xcodeproj -scheme "XMPPFrameworkTests (macOS)" -sdk macosx -arch x86_64 test | xcpretty -c
- xcodebuild -project Xcode/Testing-Carthage/XMPPFrameworkSwiftTests.xcodeproj -scheme "XMPPFrameworkTests (macOS)" -sdk macosx -arch x86_64 test | xcpretty -c
- travis_retry xcodebuild -project Xcode/Testing-Carthage/XMPPFrameworkTests.xcodeproj -scheme "XMPPFrameworkTests (iOS)" -sdk iphonesimulator -destination "$IOS_SIMULATOR_DESTINATION" test | xcpretty -c

- bundle exec pod spec lint XMPPFramework.podspec --verbose --allow-warnings
2 changes: 1 addition & 1 deletion Extensions/XEP-0054/CoreDataStorage/XMPPvCardTransformer.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

NS_ASSUME_NONNULL_BEGIN

API_AVAILABLE(ios(12.0))
API_AVAILABLE(ios(12.0), tvos(12.0), macos(10.14))
@interface XMPPvCardTransformer : NSSecureUnarchiveFromDataTransformer

@end
Expand Down
2 changes: 1 addition & 1 deletion Xcode/Gemfile → Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source "https://rubygems.org"

gem "cocoapods", "~> 1.5.0"
gem 'cocoapods'
93 changes: 93 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.3)
activesupport (5.2.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.10.1)
addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.19.0, < 2.0)
cocoapods-core (1.10.1)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.4.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-trunk (1.5.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.7)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.14.2)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.8.7)
concurrent-ruby (~> 1.0)
json (2.5.1)
minitest (5.14.3)
molinillo (0.6.6)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
public_suffix (4.0.6)
ruby-macho (1.4.0)
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
xcodeproj (1.19.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)

PLATFORMS
ruby

DEPENDENCIES
cocoapods

BUNDLED WITH
2.1.4
52 changes: 52 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"object": {
"pins": [
{
"package": "CocoaAsyncSocket",
"repositoryURL": "https://github.com/robbiehanson/CocoaAsyncSocket.git",
"state": {
"branch": null,
"revision": "dbdc00669c1ced63b27c3c5f052ee4d28f10150c",
"version": "7.6.5"
}
},
{
"package": "CocoaLumberjack",
"repositoryURL": "https://github.com/CocoaLumberjack/CocoaLumberjack.git",
"state": {
"branch": null,
"revision": "b06614d2373a9830c87817144d47ce654980a2d7",
"version": "3.7.0"
}
},
{
"package": "KissXML",
"repositoryURL": "https://github.com/robbiehanson/KissXML.git",
"state": {
"branch": null,
"revision": "990cdef080213b5a3f0d9709b845d553bd3ddb97",
"version": "5.3.3"
}
},
{
"package": "libidn",
"repositoryURL": "https://github.com/chrisballinger/libidn-framework.git",
"state": {
"branch": null,
"revision": "fc2700ce83a279ac121aa9f59eedacfadd24ab5b",
"version": "1.35.1"
}
},
{
"package": "swift-log",
"repositoryURL": "https://github.com/apple/swift-log.git",
"state": {
"branch": null,
"revision": "173f567a2dfec11d74588eea82cecea555bdc0bc",
"version": "1.4.0"
}
}
]
},
"version": 1
}
7 changes: 3 additions & 4 deletions XMPPFramework.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Pod::Spec.new do |s|
s.name = 'XMPPFramework'
s.version = '4.1.1'

s.osx.deployment_target = '10.9'
s.osx.deployment_target = '10.10'
s.ios.deployment_target = '9.0'
s.tvos.deployment_target = '9.0'

Expand All @@ -21,6 +21,7 @@ Pod::Spec.new do |s|
on a 12-core Mac Pro. (And it won\'t block the main thread... at all).'

s.requires_arc = true
s.swift_versions = ['5.0']

s.default_subspec = 'default'

Expand All @@ -42,12 +43,10 @@ Pod::Spec.new do |s|
end

s.subspec 'Swift' do |ss|
ss.ios.deployment_target = '9.0'
ss.tvos.deployment_target = '9.0'
ss.osx.deployment_target = '10.10'
ss.source_files = 'Swift/**/*.swift'
ss.dependency 'XMPPFramework/default'
ss.dependency 'CocoaLumberjack/Swift'
end


end
76 changes: 0 additions & 76 deletions Xcode/Gemfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion Xcode/Testing-iOS/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
platform :ios, '8.0'
platform :ios, '9.0'
# Uncomment this line if you're using Swift
use_frameworks!

Expand Down
22 changes: 11 additions & 11 deletions Xcode/Testing-iOS/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ PODS:
- CocoaLumberjack/Default
- KissXML (5.2.3)
- libidn (1.35)
- XMPPFramework (4.0):
- XMPPFramework/default (= 4.0)
- XMPPFramework/default (4.0):
- CocoaAsyncSocket
- XMPPFramework (4.1.1):
- XMPPFramework/default (= 4.1.1)
- XMPPFramework/default (4.1.1):
- CocoaAsyncSocket (~> 7.6)
- CocoaLumberjack
- KissXML
- libidn
- XMPPFramework/Swift (4.0):
- KissXML (~> 5.2)
- libidn (~> 1.35)
- XMPPFramework/Swift (4.1.1):
- CocoaLumberjack/Swift
- XMPPFramework/default

Expand All @@ -26,7 +26,7 @@ DEPENDENCIES:
- XMPPFramework/Swift (from `../../`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
trunk:
- CocoaAsyncSocket
- CocoaLumberjack
- KissXML
Expand All @@ -41,8 +41,8 @@ SPEC CHECKSUMS:
CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
KissXML: 09f88ff8161fd058d67b70740b8b516687b52823
libidn: e4576a956b797c584c77aaedfc6e3dd639b61bdc
XMPPFramework: d853f01ec7a6ca72fdb45682ccbaf5ed6fdae9a3
XMPPFramework: aab9f421bbe4b5072b04923446a9ad641813ec0c

PODFILE CHECKSUM: ce5651a01a2b1f779d8d999ff8c04566b9161d73
PODFILE CHECKSUM: 6ee92949b0e1d2b225b8cc6dce35e6fbfe33e878

COCOAPODS: 1.5.3
COCOAPODS: 1.10.1
Loading