From 445b5f1a7dd1dc93a0903728dfbacdd235cc97fd Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Mon, 22 May 2023 14:56:59 +0100 Subject: [PATCH] [android] Upgrade gradle project Summary: Makes us compatible with Android Studio Flamingo and unlocks upgrades to Kotlin (which we need to be in sync with fbsource). Test Plan: - ./gradlew :android:assembleDebug - Android Studio Sync - CI Tasks: T153938450 Tags: --- android/build.gradle | 1 + android/no-op/build.gradle | 8 +------- android/plugins/leakcanary/build.gradle | 1 + android/plugins/leakcanary2/build.gradle | 1 + android/plugins/litho/build.gradle | 1 + android/plugins/network/build.gradle | 1 + android/plugins/retrofit2-protobuf/build.gradle | 1 + android/sample/build.gradle | 1 + android/third-party/build.gradle | 1 + .../third-party/overrides/DoubleConversion/build.gradle | 1 + android/third-party/overrides/Folly/build.gradle | 1 + android/third-party/overrides/LibEvent/build.gradle | 1 + android/third-party/overrides/glog/build.gradle | 1 + android/tutorial/build.gradle | 1 + build.gradle | 2 +- gradle.properties | 3 +++ gradle/wrapper/gradle-wrapper.properties | 3 +-- xplat/build.gradle | 1 + 18 files changed, 20 insertions(+), 10 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 13bc5f8dc94..e656d0ae61a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -10,6 +10,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlinx-serialization' android { + namespace 'com.facebook.flipper' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion ndkVersion rootProject.ndkVersion diff --git a/android/no-op/build.gradle b/android/no-op/build.gradle index 7301ca4187a..ac84a9a4199 100644 --- a/android/no-op/build.gradle +++ b/android/no-op/build.gradle @@ -8,6 +8,7 @@ apply plugin: 'com.android.library' android { + namespace 'com.facebook.flipper' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion @@ -30,10 +31,3 @@ android { } apply plugin: 'com.vanniktech.maven.publish' - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -artifacts.add('archives', sourcesJar) diff --git a/android/plugins/leakcanary/build.gradle b/android/plugins/leakcanary/build.gradle index 0c6388fb3e9..12bd4693353 100644 --- a/android/plugins/leakcanary/build.gradle +++ b/android/plugins/leakcanary/build.gradle @@ -8,6 +8,7 @@ apply plugin: 'com.android.library' android { + namespace 'com.facebook.flipper.plugins.leakcanary' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion diff --git a/android/plugins/leakcanary2/build.gradle b/android/plugins/leakcanary2/build.gradle index c4a17c37b1b..d141f408df3 100644 --- a/android/plugins/leakcanary2/build.gradle +++ b/android/plugins/leakcanary2/build.gradle @@ -10,6 +10,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { + namespace 'com.facebook.flipper.plugins.leakcanary2' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion diff --git a/android/plugins/litho/build.gradle b/android/plugins/litho/build.gradle index 33b61a525ea..9b8494679ba 100644 --- a/android/plugins/litho/build.gradle +++ b/android/plugins/litho/build.gradle @@ -9,6 +9,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { + namespace 'com.facebook.flipper.plugins.litho' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion diff --git a/android/plugins/network/build.gradle b/android/plugins/network/build.gradle index c4a3cd27a3f..f2e02bdd7da 100644 --- a/android/plugins/network/build.gradle +++ b/android/plugins/network/build.gradle @@ -8,6 +8,7 @@ apply plugin: 'com.android.library' android { + namespace 'com.facebook.flipper.plugins.network' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion diff --git a/android/plugins/retrofit2-protobuf/build.gradle b/android/plugins/retrofit2-protobuf/build.gradle index e48ac8ec529..b807c0de83c 100644 --- a/android/plugins/retrofit2-protobuf/build.gradle +++ b/android/plugins/retrofit2-protobuf/build.gradle @@ -10,6 +10,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { + namespace 'com.facebook.flipper.plugins.retrofit2protobuf' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion diff --git a/android/sample/build.gradle b/android/sample/build.gradle index 123203b200f..ea77a1b5edc 100644 --- a/android/sample/build.gradle +++ b/android/sample/build.gradle @@ -8,6 +8,7 @@ apply plugin: 'com.android.application' android { + namespace 'com.facebook.flipper.sample' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion ndkVersion rootProject.ndkVersion diff --git a/android/third-party/build.gradle b/android/third-party/build.gradle index 8edd35ffaae..6773963e359 100644 --- a/android/third-party/build.gradle +++ b/android/third-party/build.gradle @@ -9,6 +9,7 @@ apply plugin: 'com.android.library' apply from: 'native.gradle' android { + namespace 'com.facebook.flipper.thirdparty' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion diff --git a/android/third-party/overrides/DoubleConversion/build.gradle b/android/third-party/overrides/DoubleConversion/build.gradle index 14c0ecf3217..05f9e986c96 100644 --- a/android/third-party/overrides/DoubleConversion/build.gradle +++ b/android/third-party/overrides/DoubleConversion/build.gradle @@ -8,6 +8,7 @@ apply plugin: 'com.android.library' android { + namespace 'com.doubleconversion' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion ndkVersion rootProject.ndkVersion diff --git a/android/third-party/overrides/Folly/build.gradle b/android/third-party/overrides/Folly/build.gradle index 576ca74b30a..9f089864d51 100644 --- a/android/third-party/overrides/Folly/build.gradle +++ b/android/third-party/overrides/Folly/build.gradle @@ -8,6 +8,7 @@ apply plugin: 'com.android.library' android { + namespace 'com.folly' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion ndkVersion rootProject.ndkVersion diff --git a/android/third-party/overrides/LibEvent/build.gradle b/android/third-party/overrides/LibEvent/build.gradle index 8b58aed452c..7b0b9a184ff 100644 --- a/android/third-party/overrides/LibEvent/build.gradle +++ b/android/third-party/overrides/LibEvent/build.gradle @@ -8,6 +8,7 @@ apply plugin: 'com.android.library' android { + namespace 'com.libevent' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion ndkVersion rootProject.ndkVersion diff --git a/android/third-party/overrides/glog/build.gradle b/android/third-party/overrides/glog/build.gradle index 14c0ecf3217..1ce8c393a03 100644 --- a/android/third-party/overrides/glog/build.gradle +++ b/android/third-party/overrides/glog/build.gradle @@ -8,6 +8,7 @@ apply plugin: 'com.android.library' android { + namespace 'com.glog' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion ndkVersion rootProject.ndkVersion diff --git a/android/tutorial/build.gradle b/android/tutorial/build.gradle index 2ee7e9ee02a..4f55e38b88a 100644 --- a/android/tutorial/build.gradle +++ b/android/tutorial/build.gradle @@ -10,6 +10,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { + namespace 'com.facebook.flipper.sample.tutorial' defaultConfig { applicationId "com.facebook.flipper.sample.tutorial" diff --git a/build.gradle b/build.gradle index 209e119462c..0155e1ac040 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { mavenCentral() } 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 "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION" classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.8.10" diff --git a/gradle.properties b/gradle.properties index 157db801a56..92340ba69cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,3 +33,6 @@ systemProp.org.gradle.internal.http.connectionTimeout=120000 systemProp.org.gradle.internal.http.socketTimeout=120000 android.useAndroidX=true android.enableJetifier=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d040d74f09..bd5c569f737 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -5,7 +5,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip -distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/xplat/build.gradle b/xplat/build.gradle index 71e3e2fa150..450908e6ecf 100644 --- a/xplat/build.gradle +++ b/xplat/build.gradle @@ -8,6 +8,7 @@ apply plugin: 'com.android.library' android { + namespace 'com.facebook.xplat.sonar' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion ndkVersion rootProject.ndkVersion