Fix Android dependencies and build errors (react-native-maps#2720)

* Update yarn.lock

* Remove obsolete files and folders

- Delete compiled files
- Remove obsolete Gradle wrapper leftover
- Remove Eclipse project leftover

* Update .gitignore

* Fix Android dependencies and build errors

- Update Gradle wrapper to 4.10.3
- Update Android Gradle plugin to 3.2.1
- Remove unused appcompat-v7 dependency from lib project

Author: friederbluemle

.gitignore

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

build.gradle

@@ -1,17 +1,23 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
+  ext {
+    minSdkVersion = 16
+    compileSdkVersion = 28
+    targetSdkVersion = 27
+    supportLibVersion = "28.0.0"
+  }
   repositories {
+    google()
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.2'
+    classpath 'com.android.tools.build:gradle:3.2.1'
   }
 }
 
 allprojects {
   repositories {
     mavenLocal()
+    google()
     jcenter()
     maven {
       // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm

example/.gitignore

@@ -73,7 +73,6 @@ project.ext.react = [
     extraPackagerArgs: []
 ]
 
-
 apply from: "../../../node_modules/react-native/react.gradle"
 
 def enableSeparateBuildPerCPUArchitecture = false
@@ -84,13 +83,12 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = false
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
         applicationId "com.airbnb.android.react.maps.example"
-        minSdkVersion 16
-        targetSdkVersion 23
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
         ndk {
@@ -127,8 +125,7 @@ android {
 }
 
 dependencies {
-    compile 'com.facebook.react:react-native:0.51.+'
-    compile 'com.android.support:appcompat-v7:25.3.0'
-    compile 'com.android.support:support-annotations:25.3.0'
-    compile project(':react-native-maps-lib')
+    implementation project(":react-native-maps-lib")
+    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+    implementation "com.facebook.react:react-native:+"  // From node_modules
 }

example/android/app/.project

@@ -0,0 +1,36 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+VERSION_CODE=4
+VERSION_NAME=0.23.0
+GROUP=com.airbnb.android
+
+POM_DESCRIPTION=React Native Map view component for Android
+POM_URL=https://github.com/airbnb/react-native-maps/tree/new-scv
+POM_SCM_URL=https://github.com/airbnb/react-native-maps/tree/new-scv
+POM_SCM_CONNECTION=scm:git@github.com:airbnb/react-native-maps.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:airbnb/react-native-maps.git
+POM_LICENSE_NAME=MIT
+POM_LICENSE_URL=https://github.com/airbnb/react-native-maps/blob/master/LICENSE
+POM_LICENSE_DIST=repo
+POM_DEVELOPER_ID=airbnb
+POM_DEVELOPER_NAME=Leland Richardson
+
+POM_NAME=ReactNative Maps library
+POM_ARTIFACT_ID=react-native-maps
+POM_PACKAGING=aar

example/android/app/bin/src/main/java/com/airbnb/android/react/maps/example/ExampleApplication.class

@@ -1,6 +1,5 @@
-#Mon May 08 11:03:28 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip

example/android/app/bin/src/main/java/com/airbnb/android/react/maps/example/MainActivity.class

@@ -28,16 +28,16 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

example/android/app/build.gradle

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @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 DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

example/android/gradle/wrapper/gradle-wrapper.jar

@@ -1,60 +1,20 @@
 apply plugin: 'com.android.library'
 apply from: 'gradle-maven-push.gradle'
 
-def DEFAULT_COMPILE_SDK_VERSION               = 27
-def DEFAULT_BUILD_TOOLS_VERSION               = "27.0.3"
-def DEFAULT_TARGET_SDK_VERSION                = 27
-def DEFAULT_ANDROID_SUPPORT_LIB_VERSION       = "27.0.2"
-def DEFAULT_GOOGLE_PLAY_SERVICES_VERSION      = "16.0.1"
-def DEFAULT_GOOGLE_PLAY_SERVICES_MAPS_VERSION = "16.0.0"
-def DEFAULT_ANDROID_MAPS_UTILS_VERSION        = "0.5+"
-
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
-
 android {
-  compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
-  buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
+  compileSdkVersion rootProject.ext.compileSdkVersion
 
   defaultConfig {
-    minSdkVersion 16
-    targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
-  }
-
-  packagingOptions {
-    exclude 'META-INF/LICENSE'
-    exclude 'META-INF/DEPENDENCIES.txt'
-    exclude 'META-INF/LICENSE.txt'
-    exclude 'META-INF/NOTICE.txt'
-    exclude 'META-INF/NOTICE'
-    exclude 'META-INF/DEPENDENCIES'
-    exclude 'META-INF/notice.txt'
-    exclude 'META-INF/license.txt'
-    exclude 'META-INF/dependencies.txt'
-    exclude 'META-INF/LGPL2.1'
-  }
-
-  lintOptions {
-    disable 'InvalidPackage'
-  }
-
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_7
-    targetCompatibility JavaVersion.VERSION_1_7
+    minSdkVersion rootProject.ext.minSdkVersion
+    targetSdkVersion rootProject.ext.targetSdkVersion
   }
 }
 
 dependencies {
-  def supportLibVersion = safeExtGet('supportLibVersion', DEFAULT_ANDROID_SUPPORT_LIB_VERSION)
-  def googlePlayServicesVersion = safeExtGet('googlePlayServicesVersion', DEFAULT_GOOGLE_PLAY_SERVICES_VERSION)
-  // Variable lookup order : googlePlayServicesMapsVersion > googlePlayServicesVersion > DEFAULT_GOOGLE_PLAY_SERVICES_MAPS_VERSION
-  def googlePlayServicesMapsVersion = safeExtGet('googlePlayServicesMapsVersion', safeExtGet('googlePlayServicesVersion', DEFAULT_GOOGLE_PLAY_SERVICES_MAPS_VERSION))
-  def androidMapsUtilsVersion = safeExtGet('androidMapsUtilsVersion', DEFAULT_ANDROID_MAPS_UTILS_VERSION)
-
-  compileOnly "com.facebook.react:react-native:+"
-  implementation "com.android.support:appcompat-v7:$supportLibVersion"
-  implementation "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
-  implementation "com.google.android.gms:play-services-maps:$googlePlayServicesMapsVersion"
-  implementation "com.google.maps.android:android-maps-utils:$androidMapsUtilsVersion"
+  compileOnly('com.facebook.react:react-native:+') {
+    exclude group: 'com.android.support'
+  }
+  implementation 'com.google.android.gms:play-services-base:16.1.0'
+  implementation 'com.google.android.gms:play-services-maps:16.1.0'
+  implementation 'com.google.maps.android:android-maps-utils:0.5'
 }