diff --git a/android/build.gradle b/android/build.gradle index b9f22fd94..1a3f44971 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,7 +6,6 @@ */ apply plugin: 'com.android.library' -apply plugin: 'maven' android { compileSdkVersion rootProject.compileSdkVersion diff --git a/android/no-op/build.gradle b/android/no-op/build.gradle index 0b2f48520..6267e97ea 100644 --- a/android/no-op/build.gradle +++ b/android/no-op/build.gradle @@ -6,7 +6,6 @@ */ apply plugin: 'com.android.library' -apply plugin: 'maven' android { compileSdkVersion rootProject.compileSdkVersion diff --git a/android/plugins/fresco/build.gradle b/android/plugins/fresco/build.gradle index e8bac6520..7a4ccedce 100644 --- a/android/plugins/fresco/build.gradle +++ b/android/plugins/fresco/build.gradle @@ -6,7 +6,6 @@ */ apply plugin: 'com.android.library' -apply plugin: 'maven' android { compileSdkVersion rootProject.compileSdkVersion diff --git a/android/plugins/leakcanary/build.gradle b/android/plugins/leakcanary/build.gradle index a61c42d8e..d397fcf72 100644 --- a/android/plugins/leakcanary/build.gradle +++ b/android/plugins/leakcanary/build.gradle @@ -6,7 +6,6 @@ */ apply plugin: 'com.android.library' -apply plugin: 'maven' android { compileSdkVersion rootProject.compileSdkVersion diff --git a/android/plugins/leakcanary2/build.gradle b/android/plugins/leakcanary2/build.gradle index dbc0b409c..4e61f7a40 100644 --- a/android/plugins/leakcanary2/build.gradle +++ b/android/plugins/leakcanary2/build.gradle @@ -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 diff --git a/android/plugins/litho/build.gradle b/android/plugins/litho/build.gradle index 4c5c30515..12864807e 100644 --- a/android/plugins/litho/build.gradle +++ b/android/plugins/litho/build.gradle @@ -6,7 +6,6 @@ */ apply plugin: 'com.android.library' -apply plugin: 'maven' android { compileSdkVersion rootProject.compileSdkVersion diff --git a/android/plugins/network/build.gradle b/android/plugins/network/build.gradle index bb56d9760..935962171 100644 --- a/android/plugins/network/build.gradle +++ b/android/plugins/network/build.gradle @@ -6,7 +6,6 @@ */ apply plugin: 'com.android.library' -apply plugin: 'maven' android { compileSdkVersion rootProject.compileSdkVersion diff --git a/android/plugins/retrofit2-protobuf/build.gradle b/android/plugins/retrofit2-protobuf/build.gradle index 9b796865f..db04759c1 100644 --- a/android/plugins/retrofit2-protobuf/build.gradle +++ b/android/plugins/retrofit2-protobuf/build.gradle @@ -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 diff --git a/android/third-party/native.gradle b/android/third-party/native.gradle index 440783089..464a06146 100644 --- a/android/third-party/native.gradle +++ b/android/third-party/native.gradle @@ -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 diff --git a/build.gradle b/build.gradle index 3f75bcf48..1f293c7be 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ ext { minSdkVersion = 15 targetSdkVersion = 29 compileSdkVersion = 29 - buildToolsVersion = '29.0.2' + buildToolsVersion = '30.0.2' ndkVersion = '21.3.6528147' 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 2fbff42e0..b6f6a773c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -7,4 +7,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip