make iOS 10.3 and Xcode 8.3 compatible (#345)

recompile SvgGh library with new code singature needed by iOS 10.3
This commit is contained in:
Andre Höpfner 2017-04-08 19:32:18 +02:00 committed by Emux
parent e1d17321c6
commit f0639972b4
10 changed files with 435 additions and 11 deletions

View File

@ -1,9 +1,10 @@
buildscript {
repositories {
jcenter()
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}
dependencies {
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0'
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1-SNAPSHOT'
}
}

View File

@ -1,9 +1,10 @@
buildscript {
repositories {
jcenter()
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}
dependencies {
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0'
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1-SNAPSHOT'
}
}

Binary file not shown.

View File

@ -195,7 +195,7 @@ typedef NSUInteger ColorScheme;
+(CGPathRef) newRoundRectPathForRect:(CGRect)aRect withRadius:(CGFloat) radius CF_RETURNS_RETAINED;
/*! @brief utility routine to find the location of an SVG document relative to a provided bundle
* @param an optional bundle containing the artwork
* @param mayBeNil optional bundle containing the artwork
* @param theArtworkPath subpath within a bundle does not include the .svg extension which is assumed.
*/
+(nullable NSURL*) locateArtworkForBundle:(nullable NSBundle*)mayBeNil atSubpath:(NSString*)theArtworkPath;
@ -207,8 +207,7 @@ typedef NSUInteger ColorScheme;
+(nullable NSURL*) locateArtworkForObject:(id<NSObject>)anObject atSubpath:(NSString*)theArtworkPath; // for compatibility
/*! @brief utility routine to locate a URL inside your project when using Interface Builder's IB_DESIGNABLE service
* @param anObject for instance a GHButton
* @param theArtworkPath subpath within a bundle does not include the .svg extension which is assumed.
* @param artworkSubPath subpath within a bundle does not include the .svg extension which is assumed.
*/
+(nullable NSURL*) findInterfaceBuilderArtwork:(NSString*)artworkSubPath;

View File

@ -75,6 +75,17 @@ NS_ASSUME_NONNULL_BEGIN
/*! @brief the value for 'currentColor' at this moment in the process of visiting a document
*/
-(nullable UIColor*) currentColor;
/*! @brief the value for 'opacity' at this moment in the process of visiting a document
*/
-(CGFloat) opacity;
/*! @brief opacity is dependent (via inheritence) as you descend an SVG Document. This opacity is the place to keep track of updated opacity.
* @param the current opacity (defaults to 1.0)
*/
-(void) setOpacity:(CGFloat)opacity;
/*! @brief the active language expected by the user like 'en' or 'sp' or 'zh'
*/
-(nullable NSString*) isoLanguage;
@ -89,7 +100,7 @@ NS_ASSUME_NONNULL_BEGIN
/*! @brief Look through the CSS attributes for a given styling attribute.
* @param attributeName the name of the attribute like 'line-width'
* @param className the name of the CSS class like 'background' or some other arbitrary item
* @param listOfClasses the name of the CSS class like 'background' or some other arbitrary item
* @param entityName the name of the entity like 'rect' or 'polyline'
*/
-(nullable NSString*) attributeNamed:(NSString*)attributeName classes:(nullable NSArray<NSString*>*)listOfClasses entityName:(nullable NSString*)entityName;

View File

@ -68,8 +68,8 @@ IB_DESIGNABLE // Cocapods users should add the use_frameworks! directive if this
@interface SVGDocumentView : UIView
/*! @property artworkPath
* @brief the text contents of an SVG document can be accessed via 'User Defined RuntimeAttributes'
*/
* @brief the text contents of an SVG document can be accessed via 'User Defined RuntimeAttributes'. If you are using a .svgz file, include the file extension in the path.
*/
@property(nonatomic, strong) IBInspectable NSString* __nullable artworkPath;
/*! @property defaultColor

View File

@ -42,12 +42,18 @@ NS_ASSUME_NONNULL_BEGIN
@property(strong, nonatomic, readonly) NSURL* __nullable svgURL;
/*! @brief init method which takes a URL reference to a .svg file
* @param url a reference to a standard .svg file
* @param url a reference to a standard .svg or .svgz file
*/
-(instancetype)initWithContentsOfURL:(NSURL *)url;
/*! @brief init method which takes a input stream from a SVG source
* @param inputStream a reference to a standard .svg or .svgz file
*/
-(instancetype)initWithInputStream:(NSInputStream *)inputStream;
/*! @brief init method which the name of a resource based SVG
* @param a string giving the name of the resource
* @param resourceName string giving the name of the resource. This may include a file extension, if ommitted `svg` will be used.
* @param bundle optional bundle to look in
* @commment might be from XCAsset data
*/
-(nullable instancetype) initWithResourceName:(NSString*)resourceName inBundle:(nullable NSBundle*)bundle;
@ -66,7 +72,7 @@ NS_ASSUME_NONNULL_BEGIN
/*! @brief not allowing a standard init method
*/
-(nullable instancetype) init __attribute__((unavailable("init not available")));
-(instancetype) init __attribute__((unavailable("init not available")));
/*! @brief method to create a URL relative to the URL used to create this object (assuming use of a URL to create it)
* @param subPath relative path to this parser's svgURL

View File

@ -0,0 +1,406 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>files</key>
<dict>
<key>Headers/GHButton.h</key>
<data>
Yo70QMvylnV/tGNngg/dxwCC+Es=
</data>
<key>Headers/GHCSSStyle.h</key>
<data>
/KLi1TX1SrM6jopjQQBiHZm78/o=
</data>
<key>Headers/GHControl.h</key>
<data>
p3mMe9yH8rJD8Wm20c3Jd8lxCME=
</data>
<key>Headers/GHControlFactory.h</key>
<data>
a7H0B3wnhh76HiQKYHA2jGl6tk4=
</data>
<key>Headers/GHImageCache.h</key>
<data>
L3yqnld65EyxF+ZVm7agQKAwg08=
</data>
<key>Headers/GHRenderable.h</key>
<data>
k5uJ1lR+jjohQboiKl361vlWrPU=
</data>
<key>Headers/GHSegmentedControl.h</key>
<data>
102VOHKDPJ/8BdnCba45Ido3ES0=
</data>
<key>Headers/SVGContext.h</key>
<data>
fYKblLtFBEOZBWKITmzeqxkB3wA=
</data>
<key>Headers/SVGDocumentView.h</key>
<data>
rQdMJag3XRMM0BrzxhBRVDCkECI=
</data>
<key>Headers/SVGParser.h</key>
<data>
kTsoaz1ZJ15TgzKXvxTFxWzjdOM=
</data>
<key>Headers/SVGPathGenerator.h</key>
<data>
mpIHrojH98DFrfoA1ur9U5rUUGE=
</data>
<key>Headers/SVGPrinter.h</key>
<data>
8TpTqQL/mSb4Ja8jrSy9CYsrps8=
</data>
<key>Headers/SVGRenderer.h</key>
<data>
aVwIN13G4/FxE5oBMAhhVBzpuvk=
</data>
<key>Headers/SVGRendererLayer.h</key>
<data>
NYdrKdLUEhBB1Q1faRR/VkukMMY=
</data>
<key>Headers/SVGTabBarItem.h</key>
<data>
T6N+3S6IK3TPlToQWW/8fbYToao=
</data>
<key>Headers/SVGgh.h</key>
<data>
FhA5aS1gL+U2oztDy+ZAYAMbsQY=
</data>
<key>Headers/SVGghLoader.h</key>
<data>
xtYyyVEweMoAbmxnHJ3OLrTpB+c=
</data>
<key>Headers/SVGtoPDFConverter.h</key>
<data>
PYmLqlyOd/ZpkVp082ncU6Hhr08=
</data>
<key>Info.plist</key>
<data>
Ekf8hDNYwrf/YAzxlZyyfB58pCE=
</data>
<key>Modules/module.modulemap</key>
<data>
OvyNeJvLF4DKiaZWfAOhFhapEM8=
</data>
</dict>
<key>files2</key>
<dict>
<key>Headers/GHButton.h</key>
<dict>
<key>hash</key>
<data>
Yo70QMvylnV/tGNngg/dxwCC+Es=
</data>
<key>hash2</key>
<data>
e02JL9wz0/bvHZu9Mh0GvmUPm/1CWWkp6AM6AXjTWvw=
</data>
</dict>
<key>Headers/GHCSSStyle.h</key>
<dict>
<key>hash</key>
<data>
/KLi1TX1SrM6jopjQQBiHZm78/o=
</data>
<key>hash2</key>
<data>
ThA3cD29qgXA7zxdYA4DdFwDV9Lz51HLEmPYwrSSGkQ=
</data>
</dict>
<key>Headers/GHControl.h</key>
<dict>
<key>hash</key>
<data>
p3mMe9yH8rJD8Wm20c3Jd8lxCME=
</data>
<key>hash2</key>
<data>
wP2cK5Oo1eQAvri8ETIEqUTNmg0lmJ+rARoPs2DdPYQ=
</data>
</dict>
<key>Headers/GHControlFactory.h</key>
<dict>
<key>hash</key>
<data>
a7H0B3wnhh76HiQKYHA2jGl6tk4=
</data>
<key>hash2</key>
<data>
55SvszA5H4fH9r5fJfkP2hsGBUHP3dgUWeGzTgaqVM0=
</data>
</dict>
<key>Headers/GHImageCache.h</key>
<dict>
<key>hash</key>
<data>
L3yqnld65EyxF+ZVm7agQKAwg08=
</data>
<key>hash2</key>
<data>
VjCYQ2OKSb5dgzejm1ykbJV99xz0zM0GdYNrBZ36gp4=
</data>
</dict>
<key>Headers/GHRenderable.h</key>
<dict>
<key>hash</key>
<data>
k5uJ1lR+jjohQboiKl361vlWrPU=
</data>
<key>hash2</key>
<data>
3b3LzhL3i3jVdQDNj2x7O8t9hNnghbkWUhoXw6JWQJQ=
</data>
</dict>
<key>Headers/GHSegmentedControl.h</key>
<dict>
<key>hash</key>
<data>
102VOHKDPJ/8BdnCba45Ido3ES0=
</data>
<key>hash2</key>
<data>
zNsVaFFe63wL2AaCOhdJ+FzacSKT7fgxQ9K6TMLGL7w=
</data>
</dict>
<key>Headers/SVGContext.h</key>
<dict>
<key>hash</key>
<data>
fYKblLtFBEOZBWKITmzeqxkB3wA=
</data>
<key>hash2</key>
<data>
7BISlxYEV6x9kQFS15ufHja8Q+26HD5NjXYaTDJyIEI=
</data>
</dict>
<key>Headers/SVGDocumentView.h</key>
<dict>
<key>hash</key>
<data>
rQdMJag3XRMM0BrzxhBRVDCkECI=
</data>
<key>hash2</key>
<data>
uq16udgICqUPRBxMJr1B1C0sijIlFLtPhngwJeqRntE=
</data>
</dict>
<key>Headers/SVGParser.h</key>
<dict>
<key>hash</key>
<data>
kTsoaz1ZJ15TgzKXvxTFxWzjdOM=
</data>
<key>hash2</key>
<data>
nL9jnqsL5GmWqqjE8CTk0VM9ysXla1JmKXUhoc9zJew=
</data>
</dict>
<key>Headers/SVGPathGenerator.h</key>
<dict>
<key>hash</key>
<data>
mpIHrojH98DFrfoA1ur9U5rUUGE=
</data>
<key>hash2</key>
<data>
aCtFKiBFUHUMLTLS9KnMVfuz/JBhq/huj2tIXKT/t6g=
</data>
</dict>
<key>Headers/SVGPrinter.h</key>
<dict>
<key>hash</key>
<data>
8TpTqQL/mSb4Ja8jrSy9CYsrps8=
</data>
<key>hash2</key>
<data>
WZ3fWe7ZgJl6A8hKCphqIzD7fCdUsYsqi6ju4DSyvmQ=
</data>
</dict>
<key>Headers/SVGRenderer.h</key>
<dict>
<key>hash</key>
<data>
aVwIN13G4/FxE5oBMAhhVBzpuvk=
</data>
<key>hash2</key>
<data>
1FPgcUwZeZO91+/cpZg2gIHqAb+cOO9n9AcoIDu71QY=
</data>
</dict>
<key>Headers/SVGRendererLayer.h</key>
<dict>
<key>hash</key>
<data>
NYdrKdLUEhBB1Q1faRR/VkukMMY=
</data>
<key>hash2</key>
<data>
4vLnO1fPqCOatqPuYa+wsiksl1d21S7E2eXzVKeH0mQ=
</data>
</dict>
<key>Headers/SVGTabBarItem.h</key>
<dict>
<key>hash</key>
<data>
T6N+3S6IK3TPlToQWW/8fbYToao=
</data>
<key>hash2</key>
<data>
FZKHWXa9wHb65sGsLAgVbX/IHlqu7zP4Jc4C6Fz71k0=
</data>
</dict>
<key>Headers/SVGgh.h</key>
<dict>
<key>hash</key>
<data>
FhA5aS1gL+U2oztDy+ZAYAMbsQY=
</data>
<key>hash2</key>
<data>
K7FvEVgrwXFf8fYXUC1Z28mYShSPC2GIrNE0Q4jvPMs=
</data>
</dict>
<key>Headers/SVGghLoader.h</key>
<dict>
<key>hash</key>
<data>
xtYyyVEweMoAbmxnHJ3OLrTpB+c=
</data>
<key>hash2</key>
<data>
eAmiKTkaGKhWeYrt4GzqMyXKWxvpJSrJe0aowwF858w=
</data>
</dict>
<key>Headers/SVGtoPDFConverter.h</key>
<dict>
<key>hash</key>
<data>
PYmLqlyOd/ZpkVp082ncU6Hhr08=
</data>
<key>hash2</key>
<data>
aPPmosLWJKuzNygim1G+NZNMbZ67Jndy3J7vneUEeqQ=
</data>
</dict>
<key>Modules/module.modulemap</key>
<dict>
<key>hash</key>
<data>
OvyNeJvLF4DKiaZWfAOhFhapEM8=
</data>
<key>hash2</key>
<data>
CmWiPcMFYwuE9f+Q49hr18AoV6Ol0PT3grO8cewWpnc=
</data>
</dict>
</dict>
<key>rules</key>
<dict>
<key>^</key>
<true/>
<key>^.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^version.plist$</key>
<true/>
</dict>
<key>rules2</key>
<dict>
<key>.*\.dSYM($|/)</key>
<dict>
<key>weight</key>
<real>11</real>
</dict>
<key>^</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^(.*/)?\.DS_Store$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>2000</real>
</dict>
<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^.*</key>
<true/>
<key>^.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^Info\.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^PkgInfo$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^[^/]+$</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^embedded\.provisionprofile$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^version\.plist$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
</dict>
</dict>
</plist>