From c871496f8cc1716b52e19241098dfb3003d6d07c Mon Sep 17 00:00:00 2001
From: Pascal Hartig <phartig@rdrei.net>
Date: Thu, 12 Jul 2018 06:41:32 -0700
Subject: [PATCH] Update build deps (#151)

Summary:
Update some build dependencies (gradle, android plugin) and make some
minor cleanups in the gradle files along the way.
Pull Request resolved: https://github.com/facebook/Sonar/pull/151

Reviewed By: priteshrnandgaonkar

Differential Revision: D8818841

Pulled By: passy

fbshipit-source-id: 78b6592dbf967553aadead57a60023a0b5ae79b6
---
 android/build.gradle | 5 ++---
 build.gradle         | 2 +-
 gradle.properties    | 2 +-
 settings.gradle      | 2 --
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index f1ed96ef5..035e9ecd0 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -3,11 +3,10 @@ apply plugin: 'maven'
 apply plugin: 'de.undercouch.download'
 
 import de.undercouch.gradle.tasks.download.Download
-import org.apache.tools.ant.taskdefs.condition.Os
 import org.apache.tools.ant.filters.ReplaceTokens
 
-def downloadsDir = new File("$buildDir/downloads")
-def thirdPartyNdkDir = new File("$buildDir/third-party-ndk")
+final def downloadsDir = new File("$buildDir/downloads")
+final def thirdPartyNdkDir = new File("$buildDir/third-party-ndk")
 
 task createNativeDepsDirectories {
     downloadsDir.mkdirs()
diff --git a/build.gradle b/build.gradle
index 2dea53a9b..10ef1a734 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:${GRADLE_BINTRAY_PLUGIN_VERSION}"
         classpath "com.github.dcendents:android-maven-gradle-plugin:${ANDROID_MAVEN_GRADLE_PLUGIN_VERSION}"
         classpath "com.github.ben-manes:gradle-versions-plugin:${GRADLE_VERSIONS_PLUGIN_VERSION}"
diff --git a/gradle.properties b/gradle.properties
index 4667e3901..c9a834557 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ POM_DEVELOPER_ID=facebook
 POM_DEVELOPER_NAME=facebook
 
 # Kotlin
-KOTLIN_VERSION=1.2.41
+KOTLIN_VERSION=1.2.50
 
 # Deps for publishing
 GRADLE_BINTRAY_PLUGIN_VERSION=1.8.0
diff --git a/settings.gradle b/settings.gradle
index dc51287de..6dd22c75c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,8 +7,6 @@
  * in the user guide at https://docs.gradle.org/4.7/userguide/multi_project_builds.html
  */
 
-rootProject.name = 'sonar-kit'
-
 include ':android'
 include ':folly'
 include ':fbjni'