diff options
author | Yigit Boyar <yboyar@google.com> | 2015-10-30 16:28:34 -0700 |
---|---|---|
committer | Yigit Boyar <yboyar@google.com> | 2015-11-04 12:04:29 -0800 |
commit | d437f7eeb199ed9bf9fb9bed664258dbbcd87130 (patch) | |
tree | a39cdeb4bc302a8ae307312dd3e88dea98cef341 /developmentPlugins | |
parent | f3322decde1932026b8c2dd4d367348175a2a7ea (diff) | |
download | data-binding-d437f7eeb199ed9bf9fb9bed664258dbbcd87130.tar.gz |
Use publish from android build tools
This CL removes data binding's bintray plugin and starts using
the tools project. It can be uploaded to bintray only from tools
project.
databinding.properties file still reference rc3. We'll change it
when rc5 is public.
Change-Id: Id5801e488ae30cf0003372b5ae94f01306fbfa99
Diffstat (limited to 'developmentPlugins')
8 files changed, 0 insertions, 461 deletions
diff --git a/developmentPlugins/bintrayPlugin/build.gradle b/developmentPlugins/bintrayPlugin/build.gradle deleted file mode 100644 index ebc1f4be..00000000 --- a/developmentPlugins/bintrayPlugin/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -apply plugin: 'groovy' - -repositories { - mavenCentral() -} - -dependencies { - compile gradleApi() - testCompile group: 'junit', name: 'junit', version: '4.12' -} - -uploadArchives { - repositories { - mavenDeployer { - pom.artifactId = 'bintray' - } - } -}
\ No newline at end of file diff --git a/developmentPlugins/bintrayPlugin/gradle/wrapper/gradle-wrapper.jar b/developmentPlugins/bintrayPlugin/gradle/wrapper/gradle-wrapper.jar Binary files differdeleted file mode 100644 index 0087cd3b..00000000 --- a/developmentPlugins/bintrayPlugin/gradle/wrapper/gradle-wrapper.jar +++ /dev/null diff --git a/developmentPlugins/bintrayPlugin/gradle/wrapper/gradle-wrapper.properties b/developmentPlugins/bintrayPlugin/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 72508b40..00000000 --- a/developmentPlugins/bintrayPlugin/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Fri Jul 10 10:59:20 PDT 2015 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/developmentPlugins/bintrayPlugin/gradlew b/developmentPlugins/bintrayPlugin/gradlew deleted file mode 100755 index 91a7e269..00000000 --- a/developmentPlugins/bintrayPlugin/gradlew +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# 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 -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# 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\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - -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" ] ; 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"` - - # 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 - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/developmentPlugins/bintrayPlugin/gradlew.bat b/developmentPlugins/bintrayPlugin/gradlew.bat deleted file mode 100644 index aec99730..00000000 --- a/developmentPlugins/bintrayPlugin/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@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
-
-@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=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@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 Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_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=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-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
diff --git a/developmentPlugins/bintrayPlugin/src/main/groovy/android/databinding/BintrayPlugin.groovy b/developmentPlugins/bintrayPlugin/src/main/groovy/android/databinding/BintrayPlugin.groovy deleted file mode 100644 index fe9d1b10..00000000 --- a/developmentPlugins/bintrayPlugin/src/main/groovy/android/databinding/BintrayPlugin.groovy +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.databinding - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.publication.maven.internal.ant.DefaultGroovyMavenDeployer -import org.gradle.api.tasks.Upload - -class BintrayPlugin implements Plugin<Project> { - public static final USER_PROP = "bintrayUser" - public static final API_KEY_PROP = "bintrayApiKey" - public static final DEFAULT_TASK_NAME = "uploadToBintray" - - @Override - void apply(Project target) { - def taskName = DEFAULT_TASK_NAME - String user = target.getProperties().get(USER_PROP) - String apiKey = target.getProperties().get(API_KEY_PROP) - def uploadArchivesTask = target.tasks.findByName("uploadArchives") - if (uploadArchivesTask == null) { - throw new RuntimeException("Cannot find uploadArchives task in $target") - } - Upload uploadTask = uploadArchivesTask - def bintrayTask = target.tasks.create(taskName, UploadToBintrayTask, { - it.dependsOn uploadTask - it.apiKey = apiKey - it.username = user - }) - target.afterEvaluate({ - def mavenDeployerRepo = uploadTask.repositories.findByName("mavenDeployer") - if (mavenDeployerRepo == null) { - throw new RuntimeException("Cannot find maven deployer repository") - } - DefaultGroovyMavenDeployer mavenDeployer = mavenDeployerRepo - mavenDeployer.pom.whenConfigured({ - bintrayTask.configureFrom(mavenDeployer) - }) - }) - - - } -} diff --git a/developmentPlugins/bintrayPlugin/src/main/groovy/android/databinding/UploadToBintrayTask.groovy b/developmentPlugins/bintrayPlugin/src/main/groovy/android/databinding/UploadToBintrayTask.groovy deleted file mode 100644 index 0515c4e0..00000000 --- a/developmentPlugins/bintrayPlugin/src/main/groovy/android/databinding/UploadToBintrayTask.groovy +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.databinding; - -import org.gradle.api.DefaultTask -import org.gradle.api.artifacts.maven.MavenPom -import org.gradle.api.file.FileCollection -import org.gradle.api.publication.maven.internal.ant.DefaultGroovyMavenDeployer -import org.gradle.api.tasks.Input; -import org.gradle.api.tasks.TaskAction; -import groovy.json.JsonSlurper; - -public class UploadToBintrayTask extends DefaultTask { - static final String API_URL = "https://api.bintray.com"; - static final String PACKAGE_HEADER = "X-Bintray-Package" - static final String VERSION_HEADER = "X-Bintray-Version" - static final String PUBLISH_HEADER = "X-Bintray-Publish" - static final String OVERRIDE_HEADER = "X-Bintray-Override" - static final String EXPLODE_HEADER = "X-Bintray-Explode" - static final String CONTENT_PREFIX = "content/android/android-tools" - String username; - String apiKey; - String pkg; - String version; - FileCollection localFiles; - String mavenRepoAbsPath; - String targetPath; - public void configureFrom(DefaultGroovyMavenDeployer deployer) { - String repoUrl = deployer.repository.url - if (repoUrl == null) { - throw new RuntimeException("Cannot find repo url for $deployer") - } - - def pom = deployer.pom - pkg = pom.groupId + "." + pom.artifactId - version = pom.version - mavenRepoAbsPath = repoUrl - targetPath = "${pkg.replaceAll("\\.", "/")}/${version}" - localFiles = project.fileTree(mavenRepoAbsPath + "/" + targetPath) - } - @TaskAction - public void upload() { - if (username == null || apiKey == null) { - throw new IllegalArgumentException("You should pass your bintray user and " + - "api key as params e.g. ./gradlew ${BintrayPlugin.DEFAULT_TASK_NAME}" + - " -P${BintrayPlugin.USER_PROP}=<my username>" + - " -P${BintrayPlugin.API_KEY_PROP}=<my api key>") - } - println(log()) - for (File localFile : localFiles) { - def p = ['curl', '-u', "$username:$apiKey", "-H", - "$PACKAGE_HEADER: $pkg", "-H", "$VERSION_HEADER: $version", - "-X", "PUT", "--data-binary", "@${localFile.getAbsolutePath()}", - "$API_URL/$CONTENT_PREFIX/$targetPath/${localFile.name}"] - println("executing $p") - def execute = p.execute() - execute.waitFor() - if (execute.exitValue() != 0) { - throw new RuntimeException("failed to upload artifact. error: ${execute.err.text}") - } - def responseText = execute.text - def json = new JsonSlurper().parseText(responseText) - if (json.getAt("message") != "success" && json.getAt("message") != null) { - throw new RuntimeException("Cannot upload artifact. Error response: " + - "${json.getAt("message")} ${responseText}") - } - println("uploaded $localFile") - } - } - - public String log() { - return "UploadToBintrayTask{" + - "username='" + username + '\'' + - ", apiKey='" + apiKey + '\'' + - ", pkg='" + pkg + '\'' + - ", version='" + version + '\'' + - ", localFile=" + localFiles + - ", mavenRepo=" + mavenRepoAbsPath + - '}'; - } -} diff --git a/developmentPlugins/bintrayPlugin/src/main/resources/META-INF/gradle-plugins/com.android.databinding.bintray.properties b/developmentPlugins/bintrayPlugin/src/main/resources/META-INF/gradle-plugins/com.android.databinding.bintray.properties deleted file mode 100644 index 3cf2d8cd..00000000 --- a/developmentPlugins/bintrayPlugin/src/main/resources/META-INF/gradle-plugins/com.android.databinding.bintray.properties +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2015 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -implementation-class=android.databinding.BintrayPlugin
\ No newline at end of file |