jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update build deps (#151)

Browse Source 
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
This commit is contained in:
Pascal Hartig
2018-07-12 06:41:32 -07:00
committed by Facebook Github Bot
parent 81e1b89b40
commit c871496f8c
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/build.gradle
View File

@@ -3,11 +3,10 @@ apply plugin: 'maven'
apply plugin: 'de.undercouch.download' apply plugin: 'de.undercouch.download'
import de.undercouch.gradle.tasks.download.Download import de.undercouch.gradle.tasks.download.Download
import org.apache.tools.ant.taskdefs.condition.Os
import org.apache.tools.ant.filters.ReplaceTokens import org.apache.tools.ant.filters.ReplaceTokens
def downloadsDir = new File("$buildDir/downloads") final def downloadsDir = new File("$buildDir/downloads")
def thirdPartyNdkDir = new File("$buildDir/third-party-ndk") final def thirdPartyNdkDir = new File("$buildDir/third-party-ndk")
task createNativeDepsDirectories { task createNativeDepsDirectories {
downloadsDir.mkdirs() downloadsDir.mkdirs()

2
build.gradle
View File

@@ -4,7 +4,7 @@ buildscript {
google() google()
} }
dependencies { 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.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.dcendents:android-maven-gradle-plugin:${ANDROID_MAVEN_GRADLE_PLUGIN_VERSION}"
classpath "com.github.ben-manes:gradle-versions-plugin:${GRADLE_VERSIONS_PLUGIN_VERSION}" classpath "com.github.ben-manes:gradle-versions-plugin:${GRADLE_VERSIONS_PLUGIN_VERSION}"

2
gradle.properties
View File

@@ -12,7 +12,7 @@ POM_DEVELOPER_ID=facebook
POM_DEVELOPER_NAME=facebook POM_DEVELOPER_NAME=facebook
# Kotlin # Kotlin
KOTLIN_VERSION=1.2.41 KOTLIN_VERSION=1.2.50
# Deps for publishing # Deps for publishing
GRADLE_BINTRAY_PLUGIN_VERSION=1.8.0 GRADLE_BINTRAY_PLUGIN_VERSION=1.8.0

2
settings.gradle
View File

@@ -7,8 +7,6 @@
* in the user guide at https://docs.gradle.org/4.7/userguide/multi_project_builds.html * in the user guide at https://docs.gradle.org/4.7/userguide/multi_project_builds.html
*/ */
rootProject.name = 'sonar-kit'
include ':android' include ':android'
include ':folly' include ':folly'
include ':fbjni' include ':fbjni'