diff --git a/.buckconfig b/.buckconfig index 5c47223b..4147e394 100644 --- a/.buckconfig +++ b/.buckconfig @@ -2,6 +2,7 @@ gtest_dep = //lib/gtest:gtest [android] target = android-25 + build_tools_version = 26.0.2 [ndk] ndk_version = 15.2.4203891 compiler = clang diff --git a/android/build.gradle b/android/build.gradle index e7feddbd..042459a2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -22,7 +22,7 @@ android { } dependencies { - compile project(':yoga') + api project(':yoga') } task sourcesJar(type: Jar) { diff --git a/build.gradle b/build.gradle index e8a68bba..7cbb3cf7 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,12 @@ buildscript { repositories { jcenter() + maven { url 'https://maven.google.com/' } } 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.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 // in the individual module build.gradle files @@ -23,8 +24,8 @@ allprojects { ext { minSdkVersion = 14 targetSdkVersion = 25 - compileSdkVersion = 25 - buildToolsVersion = '25.0.2' + compileSdkVersion = 26 + buildToolsVersion = '26.0.2' sourceCompatibilityVersion = JavaVersion.VERSION_1_7 targetCompatibilityVersion = JavaVersion.VERSION_1_7 } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 71d17a33..3ec961ec 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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 diff --git a/java/build.gradle b/java/build.gradle index 2222e8c3..da30fe9b 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -50,10 +50,10 @@ android { } dependencies { - compile 'com.google.code.findbugs:jsr305:3.0.1' - compile 'com.facebook.soloader:soloader:0.2.0' - provided project(':yoga:proguard-annotations') - testCompile 'junit:junit:4.12' + compileOnly 'com.google.code.findbugs:jsr305:3.0.1' + compileOnly project(':yoga:proguard-annotations') + implementation 'com.facebook.soloader:soloader:0.2.0' + testImplementation 'junit:junit:4.12' } task sourcesJar(type: Jar) { diff --git a/lib/fb/build.gradle b/lib/fb/build.gradle index b3ace3b9..7a419b0b 100644 --- a/lib/fb/build.gradle +++ b/lib/fb/build.gradle @@ -26,8 +26,8 @@ android { } dependencies { - compile 'com.facebook.soloader:soloader:0.2.0' - compile 'com.google.code.findbugs:jsr305:3.0.1' - compile project(':yoga:proguard-annotations') + implementation 'com.facebook.soloader:soloader:0.2.0' + compileOnly 'com.google.code.findbugs:jsr305:3.0.1' + compileOnly project(':yoga:proguard-annotations') } } diff --git a/scripts/android-setup.sh b/scripts/android-setup.sh index fb32766f..fd45ab38 100644 --- a/scripts/android-setup.sh +++ b/scripts/android-setup.sh @@ -45,5 +45,5 @@ function installAndroidSDK { echo > "$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' }