Permalink
Browse files

CocoaPods set up

  • Loading branch information...
1 parent 4a6e361 commit 18f78612026bac265ed5d3a9e633b2df73df476d @Romes-- Romes-- committed Apr 23, 2014
Showing with 15 additions and 26 deletions.
  1. +6 −0 BasicPHP.m
  2. +4 −2 HTMLPurifier.xcodeproj/project.pbxproj
  3. +1 −23 LICENSE
  4. +4 −1 URIScheme/HTMLPurifier_URIScheme_data.m
View
@@ -1171,7 +1171,10 @@ NSInteger hexdec(NSString* hex_string)
}
else
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
decodedData = [[NSData alloc] initWithBase64Encoding:base64String];
+#pragma clang diagnostic pop
}
// NSString *decodedString = [[NSString alloc] initWithData:decodedData encoding:NSUTF8StringEncoding];
return decodedData;
@@ -1188,8 +1191,11 @@ NSInteger hexdec(NSString* hex_string)
}
else
{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
//available from 10.6, deprecated in 10.9
base64String = [plainData base64Encoding];
+#pragma clang diagnostic pop
}
return base64String;
}
@@ -2862,12 +2862,13 @@
"$(inherited)",
);
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+ INSTALL_PATH = "@executable_path/../Frameworks/";
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
- SYMROOT = /usr/local/lib;
+ SYMROOT = build;
};
name = Debug;
};
@@ -2881,12 +2882,13 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "HTMLPurifieriOS/HTMLPurifieriOS-Prefix.pch";
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+ INSTALL_PATH = "@executable_path/../Frameworks/";
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
- SYMROOT = /usr/local/lib;
+ SYMROOT = build;
VALIDATE_PRODUCT = YES;
};
name = Release;
View
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
GPLv2 with libgit2-style linking exemption („Link with open and proprietary software, no strings attached.“)
@@ -416,25 +415,16 @@ THE SOFTWARE.
The regex library (deps/regex/) is licensed under the GNU LGPL
GNU LESSER GENERAL PUBLIC LICENSE
-=======
-GNU LESSER GENERAL PUBLIC LICENSE
->>>>>>> 97ca4878aef8921bd4db1b454c60b06510b72237
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
-<<<<<<< HEAD
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-=======
(This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.)
->>>>>>> 97ca4878aef8921bd4db1b454c60b06510b72237
Preamble
@@ -896,13 +886,8 @@ safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
-<<<<<<< HEAD
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-=======
{description}
- Copyright (C) {year} {fullname}
->>>>>>> 97ca4878aef8921bd4db1b454c60b06510b72237
+ Copyright (C) 2014 Mynigma
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -927,16 +912,9 @@ necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-<<<<<<< HEAD
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!
----------------------------------------------------------------------
-=======
- {signature of Ty Coon}, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
->>>>>>> 97ca4878aef8921bd4db1b454c60b06510b72237
@@ -166,8 +166,11 @@ -(BOOL) doValidate:(HTMLPurifier_URI*)uri config:(HTMLPurifier_Config*)config co
}
else
{
- //available from 10.6, deprecated in 10.9
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+//available from 10.6, deprecated in 10.9
base64String = [raw_data base64Encoding];
+#pragma clang diagnostic pop
}
[uri setPath:[NSString stringWithFormat:@"%@;base64,%@", content_type, base64String]];

0 comments on commit 18f7861

Please sign in to comment.