Fix project structure and upgrade lottie

Author: lelandrichardson

.gitignore

@@ -28,6 +28,8 @@ project.xcworkspace
 *.iml
 .gradle
 local.properties
+example/android/app/src/main/gen/
+lib/android/src/main/gen/
 
 # node.js
 #

build.gradle

@@ -1,32 +1,25 @@
-/*
- * This build file was auto generated by running the Gradle 'init' task
- * by 'leland_richardson' at '12/19/16 1:05 PM' with Gradle 2.4
- *
- * This generated file contains a commented-out sample Java project to get you started.
- * For more details take a look at the Java Quickstart chapter in the Gradle
- * user guide available at http://gradle.org/docs/2.4/userguide/tutorial_java_projects.html
- */
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 
-/*
-// Apply the java plugin to add support for Java
-apply plugin: 'java'
-
-// In this section you declare where to find the dependencies of your project
-repositories {
-    // Use 'jcenter' for resolving your dependencies.
-    // You can declare any Maven/Ivy/file repository here.
+buildscript {
+  repositories {
     jcenter()
+  }
+  dependencies {
+    classpath 'com.android.tools.build:gradle:2.3.0'
+  }
 }
 
-// In this section you declare the dependencies for your production and test code
-dependencies {
-    // The production code uses the SLF4J logging API at compile time
-    compile 'org.slf4j:slf4j-api:1.7.12'
+allprojects {
+  repositories {
+    mavenLocal()
+    jcenter()
+    maven {
+      // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+      url "$rootDir/node_modules/react-native/android"
+    }
+  }
+}
 
-    // Declare the dependency for your favourite test framework you want to use in your tests.
-    // TestNG is also supported by the Gradle Test task. Just change the
-    // testCompile dependency to testCompile 'org.testng:testng:6.8.1' and add
-    // 'test.useTestNG()' to your build script.
-    testCompile 'junit:junit:4.12'
+task clean(type: Delete) {
+  delete rootProject.buildDir
 }
-*/

example/android/app/build.gradle

@@ -97,13 +97,13 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = false
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.example"
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
         ndk {
@@ -141,9 +141,10 @@ android {
 
 dependencies {
     compile fileTree(dir: "libs", include: ["*.jar"])
-    compile "com.android.support:appcompat-v7:23.0.1"
+    compile 'com.android.support:appcompat-v7:25.1.1'
+    compile 'com.android.support:support-annotations:25.1.1'
     compile "com.facebook.react:react-native:+"  // From node_modules
-    compile project(':lottie')
+    compile project(':lottie-react-native-lib')
 
 }
 

example/android/build.gradle

@@ -10,4 +10,5 @@ target 'example' do
     # Add any other subspecs you want to use in your project
   ]
   pod 'lottie-react-native', :path => '../../'
+  pod 'lottie-ios', :path => '../../node_modules/lottie-ios'
 end

example/ios/Podfile

@@ -1,6 +1,6 @@
 PODS:
-  - lottie-ios (1.0.0)
-  - lottie-react-native (1.0.1):
+  - lottie-ios (1.5.1)
+  - lottie-react-native (1.0.6):
     - lottie-ios
     - React
   - React (0.41.1):
@@ -25,6 +25,7 @@ PODS:
   - React/yoga (0.41.1)
 
 DEPENDENCIES:
+  - lottie-ios (from `../../node_modules/lottie-ios`)
   - lottie-react-native (from `../../`)
   - React/Core (from `../../node_modules/react-native`)
   - React/RCTAnimation (from `../../node_modules/react-native`)
@@ -34,16 +35,18 @@ DEPENDENCIES:
   - React/RCTWebSocket (from `../../node_modules/react-native`)
 
 EXTERNAL SOURCES:
+  lottie-ios:
+    :path: "../../node_modules/lottie-ios"
   lottie-react-native:
     :path: "../../"
   React:
     :path: "../../node_modules/react-native"
 
 SPEC CHECKSUMS:
-  lottie-ios: c40d67c1481d6fb9fa24fe46731ac823f5f6675b
-  lottie-react-native: 651290cb9dbfb7eebafa0a0f3ab2b399f177e354
+  lottie-ios: f680a7c4cb7a567ecf258fde0f967913aff111b8
+  lottie-react-native: 4ecfdd856f20863cea9d4ddfd25dec5550ef50a6
   React: 92b73e1de23f052ab049247554427634986b40d1
 
-PODFILE CHECKSUM: f599da013d7c1939292ba2072269e5bcb78acf43
+PODFILE CHECKSUM: f51e2172ed228016b380cd0daa6b749a81ad54f8
 
 COCOAPODS: 1.2.0

example/ios/Podfile.lock

@@ -1,6 +1,6 @@
-#Mon Dec 19 13:05:54 PST 2016
+#Sat Mar 25 15:51:57 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -44,7 +44,7 @@
   "dependencies": {
     "invariant": "^2.2.2",
     "react-native-safe-module": "^1.1.0",
-    "lottie-ios": "^1.0.2"
+    "lottie-ios": "^1.5.1"
   },
   "devDependencies": {
     "babel-eslint": "^6.1.2",

package.json

@@ -1,19 +1,7 @@
-/*
- * This settings file was auto generated by the Gradle buildInit task
- * by 'leland_richardson' at '12/19/16 1:05 PM' with Gradle 2.4
- *
- * The settings file is used to specify which projects to include in your build.
- * In a single project build this file can be empty or even removed.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user guide at http://gradle.org/docs/2.4/userguide/multi_project_builds.html
- */
+rootProject.name = 'lottie-react-native'
 
-/*
-// To declare projects as part of a multi-project build use the 'include' method
-include 'shared'
-include 'api'
-include 'services:webservice'
-*/
+include ":example-android"
+project(":example-android").projectDir = file("./example/android/app")
 
-rootProject.name = 'lottie-react-native'
+include ":lottie-react-native-lib"
+project(":lottie-react-native-lib").projectDir = file("./lib/android")