From e3f0a277f98704431b729cd5ec9ff028e17285a9 Mon Sep 17 00:00:00 2001 From: Frieder Bluemle Date: Fri, 23 Aug 2019 14:12:04 -0700 Subject: [PATCH 1/3] Fix whitespace errors --- android/build.gradle | 4 ++-- ios/Brushes/RNSVGPainter.m | 1 - ios/Elements/RNSVGDefs.m | 1 - ios/Elements/RNSVGLinearGradient.m | 17 +++++++------ ios/Elements/RNSVGMarker.m | 1 - ios/Elements/RNSVGMask.m | 13 +++++----- ios/Elements/RNSVGPattern.m | 29 +++++++++++------------ ios/Elements/RNSVGRadialGradient.m | 21 ++++++++-------- ios/Elements/RNSVGSymbol.m | 17 +++++++------ ios/Elements/RNSVGUse.m | 7 +++--- ios/Shapes/RNSVGCircle.h | 1 - ios/Shapes/RNSVGLine.m | 2 +- ios/Text/RNSVGTextProperties.h | 2 +- ios/Utils/RCTConvert+RNSVG.m | 1 - ios/Utils/RNSVGBezierElement.h | 1 - ios/Utils/RNSVGBezierElement.m | 1 - ios/Utils/RNSVGCGFCRule.h | 2 +- ios/Utils/RNSVGPathParser.m | 1 - ios/ViewManagers/RNSVGMarkerManager.m | 1 - ios/ViewManagers/RNSVGRenderableManager.m | 2 -- 20 files changed, 54 insertions(+), 71 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 89bcf4162..d7195df41 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.safeExtGet = {prop, fallback -> rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback } - + // The Android Gradle plugin is only required when opening the android folder stand-alone. // This avoids unnecessary downloads and potential conflicts when the library is included as a // module dependency in an application project. @@ -11,7 +11,7 @@ buildscript { google() jcenter() } - + dependencies { //noinspection GradleDependency classpath("com.android.tools.build:gradle:3.5.1") diff --git a/ios/Brushes/RNSVGPainter.m b/ios/Brushes/RNSVGPainter.m index e37064e53..b47bc3d63 100644 --- a/ios/Brushes/RNSVGPainter.m +++ b/ios/Brushes/RNSVGPainter.m @@ -247,4 +247,3 @@ - (void)paintRadialGradient:(CGContextRef)context bounds:(CGRect)bounds } @end - diff --git a/ios/Elements/RNSVGDefs.m b/ios/Elements/RNSVGDefs.m index 1e32b2eb6..c119a7fcf 100644 --- a/ios/Elements/RNSVGDefs.m +++ b/ios/Elements/RNSVGDefs.m @@ -33,4 +33,3 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event } @end - diff --git a/ios/Elements/RNSVGLinearGradient.m b/ios/Elements/RNSVGLinearGradient.m index da712fe13..3bdec6060 100644 --- a/ios/Elements/RNSVGLinearGradient.m +++ b/ios/Elements/RNSVGLinearGradient.m @@ -17,7 +17,7 @@ - (void)setX1:(RNSVGLength *)x1 if ([x1 isEqualTo:_x1]) { return; } - + _x1 = x1; [self invalidate]; } @@ -27,7 +27,7 @@ - (void)setY1:(RNSVGLength *)y1 if ([y1 isEqualTo:_y1]) { return; } - + _y1 = y1; [self invalidate]; } @@ -37,7 +37,7 @@ - (void)setX2:(RNSVGLength *)x2 if ([x2 isEqualTo:_x2]) { return; } - + _x2 = x2; [self invalidate]; } @@ -47,7 +47,7 @@ - (void)setY2:(RNSVGLength *)y2 if ([y2 isEqualTo:_y2]) { return; } - + _y2 = y2; [self invalidate]; } @@ -57,7 +57,7 @@ - (void)setGradient:(NSArray *)gradient if (gradient == _gradient) { return; } - + _gradient = gradient; [self invalidate]; } @@ -67,7 +67,7 @@ - (void)setGradientUnits:(RNSVGUnits)gradientUnits if (gradientUnits == _gradientUnits) { return; } - + _gradientUnits = gradientUnits; [self invalidate]; } @@ -91,12 +91,11 @@ - (void)parseReference [painter setUnits:self.gradientUnits]; [painter setTransform:self.gradientTransform]; [painter setLinearGradientColors:self.gradient]; - + if (self.gradientUnits == kRNSVGUnitsUserSpaceOnUse) { [painter setUserSpaceBoundingBox:[self.svgView getContextBounds]]; } - + [self.svgView definePainter:painter painterName:self.name]; } @end - diff --git a/ios/Elements/RNSVGMarker.m b/ios/Elements/RNSVGMarker.m index c7b38cabf..86e4c2b96 100644 --- a/ios/Elements/RNSVGMarker.m +++ b/ios/Elements/RNSVGMarker.m @@ -197,4 +197,3 @@ - (void)renderMarker:(CGContextRef)context rect:(CGRect)rect position:(RNSVGMark } @end - diff --git a/ios/Elements/RNSVGMask.m b/ios/Elements/RNSVGMask.m index 021d0b88e..170bacc15 100644 --- a/ios/Elements/RNSVGMask.m +++ b/ios/Elements/RNSVGMask.m @@ -28,7 +28,7 @@ - (void)setX:(RNSVGLength *)x if ([x isEqualTo:_x]) { return; } - + _x = x; [self invalidate]; } @@ -38,7 +38,7 @@ - (void)setY:(RNSVGLength *)y if ([y isEqualTo:_y]) { return; } - + _y = y; [self invalidate]; } @@ -48,7 +48,7 @@ - (void)setMaskwidth:(RNSVGLength *)maskwidth if ([maskwidth isEqualTo:_maskwidth]) { return; } - + _maskwidth = maskwidth; [self invalidate]; } @@ -58,7 +58,7 @@ - (void)setMaskheight:(RNSVGLength *)maskheight if ([maskheight isEqualTo:_maskheight]) { return; } - + _maskheight = maskheight; [self invalidate]; } @@ -68,7 +68,7 @@ - (void)setMaskUnits:(RNSVGUnits)maskUnits if (maskUnits == _maskUnits) { return; } - + _maskUnits = maskUnits; [self invalidate]; } @@ -78,7 +78,7 @@ - (void)setMaskContentUnits:(RNSVGUnits)maskContentUnits if (maskContentUnits == _maskContentUnits) { return; } - + _maskContentUnits = maskContentUnits; [self invalidate]; } @@ -90,4 +90,3 @@ - (void)setMaskTransform:(CGAffineTransform)maskTransform } @end - diff --git a/ios/Elements/RNSVGPattern.m b/ios/Elements/RNSVGPattern.m index 90c3eea20..f5e2c5ffc 100644 --- a/ios/Elements/RNSVGPattern.m +++ b/ios/Elements/RNSVGPattern.m @@ -26,11 +26,11 @@ - (void)parseReference [painter setContentUnits:self.patternContentUnits]; [painter setTransform:self.patternTransform]; [painter setPattern:self]; - + if (self.patternUnits == kRNSVGUnitsUserSpaceOnUse || self.patternContentUnits == kRNSVGUnitsUserSpaceOnUse) { [painter setUserSpaceBoundingBox:[self.svgView getContextBounds]]; } - + [self.svgView definePainter:painter painterName:self.name]; } @@ -39,7 +39,7 @@ - (void)setX:(RNSVGLength *)x if ([x isEqualTo:_x]) { return; } - + _x = x; [self invalidate]; } @@ -49,7 +49,7 @@ - (void)setY:(RNSVGLength *)y if ([y isEqualTo:_y]) { return; } - + _y = y; [self invalidate]; } @@ -59,7 +59,7 @@ - (void)setPatternwidth:(RNSVGLength *)patternwidth if ([patternwidth isEqualTo:_patternwidth]) { return; } - + _patternwidth = patternwidth; [self invalidate]; } @@ -69,7 +69,7 @@ - (void)setPatternheight:(RNSVGLength *)patternheight if ([patternheight isEqualTo:_patternheight]) { return; } - + _patternheight = patternheight; [self invalidate]; } @@ -79,7 +79,7 @@ - (void)setPatternUnits:(RNSVGUnits)patternUnits if (patternUnits == _patternUnits) { return; } - + _patternUnits = patternUnits; [self invalidate]; } @@ -89,7 +89,7 @@ - (void)setPatternContentUnits:(RNSVGUnits)patternContentUnits if (patternContentUnits == _patternContentUnits) { return; } - + _patternContentUnits = patternContentUnits; [self invalidate]; } @@ -105,7 +105,7 @@ - (void)setMinX:(CGFloat)minX if (minX == _minX) { return; } - + [self invalidate]; _minX = minX; } @@ -115,7 +115,7 @@ - (void)setMinY:(CGFloat)minY if (minY == _minY) { return; } - + [self invalidate]; _minY = minY; } @@ -125,7 +125,7 @@ - (void)setVbWidth:(CGFloat)vbWidth if (vbWidth == _vbWidth) { return; } - + [self invalidate]; _vbWidth = vbWidth; } @@ -135,7 +135,7 @@ - (void)setVbHeight:(CGFloat)vbHeight if (_vbHeight == vbHeight) { return; } - + [self invalidate]; _vbHeight = vbHeight; } @@ -145,7 +145,7 @@ - (void)setAlign:(NSString *)align if ([align isEqualToString:_align]) { return; } - + [self invalidate]; _align = align; } @@ -155,10 +155,9 @@ - (void)setMeetOrSlice:(RNSVGVBMOS)meetOrSlice if (meetOrSlice == _meetOrSlice) { return; } - + [self invalidate]; _meetOrSlice = meetOrSlice; } @end - diff --git a/ios/Elements/RNSVGRadialGradient.m b/ios/Elements/RNSVGRadialGradient.m index ab9f3545b..a65319a4a 100644 --- a/ios/Elements/RNSVGRadialGradient.m +++ b/ios/Elements/RNSVGRadialGradient.m @@ -14,7 +14,7 @@ - (void)setFx:(RNSVGLength *)fx if ([fx isEqualTo:_fx]) { return; } - + _fx = fx; [self invalidate]; } @@ -24,7 +24,7 @@ - (void)setFy:(RNSVGLength *)fy if ([fy isEqualTo:_fy]) { return; } - + _fy = fy; [self invalidate]; } @@ -34,7 +34,7 @@ - (void)setRx:(RNSVGLength *)rx if ([rx isEqualTo:_rx]) { return; } - + _rx = rx; [self invalidate]; } @@ -44,7 +44,7 @@ - (void)setRy:(RNSVGLength *)ry if ([ry isEqualTo:_ry]) { return; } - + _ry = ry; [self invalidate]; } @@ -54,7 +54,7 @@ - (void)setCx:(RNSVGLength *)cx if ([cx isEqualTo:_cx]) { return; } - + _cx = cx; [self invalidate]; } @@ -64,7 +64,7 @@ - (void)setCy:(RNSVGLength *)cy if ([cy isEqualTo:_cy]) { return; } - + _cy = cy; [self invalidate]; } @@ -74,7 +74,7 @@ - (void)setGradient:(NSArray *)gradient if (gradient == _gradient) { return; } - + _gradient = gradient; [self invalidate]; } @@ -84,7 +84,7 @@ - (void)setGradientUnits:(RNSVGUnits)gradientUnits if (gradientUnits == _gradientUnits) { return; } - + _gradientUnits = gradientUnits; [self invalidate]; } @@ -108,13 +108,12 @@ - (void)parseReference [painter setUnits:self.gradientUnits]; [painter setTransform:self.gradientTransform]; [painter setRadialGradientColors:self.gradient]; - + if (self.gradientUnits == kRNSVGUnitsUserSpaceOnUse) { [painter setUserSpaceBoundingBox:[self.svgView getContextBounds]]; } - + [self.svgView definePainter:painter painterName:self.name]; } @end - diff --git a/ios/Elements/RNSVGSymbol.m b/ios/Elements/RNSVGSymbol.m index 615718b65..9d0fe5c9b 100644 --- a/ios/Elements/RNSVGSymbol.m +++ b/ios/Elements/RNSVGSymbol.m @@ -17,7 +17,7 @@ - (void)setMinX:(CGFloat)minX if (minX == _minX) { return; } - + [self invalidate]; _minX = minX; } @@ -27,7 +27,7 @@ - (void)setMinY:(CGFloat)minY if (minY == _minY) { return; } - + [self invalidate]; _minY = minY; } @@ -37,7 +37,7 @@ - (void)setVbWidth:(CGFloat)vbWidth if (vbWidth == _vbWidth) { return; } - + [self invalidate]; _vbWidth = vbWidth; } @@ -47,7 +47,7 @@ - (void)setVbHeight:(CGFloat)vbHeight if (_vbHeight == vbHeight) { return; } - + [self invalidate]; _vbHeight = vbHeight; } @@ -57,7 +57,7 @@ - (void)setAlign:(NSString *)align if ([align isEqualToString:_align]) { return; } - + [self invalidate]; _align = align; } @@ -67,7 +67,7 @@ - (void)setMeetOrSlice:(RNSVGVBMOS)meetOrSlice if (meetOrSlice == _meetOrSlice) { return; } - + [self invalidate]; _meetOrSlice = meetOrSlice; } @@ -82,16 +82,15 @@ - (void)renderSymbolTo:(CGContextRef)context width:(CGFloat)width height:(CGFloa { CGRect eRect = CGRectMake(0, 0, width, height); if (self.align) { - + CGAffineTransform viewBoxTransform = [RNSVGViewBox getTransform:CGRectMake(self.minX, self.minY, self.vbWidth, self.vbHeight) eRect:eRect align:self.align meetOrSlice:self.meetOrSlice]; - + CGContextConcatCTM(context, viewBoxTransform); } [self renderGroupTo:context rect:eRect]; } @end - diff --git a/ios/Elements/RNSVGUse.m b/ios/Elements/RNSVGUse.m index dc735f1d8..bfad5715f 100644 --- a/ios/Elements/RNSVGUse.m +++ b/ios/Elements/RNSVGUse.m @@ -95,13 +95,13 @@ - (void)renderLayerTo:(CGContextRef)context rect:(CGRect)rect } CGRect bounds = template.clientRect; self.clientRect = bounds; - + CGAffineTransform current = CGContextGetCTM(context); CGAffineTransform svgToClientTransform = CGAffineTransformConcat(current, self.svgView.invInitialCTM); - + self.ctm = svgToClientTransform; self.screenCTM = current; - + CGAffineTransform transform = CGAffineTransformConcat(self.matrix, self.transforms); CGPoint mid = CGPointMake(CGRectGetMidX(bounds), CGRectGetMidY(bounds)); CGPoint center = CGPointApplyAffineTransform(mid, transform); @@ -142,4 +142,3 @@ - (CGPathRef)getPath: (CGContextRef)context } @end - diff --git a/ios/Shapes/RNSVGCircle.h b/ios/Shapes/RNSVGCircle.h index f4e411a8a..7567626cb 100644 --- a/ios/Shapes/RNSVGCircle.h +++ b/ios/Shapes/RNSVGCircle.h @@ -17,4 +17,3 @@ @property (nonatomic, strong) RNSVGLength* r; @end - diff --git a/ios/Shapes/RNSVGLine.m b/ios/Shapes/RNSVGLine.m index a9a14785e..62705c43e 100644 --- a/ios/Shapes/RNSVGLine.m +++ b/ios/Shapes/RNSVGLine.m @@ -56,7 +56,7 @@ - (CGPathRef)getPath:(CGContextRef)context CGFloat y2 = [self relativeOnHeight:self.y2]; CGPathMoveToPoint(path, nil, x1, y1); CGPathAddLineToPoint(path, nil, x2, y2); - + return (CGPathRef)CFAutorelease(path); } diff --git a/ios/Text/RNSVGTextProperties.h b/ios/Text/RNSVGTextProperties.h index 527ce3fba..3d2343f0a 100644 --- a/ios/Text/RNSVGTextProperties.h +++ b/ios/Text/RNSVGTextProperties.h @@ -17,7 +17,7 @@ typedef NS_ENUM(NSInteger, RNSVGAlignmentBaseline) { RNSVGAlignmentBaselineTop, /* SVG implementations may support the following aliases in order to support legacy content: - + text-before-edge = text-top text-after-edge = text-bottom */ diff --git a/ios/Utils/RCTConvert+RNSVG.m b/ios/Utils/RCTConvert+RNSVG.m index 94ef7eb8f..2ffdb7c2e 100644 --- a/ios/Utils/RCTConvert+RNSVG.m +++ b/ios/Utils/RCTConvert+RNSVG.m @@ -181,4 +181,3 @@ + (CGGradientRef)RNSVGCGGradient:(id)json } @end - diff --git a/ios/Utils/RNSVGBezierElement.h b/ios/Utils/RNSVGBezierElement.h index eefbbf183..2c929262a 100644 --- a/ios/Utils/RNSVGBezierElement.h +++ b/ios/Utils/RNSVGBezierElement.h @@ -22,4 +22,3 @@ + (NSArray *) elementsFromCGPath:(CGPathRef)path; @end - diff --git a/ios/Utils/RNSVGBezierElement.m b/ios/Utils/RNSVGBezierElement.m index b79c3bec7..427904d52 100644 --- a/ios/Utils/RNSVGBezierElement.m +++ b/ios/Utils/RNSVGBezierElement.m @@ -74,4 +74,3 @@ + (NSArray *) elementsFromCGPath:(CGPathRef)path } @end - diff --git a/ios/Utils/RNSVGCGFCRule.h b/ios/Utils/RNSVGCGFCRule.h index 160b0ef34..717100c06 100644 --- a/ios/Utils/RNSVGCGFCRule.h +++ b/ios/Utils/RNSVGCGFCRule.h @@ -9,4 +9,4 @@ typedef CF_ENUM(int32_t, RNSVGCGFCRule) { kRNSVGCGFCRuleEvenodd, kRNSVGCGFCRuleNonzero -}; \ No newline at end of file +}; diff --git a/ios/Utils/RNSVGPathParser.m b/ios/Utils/RNSVGPathParser.m index 56a472cad..b2a8334a0 100644 --- a/ios/Utils/RNSVGPathParser.m +++ b/ios/Utils/RNSVGPathParser.m @@ -592,4 +592,3 @@ - (void)skip_digits { } @end - diff --git a/ios/ViewManagers/RNSVGMarkerManager.m b/ios/ViewManagers/RNSVGMarkerManager.m index 00b762278..b10b6c8f7 100644 --- a/ios/ViewManagers/RNSVGMarkerManager.m +++ b/ios/ViewManagers/RNSVGMarkerManager.m @@ -33,4 +33,3 @@ - (RNSVGMarker *)node RCT_EXPORT_VIEW_PROPERTY(meetOrSlice, RNSVGVBMOS) @end - diff --git a/ios/ViewManagers/RNSVGRenderableManager.m b/ios/ViewManagers/RNSVGRenderableManager.m index fee4ade23..ee203fe22 100644 --- a/ios/ViewManagers/RNSVGRenderableManager.m +++ b/ios/ViewManagers/RNSVGRenderableManager.m @@ -240,5 +240,3 @@ - (RNSVGRenderable *)node } @end - - From b0278ad9074e640ca33fddebda36f54b4fb98987 Mon Sep 17 00:00:00 2001 From: Frieder Bluemle Date: Tue, 1 Oct 2019 10:03:29 -0700 Subject: [PATCH 2/3] Remove Eclipse project files and gradlew leftover --- android/.classpath | 6 - android/.project | 23 --- .../org.eclipse.buildship.core.prefs | 2 - android/gradlew | 160 ------------------ android/gradlew.bat | 90 ---------- 5 files changed, 281 deletions(-) delete mode 100644 android/.classpath delete mode 100644 android/.project delete mode 100644 android/.settings/org.eclipse.buildship.core.prefs delete mode 100644 android/gradlew delete mode 100644 android/gradlew.bat diff --git a/android/.classpath b/android/.classpath deleted file mode 100644 index eb19361b5..000000000 --- a/android/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/android/.project b/android/.project deleted file mode 100644 index 3865e0fa4..000000000 --- a/android/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - android - Project android created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index e8895216f..000000000 --- a/android/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir= -eclipse.preferences.version=1 diff --git a/android/gradlew b/android/gradlew deleted file mode 100644 index 9d82f7891..000000000 --- a/android/gradlew +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat deleted file mode 100644 index 8a0b282aa..000000000 --- a/android/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega From d05eecbcc1dd11a9ec5794439d1850d75ccc49a9 Mon Sep 17 00:00:00 2001 From: Frieder Bluemle Date: Tue, 5 Nov 2019 14:08:44 -0800 Subject: [PATCH 3/3] Update .gitignore --- .gitattributes | 18 +----------------- .gitignore | 33 +++++++++++++++++++-------------- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/.gitattributes b/.gitattributes index bdb0cabc8..d42ff1835 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,17 +1 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain +*.pbxproj -text diff --git a/.gitignore b/.gitignore index 85eee6846..dc12c07e2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ # Xcode # +build/ *.pbxuser !default.pbxuser *.mode1v3 @@ -18,36 +19,40 @@ xcuserdata DerivedData *.hmap *.ipa -gradle -project.xcworkspace +*.xcuserstate -# Android/IJ +# Android/IntelliJ # +build/ .idea .gradle local.properties -build +*.iml +*.keystore +!debug.keystore +android/gradle/ +android/gradlew +android/gradlew.bat # node.js # -node_modules +node_modules/ npm-debug.log +yarn-error.log +# CocoaPods +/ios/Pods/ -# webstorm -# -*.iml - -# unfinished documents -# +# Other cn-doc.md - -# experimental code -# experimental/ +# Generated /lib/ /flow-typed/ # VS Code .vscode/ +.classpath +.project +.settings/