Upgrade to Gradle 7 (#2279)
Summary: Depends on https://github.com/facebook/flipper/issues/2277. Fixes https://github.com/facebook/flipper/issues/2221. The maven plugin is no longer exposed and implied by https://developer.android.com/studio/build/maven-publish-plugin. Pull Request resolved: https://github.com/facebook/flipper/pull/2279 Test Plan: ./gradlew uploadArchives -PdryRun=true Reviewed By: priteshrnandgaonkar Differential Revision: D28473692 Pulled By: passy fbshipit-source-id: 3d95122fecebfeac8bfa5173c5c633eee3f13311
This commit is contained in:
committed by
Facebook GitHub Bot
parent
0227a7ab8a
commit
6279cc68b1
@@ -6,7 +6,6 @@
|
||||
*/
|
||||
|
||||
apply plugin: 'com.android.library'
|
||||
apply plugin: 'maven'
|
||||
|
||||
android {
|
||||
compileSdkVersion rootProject.compileSdkVersion
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
*/
|
||||
|
||||
apply plugin: 'com.android.library'
|
||||
apply plugin: 'maven'
|
||||
|
||||
android {
|
||||
compileSdkVersion rootProject.compileSdkVersion
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
*/
|
||||
|
||||
apply plugin: 'com.android.library'
|
||||
apply plugin: 'maven'
|
||||
|
||||
android {
|
||||
compileSdkVersion rootProject.compileSdkVersion
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
*/
|
||||
|
||||
apply plugin: 'com.android.library'
|
||||
apply plugin: 'maven'
|
||||
|
||||
android {
|
||||
compileSdkVersion rootProject.compileSdkVersion
|
||||
|
||||
@@ -9,7 +9,6 @@ apply plugin: 'com.android.library'
|
||||
apply plugin: 'kotlin-android'
|
||||
apply plugin: 'kotlin-android-extensions'
|
||||
apply plugin: 'kotlin-kapt'
|
||||
apply plugin: 'maven'
|
||||
|
||||
android {
|
||||
compileSdkVersion rootProject.compileSdkVersion
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
*/
|
||||
|
||||
apply plugin: 'com.android.library'
|
||||
apply plugin: 'maven'
|
||||
|
||||
android {
|
||||
compileSdkVersion rootProject.compileSdkVersion
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
*/
|
||||
|
||||
apply plugin: 'com.android.library'
|
||||
apply plugin: 'maven'
|
||||
|
||||
android {
|
||||
compileSdkVersion rootProject.compileSdkVersion
|
||||
|
||||
@@ -9,7 +9,6 @@ apply plugin: 'com.android.library'
|
||||
apply plugin: 'kotlin-android'
|
||||
apply plugin: 'kotlin-android-extensions'
|
||||
apply plugin: 'kotlin-kapt'
|
||||
apply plugin: 'maven'
|
||||
|
||||
android {
|
||||
compileSdkVersion rootProject.compileSdkVersion
|
||||
|
||||
1
android/third-party/native.gradle
vendored
1
android/third-party/native.gradle
vendored
@@ -52,6 +52,7 @@ task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) {
|
||||
task prepareGlog(dependsOn: [downloadGlog], type: Copy) {
|
||||
onlyIf { isCacheOutOfDate(CACHE_REVISION) }
|
||||
from tarTree(downloadGlog.dest)
|
||||
duplicatesStrategy DuplicatesStrategy.INCLUDE
|
||||
from './overrides/glog/'
|
||||
include 'glog-0.3.5/src/**/*', 'Android.mk', 'config.h', 'build.gradle', 'CMakeLists.txt', 'ApplicationManifest.xml'
|
||||
includeEmptyDirs = false
|
||||
|
||||
Reference in New Issue
Block a user