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

Upgrade gradle plugin (#1936)

Browse Source 
Summary:
Upgraded to the latest Android Studio and this popped up.

Pull Request resolved: https://github.com/facebook/flipper/pull/1936

Test Plan:
Built the sample app.

Repro'd the previous build failure. Weirdly enough, this only occurred on Linux, not on my Mac. Now it's passing.

Reviewed By: mweststrate

Differential Revision: D26483694

Pulled By: passy

fbshipit-source-id: 9c27eb6d28a0f390154899d67469a504d68c2ad4
This commit is contained in:
Pascal Hartig
2021-02-19 03:28:24 -08:00
committed by Facebook GitHub Bot
parent 1433dd4b73
commit 3f16da4db0
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/build.gradle
View File

@@ -60,9 +60,10 @@ android {
dependencies { dependencies {
compileOnly deps.proguardAnnotations compileOnly deps.proguardAnnotations
implementation 'com.facebook.fbjni:fbjni:0.0.2' // Temporary until we upgrade to prefabs: https://developer.android.com/studio/releases/gradle-plugin#native-dependencies
extractHeaders 'com.facebook.fbjni:fbjni:0.0.2:headers' implementation 'com.facebook.fbjni:fbjni-java-only:0.0.4'
extractJNI 'com.facebook.fbjni:fbjni:0.0.2' extractHeaders 'com.facebook.fbjni:fbjni:0.0.4:headers'
extractJNI 'com.facebook.fbjni:fbjni:0.0.4'
implementation deps.soloader implementation deps.soloader
implementation deps.jsr305 implementation deps.jsr305
implementation deps.supportAppCompat implementation deps.supportAppCompat

4
build.gradle
View File

@@ -12,7 +12,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.0' classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2' classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
} }
@@ -51,7 +51,7 @@ ext {
targetSdkVersion = 29 targetSdkVersion = 29
compileSdkVersion = 29 compileSdkVersion = 29
buildToolsVersion = '29.0.2' buildToolsVersion = '29.0.2'
ndkVersion = '20.0.5594570' ndkVersion = '21.3.6528147'
sourceCompatibilityVersion = JavaVersion.VERSION_1_7 sourceCompatibilityVersion = JavaVersion.VERSION_1_7
targetCompatibilityVersion = JavaVersion.VERSION_1_7 targetCompatibilityVersion = JavaVersion.VERSION_1_7
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -7,4 +7,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-6.8.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip