Merge branch '0.1.0' into 'master'

Release 0.1.0



See merge request !1
This commit is contained in:
Giuseppe Nucifora 2016-02-26 04:08:42 +00:00
commit a74dde44ba
5 changed files with 5 additions and 10 deletions

View File

@ -178,7 +178,7 @@ SPEC CHECKSUMS:
FBSnapshotTestCase: 7e85180d0d141a0cf472352edda7e80d7eaeb547 FBSnapshotTestCase: 7e85180d0d141a0cf472352edda7e80d7eaeb547
KissXML: d19dd6dc65e0dc721ba92b3077b8ebdd240f1c1e KissXML: d19dd6dc65e0dc721ba92b3077b8ebdd240f1c1e
libidn: fdf56b4958f08f8544c4cf45b3ed28bfe45c2b05 libidn: fdf56b4958f08f8544c4cf45b3ed28bfe45c2b05
PNXMPPFramework: 74877c04ff3b2ee176ee8f766ceb84eeee5fa9be PNXMPPFramework: 83fb69ac6878fac532c6920e2561f08d80f96863
PODFILE CHECKSUM: c24dacdc80a49fe0e0fea049a6d762eb76667498 PODFILE CHECKSUM: c24dacdc80a49fe0e0fea049a6d762eb76667498

View File

@ -15,7 +15,6 @@
"ios": "7.0" "ios": "7.0"
}, },
"requires_arc": true, "requires_arc": true,
"source_files": "Pod/Classes/**/*",
"resources": [ "resources": [
"**/*.{xcdatamodel,xcdatamodeld}" "**/*.{xcdatamodel,xcdatamodeld}"
], ],
@ -24,7 +23,7 @@
"Pod/Assets/*.png" "Pod/Assets/*.png"
] ]
}, },
"preserve_paths": "PNXMPPFramework/module/module.modulemap", "preserve_paths": "module/module.modulemap",
"subspecs": [ "subspecs": [
{ {
"name": "Core", "name": "Core",

View File

@ -178,7 +178,7 @@ SPEC CHECKSUMS:
FBSnapshotTestCase: 7e85180d0d141a0cf472352edda7e80d7eaeb547 FBSnapshotTestCase: 7e85180d0d141a0cf472352edda7e80d7eaeb547
KissXML: d19dd6dc65e0dc721ba92b3077b8ebdd240f1c1e KissXML: d19dd6dc65e0dc721ba92b3077b8ebdd240f1c1e
libidn: fdf56b4958f08f8544c4cf45b3ed28bfe45c2b05 libidn: fdf56b4958f08f8544c4cf45b3ed28bfe45c2b05
PNXMPPFramework: 74877c04ff3b2ee176ee8f766ceb84eeee5fa9be PNXMPPFramework: 83fb69ac6878fac532c6920e2561f08d80f96863
PODFILE CHECKSUM: c24dacdc80a49fe0e0fea049a6d762eb76667498 PODFILE CHECKSUM: c24dacdc80a49fe0e0fea049a6d762eb76667498

View File

@ -8,9 +8,6 @@
#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). #warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
#endif #endif
#if TARGET_OS_IPHONE
#warning This file does not work on TARGET_OS_IPHONE.
#endif
// Log levels: off, error, warn, info, verbose // Log levels: off, error, warn, info, verbose
#if DEBUG #if DEBUG

View File

@ -28,19 +28,18 @@ Pod::Spec.new do |s|
s.platform = :ios, '7.0' s.platform = :ios, '7.0'
s.requires_arc = true s.requires_arc = true
s.source_files = 'Pod/Classes/**/*' #s.source_files = 'Pod/Classes/**/*'
s.resources = [ '**/*.{xcdatamodel,xcdatamodeld}'] s.resources = [ '**/*.{xcdatamodel,xcdatamodeld}']
s.resource_bundles = { s.resource_bundles = {
'PNXMPPFramework' => ['Pod/Assets/*.png'] 'PNXMPPFramework' => ['Pod/Assets/*.png']
} }
# s.public_header_files = 'Pod/Classes/**/*.h' # s.public_header_files = 'Pod/Classes/**/*.h'
s.preserve_paths = "PNXMPPFramework/Vendor/libidn/"
# s.frameworks = 'UIKit', 'MapKit' # s.frameworks = 'UIKit', 'MapKit'
# s.dependency 'AFNetworking', '~> 2.3' # s.dependency 'AFNetworking', '~> 2.3'
s.preserve_path = 'PNXMPPFramework/module/module.modulemap' s.preserve_path = 'module/module.modulemap'
#s.module_map = 'module/module.modulemap' #s.module_map = 'module/module.modulemap'
s.subspec 'Core' do |core| s.subspec 'Core' do |core|