Merge pull request #2224 from StoDevX/up-min-android-sdk-version

Raise minimum android sdk version

Author: rye

android/app/build.gradle

@@ -97,18 +97,14 @@ def enableSeparateBuildPerCPUArchitecture = true
 def enableProguardInReleaseBuilds = false
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "26.0.1"
+    compileSdkVersion 26
 
     defaultConfig {
         applicationId "com.allaboutolaf"
         minSdkVersion 19
-        targetSdkVersion 23
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0.0"
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
         manifestPlaceholders = [
             manifestApplicationId: applicationId,
             BUGSNAG_KEY: System.getenv("BUGSNAG_KEY") ?: "",
@@ -150,9 +146,15 @@ android {
     android {
         dexOptions {
             // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
-            preDexLibraries = preDexEnabled && !travisBuild
+            preDexLibraries = preDexEnabled && !ciBuild
         }
     }
+    configurations.all {
+        resolutionStrategy.force 'com.android.support:appcompat-v7:26.1.0'
+        resolutionStrategy.force 'com.android.support:customtabs:26.1.0'
+        resolutionStrategy.force 'com.google.android.gms:play-services-base:11.8.0'
+        resolutionStrategy.force 'com.google.android.gms:play-services-maps:11.8.0'
+    }
 }
 
 // borrowed from https://gist.github.com/gabrielemariotti/6856974
@@ -191,21 +193,21 @@ if (propFile.canRead()) {
 
 dependencies {
     // please keep this list sorted
-    compile project(':bugsnag-react-native')
-    compile project(':react-native-calendar-events')
-    compile project(':react-native-custom-tabs')
-    compile project(':react-native-device-info')
-    compile project(':react-native-google-analytics-bridge')
-    compile project(':react-native-keychain')
-    compile project(':react-native-linear-gradient')
-    compile project(':react-native-maps')
-    compile project(':react-native-network-info')
-    compile project(':react-native-restart')
-    compile project(':react-native-vector-icons')
+    implementation project(':bugsnag-react-native')
+    implementation project(':react-native-calendar-events')
+    implementation project(':react-native-custom-tabs')
+    implementation project(':react-native-device-info')
+    implementation project(':react-native-google-analytics-bridge')
+    implementation project(':react-native-keychain')
+    implementation project(':react-native-linear-gradient')
+    implementation project(':react-native-maps')
+    implementation project(':react-native-network-info')
+    implementation project(':react-native-restart')
+    implementation project(':react-native-vector-icons')
     // this is for react-native itself
-    compile fileTree(dir: "libs", include: ["*.jar"])
-    compile "com.android.support:appcompat-v7:23.0.1"
-    compile "com.facebook.react:react-native:+"  // From node_modules
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "com.android.support:appcompat-v7:26.1.0"
+    implementation "com.facebook.react:react-native:+"  // From node_modules
 }
 
 // Run this once to be able to run the application with BUCK

android/build.gradle

@@ -3,17 +3,18 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.1.0-alpha09'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
 ext {
-    travisBuild = System.getenv("TRAVIS") == "true"
+    ciBuild = (System.getenv("CI") ?: "") != ""
     // allows for -Dpre-dex=false to be set
     preDexEnabled = System.getProperty("pre-dex", "true") == "true"
 }
@@ -30,5 +31,6 @@ allprojects {
             // react-native-custom-tabs requires this maven repository
             url "https://jitpack.io"
         }
+        google()
     }
 }

android/gradle.properties

@@ -25,3 +25,4 @@ org.gradle.parallel=true
 org.gradle.workers.max=2
 
 android.useDeprecatedNdk=true
+android.enableAapt2=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Tue Jan 23 18:00:48 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

android/settings.gradle

@@ -1,4 +1,4 @@
-rootProject.name = 'All About Olaf'
+rootProject.name = 'AllAboutOlaf'
 include ':app'
 
 // Please keep this list in alphabetical order.