update example`s react-naitve version to 0.31.0

Example/android/app/BUCK

@@ -5,7 +5,7 @@ import re
 # - install Buck
 # - `npm start` - to start the packager
 # - `cd android`
-# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US`
+# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
 # - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
 # - `buck install -r android/app` - compile, install and run application
 #
@@ -46,13 +46,13 @@ android_library(
 
 android_build_config(
   name = 'build_config',
-  package = 'com.artsvgexample',
+  package = 'com.svgexample',
 )
 
 android_resource(
   name = 'res',
   res = 'src/main/res',
-  package = 'com.artsvgexample',
+  package = 'com.svgexample',
 )
 
 android_binary(

Example/android/app/build.gradle

@@ -55,7 +55,13 @@ import com.android.build.OutputFile
  *   // date; if you have any other folders that you want to ignore for performance reasons (gradle
  *   // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
  *   // for example, you might want to remove it from here.
- *   inputExcludes: ["android/**", "ios/**"]
+ *   inputExcludes: ["android/**", "ios/**"],
+ *
+ *   // override which node gets called and with what additional arguments
+ *   nodeExecutableAndArgs: ["node"]
+ *
+ *   // supply additional arguments to the packager
+ *   extraPackagerArgs: []
  * ]
  */
 
@@ -81,7 +87,7 @@ android {
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        applicationId "com.artsvgexample"
+        applicationId "com.svgexample"
         minSdkVersion 16
         targetSdkVersion 22
         versionCode 1

Example/android/app/proguard-rules.pro

@@ -26,11 +26,14 @@
 # See http://sourceforge.net/p/proguard/bugs/466/
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
+-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
 
 # Do not strip any method/class that is annotated with @DoNotStrip
 -keep @com.facebook.proguard.annotations.DoNotStrip class *
+-keep @com.facebook.common.internal.DoNotStrip class *
 -keepclassmembers class * {
     @com.facebook.proguard.annotations.DoNotStrip *;
+    @com.facebook.common.internal.DoNotStrip *;
 }
 
 -keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
@@ -51,9 +54,9 @@
 
 -keepattributes Signature
 -keepattributes *Annotation*
--keep class com.squareup.okhttp.** { *; }
+-keep class okhttp3.** { *; }
--keep interface com.squareup.okhttp.** { *; }
+-keep interface okhttp3.** { *; }
--dontwarn com.squareup.okhttp.**
+-dontwarn okhttp3.**
 
 # okio
 

Example/android/app/src/main/AndroidManifest.xml

@@ -1,14 +1,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.artsvgexample">
+    package="com.svgexample">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".MainApplication"
       android:allowBackup="true"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
-        android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme"
+      android:name=".MainApplication">
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"

Example/android/app/src/main/java/com/artsvgexample/MainApplication.java

@@ -1,36 +0,0 @@
-package com.artsvgexample;
-
-import android.app.Application;
-import android.util.Log;
-import com.horcrux.svg.RNSvgPackage;
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.shell.MainReactPackage;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class MainApplication extends Application implements ReactApplication {
-
-    private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
-        @Override
-        protected boolean getUseDeveloperSupport() {
-            return BuildConfig.DEBUG;
-        }
-
-        @Override
-        protected List<ReactPackage> getPackages() {
-            return Arrays.<ReactPackage>asList(
-                    new MainReactPackage(),
-                    new RNSvgPackage()
-            );
-        }
-    };
-
-    @Override
-    public ReactNativeHost getReactNativeHost() {
-        return mReactNativeHost;
-    }
-}

Example/android/app/src/main/java/com/svgexample/MainActivity.java

@@ -1,4 +1,4 @@
-package com.artsvgexample;
+package com.svgexample;
 
 import com.facebook.react.ReactActivity;
 

Example/android/app/src/main/java/com/svgexample/MainApplication.java

@@ -0,0 +1,35 @@
+package com.svgexample;
+
+import android.app.Application;
+import com.horcrux.svg.RNSvgPackage;
+
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.shell.MainReactPackage;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class MainApplication extends Application implements ReactApplication {
+
+  private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
+    @Override
+    protected boolean getUseDeveloperSupport() {
+      return BuildConfig.DEBUG;
+    }
+
+    @Override
+    protected List<ReactPackage> getPackages() {
+      return Arrays.asList(
+              new MainReactPackage(),
+              new RNSvgPackage()
+      );
+    }
+  };
+
+  @Override
+  public ReactNativeHost getReactNativeHost() {
+    return mReactNativeHost;
+  }
+}

Example/android/build.gradle

@@ -18,7 +18,7 @@ allprojects {
         jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url "$projectDir/../../node_modules/react-native/android"
+            url "$rootDir/../node_modules/react-native/android"
         }
     }
 }

Example/android/gradlew

@@ -42,6 +42,11 @@ case "`uname`" in
     ;;
 esac
 
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -56,9 +61,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
+cd "`dirname \"$PRG\"`/" >&-
 APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+cd "$SAVED" >&-
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -109,7 +114,6 @@ fi
 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`

Example/ios/SvgExample.xcodeproj/project.pbxproj

@@ -334,7 +334,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0610;
-				ORGANIZATIONNAME = Facebook;
+				ORGANIZATIONNAME = Horcrux;
 			};
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "SvgExample" */;
 			compatibilityVersion = "Xcode 3.2";

Example/main.js

@@ -199,7 +199,7 @@ class SvgExample extends Component {
             <Animated.Modal
                 visible={this.state.modal}
                 style={[styles.modal, {
-                    transform: [{scale: this.state.scale}]
+                    //transform: [{scale: this.state.scale}]
                 }]}
             >
                 <ScrollView

Example/package.json

@@ -1,13 +1,13 @@
 {
-  "name": "ArtSvgExample",
+  "name": "SvgExample",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
     "start": "react-native start"
   },
   "dependencies": {
     "react": "^15.1.0",
-    "react-native": "^0.29.0",
+    "react-native": "^0.31.0",
     "react-native-root-modal": "^1.0.4",
     "react-native-svg": "../"
   }

README.md

@@ -580,6 +580,7 @@ npm install
 3. Pattern element
 4. implement Animated elements
 5. load Image from url
+6. Mask element
 
 ### Known issues:
 1. cannot set alpha channel for Gradient on iOS.

package.json

@@ -1,5 +1,5 @@
 {
-    "version": "4.1.2",
+    "version": "4.1.3",
     "name": "react-native-svg",
     "description": "SVG library for react-native",
     "repository": {