Upgrade gradle plugin (#4751)
Summary: [android] Upgrade gradle project Makes us compatible with Android Studio Flamingo and unlocks upgrades to Kotlin (which we need to be in sync with fbsource). Pull Request resolved: https://github.com/facebook/flipper/pull/4751 Test Plan: - ./gradlew :android:assembleDebug - Android Studio Sync - CI --- Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/facebook/flipper/pull/4751). * https://github.com/facebook/flipper/issues/4759 * https://github.com/facebook/flipper/issues/4758 * https://github.com/facebook/flipper/issues/4757 * https://github.com/facebook/flipper/issues/4756 * https://github.com/facebook/flipper/issues/4755 * https://github.com/facebook/flipper/issues/4754 * https://github.com/facebook/flipper/issues/4753 * https://github.com/facebook/flipper/issues/4752 * __->__ https://github.com/facebook/flipper/issues/4751 Reviewed By: aigoncharov Differential Revision: D46068236 Pulled By: passy fbshipit-source-id: 707422134b49c0d940b663f6f40937fe6561a038
This commit is contained in:
committed by
Facebook GitHub Bot
parent
fda21e96e8
commit
4e0bbb62fe
@@ -10,6 +10,7 @@ apply plugin: 'kotlin-android'
|
|||||||
apply plugin: 'kotlinx-serialization'
|
apply plugin: 'kotlinx-serialization'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.facebook.flipper'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
ndkVersion rootProject.ndkVersion
|
ndkVersion rootProject.ndkVersion
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.facebook.flipper'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
|
|
||||||
@@ -30,10 +31,3 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'com.vanniktech.maven.publish'
|
apply plugin: 'com.vanniktech.maven.publish'
|
||||||
|
|
||||||
task sourcesJar(type: Jar) {
|
|
||||||
from android.sourceSets.main.java.srcDirs
|
|
||||||
classifier = 'sources'
|
|
||||||
}
|
|
||||||
|
|
||||||
artifacts.add('archives', sourcesJar)
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.facebook.flipper.plugins.leakcanary'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ apply plugin: 'kotlin-android'
|
|||||||
apply plugin: 'kotlin-kapt'
|
apply plugin: 'kotlin-kapt'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.facebook.flipper.plugins.leakcanary2'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ apply plugin: 'com.android.library'
|
|||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.facebook.flipper.plugins.litho'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.facebook.flipper.plugins.network'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ apply plugin: 'kotlin-android'
|
|||||||
apply plugin: 'kotlin-kapt'
|
apply plugin: 'kotlin-kapt'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.facebook.flipper.plugins.retrofit2protobuf'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
apply plugin: 'com.android.application'
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.facebook.flipper.sample'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
ndkVersion rootProject.ndkVersion
|
ndkVersion rootProject.ndkVersion
|
||||||
|
|||||||
1
android/third-party/build.gradle
vendored
1
android/third-party/build.gradle
vendored
@@ -9,6 +9,7 @@ apply plugin: 'com.android.library'
|
|||||||
apply from: 'native.gradle'
|
apply from: 'native.gradle'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.facebook.flipper.thirdparty'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.doubleconversion'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
ndkVersion rootProject.ndkVersion
|
ndkVersion rootProject.ndkVersion
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.folly'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
ndkVersion rootProject.ndkVersion
|
ndkVersion rootProject.ndkVersion
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.libevent'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
ndkVersion rootProject.ndkVersion
|
ndkVersion rootProject.ndkVersion
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.glog'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
ndkVersion rootProject.ndkVersion
|
ndkVersion rootProject.ndkVersion
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ apply plugin: 'kotlin-android'
|
|||||||
apply plugin: 'kotlin-kapt'
|
apply plugin: 'kotlin-kapt'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.facebook.flipper.sample.tutorial'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "com.facebook.flipper.sample.tutorial"
|
applicationId "com.facebook.flipper.sample.tutorial"
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:7.4.0'
|
classpath 'com.android.tools.build:gradle:8.0.1'
|
||||||
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.2'
|
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.2'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
|
||||||
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.8.10"
|
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.8.10"
|
||||||
|
|||||||
@@ -33,3 +33,6 @@ systemProp.org.gradle.internal.http.connectionTimeout=120000
|
|||||||
systemProp.org.gradle.internal.http.socketTimeout=120000
|
systemProp.org.gradle.internal.http.socketTimeout=120000
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
|
android.defaults.buildfeatures.buildconfig=true
|
||||||
|
android.nonTransitiveRClass=false
|
||||||
|
android.nonFinalResIds=false
|
||||||
|
|||||||
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
|
||||||
distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
namespace 'com.facebook.xplat.sonar'
|
||||||
compileSdkVersion rootProject.compileSdkVersion
|
compileSdkVersion rootProject.compileSdkVersion
|
||||||
buildToolsVersion rootProject.buildToolsVersion
|
buildToolsVersion rootProject.buildToolsVersion
|
||||||
ndkVersion rootProject.ndkVersion
|
ndkVersion rootProject.ndkVersion
|
||||||
|
|||||||
Reference in New Issue
Block a user