Modernize Android build system, bump dependencies

Summary:
- Build against Android SDK 26
- Upgrade to Gradle 4
- Upgrade to Android Plugin 3.0, adjust dependency management accordingly
- Upgrade Maven deployment plugin

Reviewed By: emilsjolander

Differential Revision: D6272007

fbshipit-source-id: b198b4c8e1a94e2ee031ad26193fdfdf5b52adf1
This commit is contained in:
Pascal Hartig
2017-11-08 09:45:13 -08:00
committed by Facebook Github Bot
parent d8fee24778
commit 40861c699e
7 changed files with 16 additions and 14 deletions

View File

@@ -2,6 +2,7 @@
gtest_dep = //lib/gtest:gtest gtest_dep = //lib/gtest:gtest
[android] [android]
target = android-25 target = android-25
build_tools_version = 26.0.2
[ndk] [ndk]
ndk_version = 15.2.4203891 ndk_version = 15.2.4203891
compiler = clang compiler = clang

View File

@@ -22,7 +22,7 @@ android {
} }
dependencies { dependencies {
compile project(':yoga') api project(':yoga')
} }
task sourcesJar(type: Jar) { task sourcesJar(type: Jar) {

View File

@@ -3,11 +3,12 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
maven { url 'https://maven.google.com/' }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@@ -23,8 +24,8 @@ allprojects {
ext { ext {
minSdkVersion = 14 minSdkVersion = 14
targetSdkVersion = 25 targetSdkVersion = 25
compileSdkVersion = 25 compileSdkVersion = 26
buildToolsVersion = '25.0.2' buildToolsVersion = '26.0.2'
sourceCompatibilityVersion = JavaVersion.VERSION_1_7 sourceCompatibilityVersion = JavaVersion.VERSION_1_7
targetCompatibilityVersion = JavaVersion.VERSION_1_7 targetCompatibilityVersion = JavaVersion.VERSION_1_7
} }

View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip

View File

@@ -50,10 +50,10 @@ android {
} }
dependencies { dependencies {
compile 'com.google.code.findbugs:jsr305:3.0.1' compileOnly 'com.google.code.findbugs:jsr305:3.0.1'
compile 'com.facebook.soloader:soloader:0.2.0' compileOnly project(':yoga:proguard-annotations')
provided project(':yoga:proguard-annotations') implementation 'com.facebook.soloader:soloader:0.2.0'
testCompile 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
} }
task sourcesJar(type: Jar) { task sourcesJar(type: Jar) {

View File

@@ -26,8 +26,8 @@ android {
} }
dependencies { dependencies {
compile 'com.facebook.soloader:soloader:0.2.0' implementation 'com.facebook.soloader:soloader:0.2.0'
compile 'com.google.code.findbugs:jsr305:3.0.1' compileOnly 'com.google.code.findbugs:jsr305:3.0.1'
compile project(':yoga:proguard-annotations') compileOnly project(':yoga:proguard-annotations')
} }
} }

View File

@@ -45,5 +45,5 @@ function installAndroidSDK {
echo > "$ANDROID_HOME/licenses/android-sdk-license" echo > "$ANDROID_HOME/licenses/android-sdk-license"
echo -n d56f5187479451eabf01fb78af6dfcb131a6481e >> "$ANDROID_HOME/licenses/android-sdk-license" echo -n d56f5187479451eabf01fb78af6dfcb131a6481e >> "$ANDROID_HOME/licenses/android-sdk-license"
installsdk 'build-tools;23.0.2' 'build-tools;25.0.2' 'build-tools;25.0.1' 'platform-tools' 'platforms;android-23' 'platforms;android-25' 'extras;android;m2repository' installsdk 'build-tools;26.0.2' 'platform-tools' 'platforms;android-23' 'platforms;android-25' 'extras;android;m2repository'
} }