[android] gradle wrapper + publish to maven central (#3561)

* [android] gradle wrapper

[ghstack-poisoned]

* [android] publishing to maven central

[ghstack-poisoned]
Co-authored-by: Ivan Kobzarev <ivankobzarev@fb.com>

android/.gitignore

 local.properties
 **/*.iml
 .gradle
-gradlew*
-gradle/wrapper
 .idea/*
 .externalNativeBuild
 build

android/build.gradle

@@ -24,10 +24,8 @@ allprojects {
         }
 
         dependencies {
-            classpath 'com.android.tools.build:gradle:3.3.2'
-            classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:${GRADLE_BINTRAY_PLUGIN_VERSION}"
-            classpath "com.github.dcendents:android-maven-gradle-plugin:${ANDROID_MAVEN_GRADLE_PLUGIN_VERSION}"
-            classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.9.8"
+            classpath 'com.android.tools.build:gradle:4.1.2'
+            classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2'
         }
     }
 

android/gradle.properties

 ABI_FILTERS=armeabi-v7a,arm64-v8a,x86,x86_64
 
-VERSION_NAME=0.0.1-SNAPSHOT
+VERSION_NAME=0.9.0-SNAPSHOT
 GROUP=org.pytorch
 MAVEN_GROUP=org.pytorch
+SONATYPE_STAGING_PROFILE=orgpytorch
 POM_URL=https://github.com/pytorch/vision/
 POM_SCM_URL=https://github.com/pytorch/vision.git
 POM_SCM_CONNECTION=scm:git:https://github.com/pytorch/vision
@@ -13,11 +14,6 @@ POM_ISSUES_URL=https://github.com/pytorch/vision/issues
 POM_LICENSE_DIST=repo
 POM_DEVELOPER_ID=pytorch
 POM_DEVELOPER_NAME=pytorch
-syncWithMavenCentral=true
-
-GRADLE_BINTRAY_PLUGIN_VERSION=1.8.0
-GRADLE_VERSIONS_PLUGIN_VERSION=0.15.0
-ANDROID_MAVEN_GRADLE_PLUGIN_VERSION=2.1
 
 # Gradle internals
 android.useAndroidX=true

android/gradle/wrapper/gradle-wrapper.properties

+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

android/gradle_scripts/android_maven_install.gradle

-apply plugin: 'com.github.dcendents.android-maven'
-
-version = VERSION_NAME
-group = GROUP
-project.archivesBaseName = POM_ARTIFACT_ID
-
-install {
-    repositories.mavenInstaller {
-        pom.project {
-            name POM_NAME
-            artifactId POM_ARTIFACT_ID
-            packaging POM_PACKAGING
-            description POM_DESCRIPTION
-            url projectUrl
-
-            scm {
-                url scmUrl
-                connection scmConnection
-                developerConnection scmDeveloperConnection
-            }
-
-            licenses {
-              license {
-                name = POM_LICENSE_NAME
-                url = POM_LICENSE_URL
-                distribution = POM_LICENSE_DIST
-              }
-            }
-
-            developers {
-                developer {
-                    id developerId
-                    name developerName
-                }
-            }
-        }
-    }
-}

android/gradle_scripts/android_tasks.gradle

-
-import java.nio.file.Files
-import java.nio.file.Paths
-import java.io.FileOutputStream
-import java.util.zip.ZipFile
-
-// Android tasks for Javadoc and sources.jar generation
-
 afterEvaluate { project ->
     if (POM_PACKAGING == 'aar') {
-        task androidJavadoc(type: Javadoc, dependsOn: assembleDebug) {
-            source += files(android.sourceSets.main.java.srcDirs)
-            failOnError false
-            // This task will try to compile *everything* it finds in the above directory and
-            // will choke on text files it doesn't understand.
-            exclude '**/BUCK'
-            exclude '**/*.md'
-        }
-
-        task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-            classifier = 'javadoc'
-            from androidJavadoc.destinationDir
-        }
-
-        task androidSourcesJar(type: Jar) {
-            classifier = 'sources'
-            from android.sourceSets.main.java.srcDirs
-        }
-
-        android.libraryVariants.all { variant ->
-            def name = variant.name.capitalize()
-            task "jar${name}"(type: Jar, dependsOn: variant.javaCompileProvider) {
-                from variant.javaCompileProvider.get().destinationDir
-            }
-
-            androidJavadoc.doFirst {
-                classpath += files(android.bootClasspath)
-                classpath += files(variant.javaCompileProvider.get().classpath.files)
-                // This is generated by `assembleDebug` and holds the JARs generated by the APT.
-                classpath += fileTree(dir: "$buildDir/intermediates/bundles/debug/", include: '**/*.jar')
-
-                // Process AAR dependencies
-                def aarDependencies = classpath.filter { it.name.endsWith('.aar') }
-                classpath -= aarDependencies
-                aarDependencies.each { aar ->
-                    // Extract classes.jar from the AAR dependency, and add it to the javadoc classpath
-                    def outputPath = "$buildDir/tmp/aarJar/${aar.name.replace('.aar', '.jar')}"
-                    classpath += files(outputPath)
-
-                    // Use a task so the actual extraction only happens before the javadoc task is run
-                    dependsOn task(name: "extract ${aar.name}").doLast {
-                        extractEntry(aar, 'classes.jar', outputPath)
-                    }
-                }
-            }
-        }
-
-        artifacts.add('archives', androidJavadocJar)
-        artifacts.add('archives', androidSourcesJar)
-    }
-
-    if (POM_PACKAGING == 'jar') {
-        task javadocJar(type: Jar, dependsOn: javadoc) {
-            classifier = 'javadoc'
-            from javadoc.destinationDir
-        }
-
-        task sourcesJar(type: Jar, dependsOn: classes) {
-            classifier = 'sources'
-            from sourceSets.main.allSource
-        }
-
-        artifacts.add('archives', javadocJar)
-        artifacts.add('archives', sourcesJar)
-    }
-}
-
-// Utility method to extract only one entry in a zip file
-private def extractEntry(archive, entryPath, outputPath) {
-    if (!archive.exists()) {
-        throw new GradleException("archive $archive not found")
-    }
-
-    def zip = new ZipFile(archive)
-    zip.entries().each {
-        if (it.name == entryPath) {
-            def path = Paths.get(outputPath)
-            if (!Files.exists(path)) {
-                Files.createDirectories(path.getParent())
-                Files.copy(zip.getInputStream(it), path)
+        task headersJar(type: Jar) {
+            archiveClassifier.set('headers')
+            from("$rootDir/cxx/") {
+                include '**/*.h'
             }
         }
+        artifacts.add('archives', headersJar)
     }
-    zip.close()
 }

android/gradle_scripts/bintray.gradle

-apply plugin: 'com.jfrog.bintray'
-
-def getBintrayUsername() {
-    return project.hasProperty('bintrayUsername') ? property('bintrayUsername') : System.getenv('BINTRAY_USERNAME')
-}
-
-def getBintrayApiKey() {
-    return project.hasProperty('bintrayApiKey') ? property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
-}
-
-def getBintrayGpgPassword() {
-    return project.hasProperty('bintrayGpgPassword') ? property('bintrayGpgPassword') : System.getenv('BINTRAY_GPG_PASSWORD')
-}
-
-def getMavenCentralUsername() {
-    return project.hasProperty('mavenCentralUsername') ? property('mavenCentralUsername') : System.getenv('MAVEN_CENTRAL_USERNAME')
-}
-
-def getMavenCentralPassword() {
-    return project.hasProperty('mavenCentralPassword') ? property('mavenCentralPassword') : System.getenv('MAVEN_CENTRAL_PASSWORD')
-}
-
-def shouldSyncWithMavenCentral() {
-    return project.hasProperty('syncWithMavenCentral') ? property('syncWithMavenCentral').toBoolean() : false
-}
-
-def dryRunOnly() {
-    return project.hasProperty('dryRun') ? property('dryRun').toBoolean() : false
-}
-
-bintray {
-    user = getBintrayUsername()
-    key = getBintrayApiKey()
-    override = false
-    configurations = ['archives']
-    pkg {
-        repo = bintrayRepo
-        userOrg = bintrayUserOrg
-        name = bintrayName
-        desc = bintrayDescription
-        websiteUrl = projectUrl
-        issueTrackerUrl = issuesUrl
-        vcsUrl = scmUrl
-        licenses = [ POM_LICENSE_NAME ]
-        dryRun = dryRunOnly()
-        override = false
-        publish = true
-        publicDownloadNumbers = true
-        version {
-            name = versionName
-            desc = bintrayDescription
-            gpg {
-                sign = true
-                passphrase = getBintrayGpgPassword()
-            }
-            mavenCentralSync {
-                sync = shouldSyncWithMavenCentral()
-                user = getMavenCentralUsername()
-                password = getMavenCentralPassword()
-                close = '1' // If set to 0, you have to manually click release
-            }
-        }
-    }
-}

android/gradle_scripts/gradle_maven_push.gradle

-apply plugin: 'signing'
-
-version = VERSION_NAME
-group = MAVEN_GROUP
-
-def isReleaseBuild() {
-  return !VERSION_NAME.contains('SNAPSHOT')
-}
-
-def getReleaseRepositoryUrl() {
-  return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
-      : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-}
-
-def getSnapshotRepositoryUrl() {
-  return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
-      : "https://oss.sonatype.org/content/repositories/snapshots/"
-}
-
-def getRepositoryUsername() {
-  return hasProperty('SONATYPE_NEXUS_USERNAME') ? SONATYPE_NEXUS_USERNAME : ""
-}
-
-def getRepositoryPassword() {
-  return hasProperty('SONATYPE_NEXUS_PASSWORD') ? SONATYPE_NEXUS_PASSWORD : ""
-}
-
-def getHttpProxyHost() {
-  return project.properties['systemProp.http.proxyHost']
-}
-
-def getHttpProxyPort() {
-  return project.properties['systemProp.http.proxyPort']
-}
-
-def needProxy() {
-  return (getHttpProxyHost() != null) && (getHttpProxyPort() != null)
-}
-
-afterEvaluate { project ->
-  uploadArchives {
-    repositories {
-      mavenDeployer {
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-        pom.groupId = MAVEN_GROUP
-        pom.artifactId = POM_ARTIFACT_ID
-        pom.version = VERSION_NAME
-
-        repository(url: getReleaseRepositoryUrl()) {
-          authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-          if (needProxy()) {
-            proxy(host: getHttpProxyHost(), port: getHttpProxyPort() as Integer, type: 'http')
-          }
-        }
-        snapshotRepository(url: getSnapshotRepositoryUrl()) {
-          authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-          if (needProxy()) {
-            proxy(host: getHttpProxyHost(), port: getHttpProxyPort() as Integer, type: 'http')
-          }
-        }
-
-        pom.project {
-          name POM_NAME
-          packaging POM_PACKAGING
-          description POM_DESCRIPTION
-          url POM_URL
-
-          scm {
-            url POM_SCM_URL
-            connection POM_SCM_CONNECTION
-            developerConnection POM_SCM_DEV_CONNECTION
-          }
-
-          licenses {
-            license {
-              name POM_LICENSE_NAME
-              url POM_LICENSE_URL
-              distribution POM_LICENSE_DIST
-            }
-          }
-
-          developers {
-            developer {
-              id POM_DEVELOPER_ID
-              name POM_DEVELOPER_NAME
-            }
-          }
-        }
-      }
-    }
-  }
-
-  signing {
-    required { isReleaseBuild() && gradle.taskGraph.hasTask('uploadArchives') }
-    sign configurations.archives
-  }
-
-}

android/gradle_scripts/release.gradle

 apply from: rootProject.file('gradle_scripts/android_tasks.gradle')
 
-apply from: rootProject.file('gradle_scripts/release_bintray.gradle')
-
-apply from: rootProject.file('gradle_scripts/gradle_maven_push.gradle')
+apply plugin: 'com.vanniktech.maven.publish'

android/gradle_scripts/release_bintray.gradle

-ext {
-    bintrayRepo = 'maven'
-    bintrayUserOrg = 'pytorch'
-    bintrayName = "${GROUP}:${POM_ARTIFACT_ID}"
-    bintrayDescription = POM_DESCRIPTION
-    projectUrl = POM_URL
-    issuesUrl = POM_ISSUES_URL
-    scmUrl = POM_SCM_URL
-    scmConnection = POM_SCM_CONNECTION
-    scmDeveloperConnection = POM_SCM_DEV_CONNECTION
-
-    publishedGroupId = GROUP
-    libraryName = 'torchvision'
-    artifact = 'torchvision'
-
-    developerId = POM_DEVELOPER_ID
-    developerName = POM_DEVELOPER_NAME
-
-    versionName = VERSION_NAME
-
-    projectLicenses = {
-        license = {
-            name = POM_LICENSE_NAME
-            url = POM_LICENSE_URL
-            distribution = POM_LICENSE_DIST
-        }
-    }
-}
-
-apply from: rootProject.file('gradle_scripts/android_maven_install.gradle')
-
-apply from: rootProject.file('gradle_scripts/bintray.gradle')

android/gradlew

+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((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" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+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" "$@"

android/gradlew.bat

+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega