From 6664bee18f9bb24811a3f87f750c2780e75fa606 Mon Sep 17 00:00:00 2001
From: Matthew Lawler <>
Date: Mon, 15 Jul 2019 13:34:01 -0700
Subject: [PATCH 1/2] [PS-6258] Fixing package name from copied AndroidManifest
 so it doesn't collide with our LargeList import.

---
 android/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 48e2346..d889431 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.largelistdemo"
+<manifest package="com.springscrollviewexample"
           xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

From cbb5cce3ea326d376554bc111f42c6f771352f4d Mon Sep 17 00:00:00 2001
From: Matthew Lawler <>
Date: Mon, 15 Jul 2019 13:37:55 -0700
Subject: [PATCH 2/2] [PS-6258] Bumping version number.

---
 android/SpringScrollViewExample.iml             | 3 ---
 android/app/app.iml                             | 3 ---
 android/gradle.properties                       | 2 +-
 src/android/react-native-spring-scroll-view.iml | 2 --
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/android/SpringScrollViewExample.iml b/android/SpringScrollViewExample.iml
index c787ff3..9042a5d 100644
--- a/android/SpringScrollViewExample.iml
+++ b/android/SpringScrollViewExample.iml
@@ -92,14 +92,11 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_zip" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compile_only_not_namespaced_r_class_jar" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/consumer_proguard_file" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_publish_jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
diff --git a/android/app/app.iml b/android/app/app.iml
index 2378e13..34a6edf 100644
--- a/android/app/app.iml
+++ b/android/app/app.iml
@@ -96,7 +96,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
@@ -105,14 +104,12 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
-      <excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/android/gradle.properties b/android/gradle.properties
index ecb991c..9cced2f 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -21,7 +21,7 @@ MOCKITO_CORE_VERSION=1.+
 POWERMOCK_VERSION=1.6.2
 FEST_ASSERT_CORE_VERSION=2.0M10
 
-VERSION_NAME=2.0.6-skillz
+VERSION_NAME=2.0.7-skillz
 GROUP=com.springscrollviewexample
 
 POM_NAME=ReactNativeSpringScrollview
diff --git a/src/android/react-native-spring-scroll-view.iml b/src/android/react-native-spring-scroll-view.iml
index 87e5845..560cfb9 100644
--- a/src/android/react-native-spring-scroll-view.iml
+++ b/src/android/react-native-spring-scroll-view.iml
@@ -97,14 +97,12 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_java_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/runtime_library_classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />