Update AGP and others, remove mvn publish script in favor of plugin, …

…upgrade Gradle Summary: As titled. Reviewed By: sjkirby Differential Revision: D27933138 fbshipit-source-id: 06d7132266e862421101c0d518fe0a1ac1d2807c
facebook · Apr 26, 2021 · fd05d59 · fd05d59
1 parent e52ba06
commit fd05d59
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 177 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,21 +19,25 @@ apply plugin: 'com.github.ben-manes.versions'
 buildscript {
   apply from: rootProject.file('versions.gradle')
   repositories {
-    jcenter()
+    mavenCentral()
     google()
+    jcenter()
   }
 
   dependencies {
     classpath plugs.agp
     classpath plugs.versions
+    classpath plugs.publish
+    classpath plugs.dokka
   }
 }
 
 allprojects {
   version = property('VERSION_NAME')
   repositories {
-    jcenter()
+    mavenCentral()
     google()
+    jcenter()
   }
 }
 

diff --git a/core/build.gradle b/core/build.gradle
@@ -15,6 +15,7 @@
  */
 
 apply plugin: 'com.android.library'
+apply plugin: "com.vanniktech.maven.publish"
 
 group = 'com.facebook.testing.screenshot'
 
@@ -39,23 +40,23 @@ android {
 
 afterEvaluate {
   generateReleaseBuildConfig.enabled = false
+  tasks.getByName("androidJavadocs") {
+    exclude '**/BUCK'
+  }
 }
 
 dependencies {
-
   compileOnly deps.jsr305
 
   implementation deps.supportAppCompat
   implementation deps.gson
 
   androidTestImplementation deps.dexmaker
   androidTestImplementation deps.dexmakerDx
-
+  androidTestImplementation deps.junit
   androidTestImplementation deps.androidTestRules
   androidTestImplementation deps.espresso
   androidTestImplementation deps.mockito
   androidTestImplementation deps.dexmakerMockito
   androidTestImplementation deps.hamcrest
 }
-
-apply from: rootProject.file("gradle/gradle-mvn-push.gradle")
diff --git a/gradle/gradle-mvn-push.gradle b/gradle/gradle-mvn-push.gradle
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

diff --git a/layout-hierarchy-common/build.gradle b/layout-hierarchy-common/build.gradle
@@ -15,6 +15,7 @@
  */
 
 apply plugin: 'com.android.library'
+apply plugin: "com.vanniktech.maven.publish"
 
 group = 'com.facebook.testing.screenshot'
 
@@ -34,6 +35,9 @@ android {
 
 afterEvaluate {
   generateReleaseBuildConfig.enabled = false
+  tasks.getByName("androidJavadocs") {
+    exclude '**/BUCK'
+  }
 }
 
 dependencies {
@@ -42,4 +46,3 @@ dependencies {
   androidTestImplementation deps.espresso
 }
 
-apply from: rootProject.file("gradle/gradle-mvn-push.gradle")
diff --git a/layout-hierarchy-litho/build.gradle b/layout-hierarchy-litho/build.gradle
@@ -15,6 +15,7 @@
  */
 
 apply plugin: 'com.android.library'
+apply plugin: "com.vanniktech.maven.publish"
 
 group = 'com.facebook.testing.screenshot'
 
@@ -34,6 +35,9 @@ android {
 
 afterEvaluate {
   generateReleaseBuildConfig.enabled = false
+  tasks.getByName("androidJavadocs") {
+    exclude '**/BUCK'
+  }
 }
 
 dependencies {
@@ -44,4 +48,3 @@ dependencies {
   androidTestImplementation deps.espresso
 }
 
-apply from: rootProject.file("gradle/gradle-mvn-push.gradle")
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -16,23 +16,22 @@
 
 buildscript {
   repositories {
-    jcenter()
+    mavenCentral()
     google()
     mavenLocal()
+    jcenter()
   }
   dependencies {
     classpath plugs.kotlin
+    classpath plugs.publish
+    classpath plugs.dokka
   }
 }
 
 apply plugin: 'groovy'
 apply plugin: 'kotlin'
 apply plugin: "java-gradle-plugin"
-
-repositories {
-  jcenter()
-  mavenCentral()
-}
+apply plugin: 'com.vanniktech.maven.publish'
 
 final GENERATED_PACKAGE_NAME = "com.facebook.testing.screenshot.generated"
 final GENERATED_BUILD_DIR =
@@ -61,8 +60,7 @@ task generateBuildConfig {
 dependencies {
   implementation deps.kotlinStdlib
   compileOnly plugs.agp
-
-
+
   testImplementation deps.junit
   testImplementation plugs.agp
   testImplementation deps.mockito
@@ -108,4 +106,3 @@ task py3Tests(type: Exec) {
 }
 
 
-apply from: rootProject.file("gradle/gradle-mvn-push.gradle")
diff --git a/versions.gradle b/versions.gradle
@@ -17,7 +17,7 @@
 ext {
   final screenshotTestVersion = VERSION_NAME
   final dexmakerVersion = "1.4"
-  final lithoVersion = "0.34.0"
+  final lithoVersion = "0.40.0"
 
   versions = [
       kotlin    : '1.3.61',
@@ -27,10 +27,12 @@ ext {
   ]
 
   plugs = [
-      agp        : "com.android.tools.build:gradle:3.6.0",
+      agp        : "com.android.tools.build:gradle:4.1.1",
       screenshot : "com.facebook.testing.screenshot:plugin:$screenshotTestVersion",
       kotlin     : "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
-      versions   : 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
+      versions   : 'com.github.ben-manes:gradle-versions-plugin:0.20.0',
+      publish    : 'com.vanniktech:gradle-maven-publish-plugin:0.14.2',
+      dokka      : 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.30'
   ]
 
   deps = [