diff --git a/java/dagger/example/gradle/simple/BUILD b/java/dagger/example/gradle/simple/BUILD new file mode 100644 index 00000000000..a4d06f242fe --- /dev/null +++ b/java/dagger/example/gradle/simple/BUILD @@ -0,0 +1,18 @@ +# Copyright (C) 2019 The Dagger Authors. +# +# 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. +# +# Description: +# A skeleton example that uses gradle to test the LOCAL-SNAPSHOTs. + +package(default_visibility = ["//:src"]) diff --git a/java/dagger/example/gradle/simple/SimpleApplication.java b/java/dagger/example/gradle/simple/SimpleApplication.java new file mode 100644 index 00000000000..11552f86931 --- /dev/null +++ b/java/dagger/example/gradle/simple/SimpleApplication.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2019 The Dagger Authors. + * + * 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 dagger.example.gradle.simple; + +import dagger.Component; +import dagger.Module; +import dagger.Provides; +import javax.inject.Inject; +import javax.inject.Singleton; + +/** A simple, skeletal application that defines a simple component. */ +public class SimpleApplication { + static final class Foo { + @Inject Foo() {} + } + + @Module + static final class SimpleModule { + @Provides + static Foo provideFoo() { + return new Foo(); + } + } + + @Singleton + @Component(modules = { SimpleModule.class }) + interface SimpleComponent { + Foo foo(); + } + + public static void main(String[] args) { + Foo foo = DaggerSimpleApplication_SimpleComponent.create().foo(); + } +} diff --git a/java/dagger/example/gradle/simple/build.gradle b/java/dagger/example/gradle/simple/build.gradle new file mode 100644 index 00000000000..c9e59ef2315 --- /dev/null +++ b/java/dagger/example/gradle/simple/build.gradle @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2019 The Dagger Authors. + * + * 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. + */ + +plugins { + id 'java' + id 'application' +} + +repositories { + mavenCentral() + mavenLocal() +} + +sourceSets { + main { + java { + srcDir '.' + } + } +} + +dependencies { + implementation 'com.google.dagger:dagger:LOCAL-SNAPSHOT' + annotationProcessor 'com.google.dagger:dagger-compiler:LOCAL-SNAPSHOT' +} + +mainClassName = 'dagger.example.gradle.simple.SimpleApplication' \ No newline at end of file diff --git a/java/dagger/example/gradle/simple/gradle/wrapper/gradle-wrapper.jar b/java/dagger/example/gradle/simple/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000000..5c2d1cf016b Binary files /dev/null and b/java/dagger/example/gradle/simple/gradle/wrapper/gradle-wrapper.jar differ diff --git a/java/dagger/example/gradle/simple/gradle/wrapper/gradle-wrapper.properties b/java/dagger/example/gradle/simple/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..f4d7b2bf616 --- /dev/null +++ b/java/dagger/example/gradle/simple/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/java/dagger/example/gradle/simple/gradlew b/java/dagger/example/gradle/simple/gradlew new file mode 100644 index 00000000000..b0d6d0ab5de --- /dev/null +++ b/java/dagger/example/gradle/simple/gradlew @@ -0,0 +1,188 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# 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. +# + +############################################################################## +## +## 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='"-Xmx64m" "-Xms64m"' + +# 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" "$@" diff --git a/util/deploy-to-maven-central.sh b/util/deploy-to-maven-central.sh index 1f721a162a6..6d769439ba5 100755 --- a/util/deploy-to-maven-central.sh +++ b/util/deploy-to-maven-central.sh @@ -6,38 +6,38 @@ if [ $# -lt 2 ]; then echo "usage $0 [ ...]" exit 1; fi -key=$1 -version_name=$2 +readonly KEY=$1 +readonly VERSION_NAME=$2 shift 2 -if [[ ! "$version_name" =~ ^2\. ]]; then +if [[ ! "$VERSION_NAME" =~ ^2\. ]]; then echo 'Version name must begin with "2."' exit 2 fi -if [[ "$version_name" =~ " " ]]; then +if [[ "$VERSION_NAME" =~ " " ]]; then echo "Version name must not have any spaces" exit 3 fi -bazel test //... +bash $(dirname $0)/run-local-tests.sh bash $(dirname $0)/execute-deploy.sh \ "gpg:sign-and-deploy-file" \ - "$version_name" \ + "$VERSION_NAME" \ "-DrepositoryId=sonatype-nexus-staging" \ "-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/" \ - "-Dgpg.keyname=${key}" + "-Dgpg.keyname=${KEY}" # Publish javadocs to gh-pages bazel build //:user-docs.jar git clone --quiet --branch gh-pages \ https://github.com/google/dagger gh-pages > /dev/null cd gh-pages -unzip ../bazel-bin/user-docs.jar -d api/$version_name -rm -rf api/$version_name/META-INF/ -git add api/$version_name -git commit -m "$version_name docs" +unzip ../bazel-bin/user-docs.jar -d api/$VERSION_NAME +rm -rf api/$VERSION_NAME/META-INF/ +git add api/$VERSION_NAME +git commit -m "$VERSION_NAME docs" git push origin gh-pages cd .. rm -rf gh-pages @@ -45,11 +45,11 @@ rm -rf gh-pages git checkout --detach # Set the version string that is used as a tag in all of our libraries. If another repo depends on # a versioned tag of Dagger, their java_library.tags should match the versioned release. -sed -i s/'${project.version}'/"${version_name}"/g tools/maven.bzl -git commit -m "${version_name} release" tools/maven.bzl +sed -i s/'${project.version}'/"${VERSION_NAME}"/g tools/maven.bzl +git commit -m "${VERSION_NAME} release" tools/maven.bzl -git tag -a -m "Dagger ${version_name}" dagger-"${version_name}" -git push origin tag dagger-"${version_name}" +git tag -a -m "Dagger ${VERSION_NAME}" dagger-"${VERSION_NAME}" +git push origin tag dagger-"${VERSION_NAME}" # Switch back to the original HEAD git checkout - diff --git a/util/run-local-tests.sh b/util/run-local-tests.sh new file mode 100755 index 00000000000..115f3457d4d --- /dev/null +++ b/util/run-local-tests.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -ex + +# Run tests with bazel +bazel test //... + +# Also run the gradle examples on the local maven snapshots. +readonly _SIMPLE_EXAMPLE_DIR=java/dagger/example/gradle/simple + +util/install-local-snapshot.sh +./$_SIMPLE_EXAMPLE_DIR/gradlew -p $_SIMPLE_EXAMPLE_DIR build --stacktrace +