diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1b7303b9e00..2338191a3a55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,6 +55,10 @@ jobs: if: ${{ failure() }} shell: bash run: ./util/print_surefire_reports.sh + - name: 'Integration Test' + if: matrix.java == 11 + shell: bash + run: util/gradle_integration_tests.sh publish_snapshot: name: 'Publish snapshot' diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml new file mode 100644 index 000000000000..405a2b306592 --- /dev/null +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -0,0 +1,10 @@ +name: "Validate Gradle Wrapper" +on: [push, pull_request] + +jobs: + validation: + name: "Validation" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: gradle/wrapper-validation-action@v1 diff --git a/android/guava/pom.xml b/android/guava/pom.xml index 826b88d18182..c6f1f38303f3 100644 --- a/android/guava/pom.xml +++ b/android/guava/pom.xml @@ -1,6 +1,7 @@ + 4.0.0 com.google.guava @@ -209,6 +210,50 @@ + + maven-resources-plugin + + + gradle-module-metadata + compile + + copy-resources + + + target/publish + + + ../../guava + + module.json + + true + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-gradle-module-metadata + + attach-artifact + + + + + target/publish/module.json + module + + + + + + diff --git a/android/pom.xml b/android/pom.xml index 2ee9ed9d21bb..ed5ac3b4b493 100644 --- a/android/pom.xml +++ b/android/pom.xml @@ -23,6 +23,10 @@ 1980-02-01T00:00:00Z UTF-8 + integration + android + HEAD-jre-SNAPSHOT + standard-jvm GitHub Issues @@ -262,6 +266,15 @@ maven-enforcer-plugin 3.0.0-M3 + + maven-resources-plugin + 3.3.1 + + + org.codehaus.mojo + build-helper-maven-plugin + 3.4.0 + diff --git a/guava/module.json b/guava/module.json new file mode 100644 index 000000000000..bf3ee35ba1bf --- /dev/null +++ b/guava/module.json @@ -0,0 +1,287 @@ +{ + "formatVersion": "1.1", + "component": { + "group": "${pom.groupId}", + "module": "${pom.artifactId}", + "version": "${pom.version}", + "attributes": { + "org.gradle.status": "${module.status}" + } + }, + "createdBy": { + "maven": { + "version": "${maven.version}", + "buildId": "${maven.build.version}" + } + }, + "variants": [ + { + "name": "${variant.jvmEnvironment}ApiElements", + "attributes": { + "org.gradle.category": "library", + "org.gradle.dependency.bundling": "external", + "org.gradle.jvm.version": "8", + "org.gradle.jvm.environment": "${variant.jvmEnvironment}", + "org.gradle.libraryelements": "jar", + "org.gradle.usage": "java-api" + }, + "dependencies": [ + { + "group": "com.google.guava", + "module": "guava-parent", + "version": { + "requires": "${pom.version}" + }, + "attributes": { + "org.gradle.category": "platform" + } + }, + { + "group": "com.google.guava", + "module": "failureaccess", + "version": { + "requires": "1.0.1" + } + }, + { + "group": "com.google.code.findbugs", + "module": "jsr305" + }, + { + "group": "org.checkerframework", + "module": "checker-qual" + }, + { + "group": "com.google.errorprone", + "module": "error_prone_annotations" + }, + { + "group": "com.google.j2objc", + "module": "j2objc-annotations" + } + ], + "files": [ + { + "name": "${project.build.finalName}.jar", + "url": "${project.build.finalName}.jar" + } + ], + "capabilities": [ + { + "group": "com.google.guava", + "name": "guava", + "version": "${pom.version}" + }, + { + "group": "com.google.collections", + "name": "google-collections", + "version": "${pom.version}" + }, + { + "group": "com.google.guava", + "name": "listenablefuture", + "version": "1.0" + } + ] + }, + { + "name": "${variant.jvmEnvironment}RuntimeElements", + "attributes": { + "org.gradle.category": "library", + "org.gradle.dependency.bundling": "external", + "org.gradle.jvm.version": "8", + "org.gradle.jvm.environment": "${variant.jvmEnvironment}", + "org.gradle.libraryelements": "jar", + "org.gradle.usage": "java-runtime" + }, + "dependencies": [ + { + "group": "com.google.guava", + "module": "guava-parent", + "version": { + "requires": "${pom.version}" + }, + "attributes": { + "org.gradle.category": "platform" + } + }, + { + "group": "com.google.guava", + "module": "failureaccess", + "version": { + "requires": "1.0.1" + } + }, + { + "group": "com.google.code.findbugs", + "module": "jsr305" + }, + { + "group": "org.checkerframework", + "module": "checker-qual" + }, + { + "group": "com.google.errorprone", + "module": "error_prone_annotations" + } + ], + "files": [ + { + "name": "${project.build.finalName}.jar", + "url": "${project.build.finalName}.jar" + } + ], + "capabilities": [ + { + "group": "com.google.guava", + "name": "guava", + "version": "${pom.version}" + }, + { + "group": "com.google.collections", + "name": "google-collections", + "version": "${pom.version}" + }, + { + "group": "com.google.guava", + "name": "listenablefuture", + "version": "1.0" + } + ] + }, + { + "name": "${otherVariant.jvmEnvironment}ApiElements", + "attributes": { + "org.gradle.category": "library", + "org.gradle.dependency.bundling": "external", + "org.gradle.jvm.version": "8", + "org.gradle.jvm.environment": "${otherVariant.jvmEnvironment}", + "org.gradle.libraryelements": "jar", + "org.gradle.usage": "java-api" + }, + "dependencies": [ + { + "group": "com.google.guava", + "module": "guava-parent", + "version": { + "requires": "${otherVariant.version}" + }, + "attributes": { + "org.gradle.category": "platform" + } + }, + { + "group": "com.google.guava", + "module": "failureaccess", + "version": { + "requires": "1.0.1" + } + }, + { + "group": "com.google.code.findbugs", + "module": "jsr305" + }, + { + "group": "org.checkerframework", + "module": "checker-qual" + }, + { + "group": "com.google.errorprone", + "module": "error_prone_annotations" + }, + { + "group": "com.google.j2objc", + "module": "j2objc-annotations" + } + ], + "files": [ + { + "name": "${pom.artifactId}-${otherVariant.version}.jar", + "url": "../${otherVariant.version}/${pom.artifactId}-${otherVariant.version}.jar" + } + ], + "capabilities": [ + { + "group": "com.google.guava", + "name": "guava", + "version": "${pom.version}" + }, + { + "group": "com.google.collections", + "name": "google-collections", + "version": "${pom.version}" + }, + { + "group": "com.google.guava", + "name": "listenablefuture", + "version": "1.0" + } + ] + }, + { + "name": "${otherVariant.jvmEnvironment}RuntimeElements", + "attributes": { + "org.gradle.category": "library", + "org.gradle.dependency.bundling": "external", + "org.gradle.jvm.version": "8", + "org.gradle.jvm.environment": "${otherVariant.jvmEnvironment}", + "org.gradle.libraryelements": "jar", + "org.gradle.usage": "java-runtime" + }, + "dependencies": [ + { + "group": "com.google.guava", + "module": "guava-parent", + "version": { + "requires": "${otherVariant.version}" + }, + "attributes": { + "org.gradle.category": "platform" + } + }, + { + "group": "com.google.guava", + "module": "failureaccess", + "version": { + "requires": "1.0.1" + } + }, + { + "group": "com.google.code.findbugs", + "module": "jsr305" + }, + { + "group": "org.checkerframework", + "module": "checker-qual" + }, + { + "group": "com.google.errorprone", + "module": "error_prone_annotations" + } + ], + "files": [ + { + "name": "${pom.artifactId}-${otherVariant.version}.jar", + "url": "../${otherVariant.version}/${pom.artifactId}-${otherVariant.version}.jar" + } + ], + "capabilities": [ + { + "group": "com.google.guava", + "name": "guava", + "version": "${pom.version}" + }, + { + "group": "com.google.collections", + "name": "google-collections", + "version": "${pom.version}" + }, + { + "group": "com.google.guava", + "name": "listenablefuture", + "version": "1.0" + } + ] + } + ] +} diff --git a/guava/pom.xml b/guava/pom.xml index ccbcbd6cb3dd..c7c39a7498c8 100644 --- a/guava/pom.xml +++ b/guava/pom.xml @@ -1,6 +1,7 @@ + 4.0.0 com.google.guava @@ -209,6 +210,50 @@ + + maven-resources-plugin + + + gradle-module-metadata + compile + + copy-resources + + + target/publish + + + . + + module.json + + true + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-gradle-module-metadata + + attach-artifact + + + + + target/publish/module.json + module + + + + + + diff --git a/integration-tests/gradle/.gitignore b/integration-tests/gradle/.gitignore new file mode 100644 index 000000000000..f8b92c3aa087 --- /dev/null +++ b/integration-tests/gradle/.gitignore @@ -0,0 +1,2 @@ +.gradle +build diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts new file mode 100644 index 000000000000..2ea35a88d22c --- /dev/null +++ b/integration-tests/gradle/build.gradle.kts @@ -0,0 +1,231 @@ +val runningGradle5 = gradle.gradleVersion.startsWith("5.") + +val guavaVersionJre = + "(.*)".toRegex().find(file("../../pom.xml").readText())?.groups?.get(1)?.value + ?: error("version not found in pom") + +val expectedReducedRuntimeClasspathAndroidVersion = + setOf( + "guava-${guavaVersionJre.replace("jre", "android")}.jar", + "failureaccess-1.0.1.jar", + "jsr305-3.0.2.jar", + "checker-qual-3.33.0.jar", + "error_prone_annotations-2.18.0.jar" + ) +val expectedReducedRuntimeClasspathJreVersion = + setOf( + "guava-$guavaVersionJre.jar", + "failureaccess-1.0.1.jar", + "jsr305-3.0.2.jar", + "checker-qual-3.33.0.jar", + "error_prone_annotations-2.18.0.jar" + ) +val expectedCompileClasspathAndroidVersion = + expectedReducedRuntimeClasspathAndroidVersion + setOf("j2objc-annotations-2.8.jar") +val expectedCompileClasspathJreVersion = + expectedReducedRuntimeClasspathJreVersion + setOf("j2objc-annotations-2.8.jar") + +val extraLegacyDependencies = + setOf( + "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar", + "google-collections-1.0.jar" + ) + +buildscript { + val agpVersion = if (gradle.gradleVersion.startsWith("5.")) "3.6.4" else "7.0.4" + repositories { + google() + mavenCentral() + } + dependencies { + classpath("com.android.tools.build:gradle:$agpVersion") { + exclude( + group = "org.jetbrains.trove4j" + ) // Might not be available on Maven Central and not needed for this test + } + } +} + +subprojects { + if (name.endsWith("Java")) { + apply(plugin = "java-library") + } else { + apply(plugin = "com.android.application") + the().compileSdkVersion(30) + } + + var expectedClasspath = + if (runningGradle5) { + // without Gradle Module Metadata (only the POM is used) + // - variant decision is made based on version suffix (android/jre) and not on the actual + // environment + // - runtime classpath equals the compile classpath + // - dependency conflict with Google Collections is not detected and '9999.0' hack is present + if (name.startsWith("android")) { + expectedCompileClasspathAndroidVersion + extraLegacyDependencies + } else { + expectedCompileClasspathJreVersion + extraLegacyDependencies + } + } else { + // with Gradle Module Metadata + // - variant is chosen based on the actual environment, independent of version suffix + // - reduced runtime classpath is used (w/o annotation libraries) + // - capability conflicts are detected between Google Collections and listenablefuture + if (name.contains("Android") && !name.contains("JreConstraint")) { + when { + name.contains("RuntimeClasspath") -> { + expectedReducedRuntimeClasspathAndroidVersion + } + name.contains("CompileClasspath") -> { + expectedCompileClasspathAndroidVersion + } + else -> { + error("unexpected classpath type: $name") + } + } + } else { + when { + name.contains("RuntimeClasspath") -> { + expectedReducedRuntimeClasspathJreVersion + } + name.contains("CompileClasspath") -> { + expectedCompileClasspathJreVersion + } + else -> { + error("unexpected classpath type: $name") + } + } + } + } + val guavaVersion = + if (name.startsWith("android")) { + guavaVersionJre.replace("jre", "android") + } else { + guavaVersionJre + } + val javaVersion = JavaVersion.VERSION_1_8 + + repositories { + mavenCentral() + mavenLocal() + } + val java = the() + java.targetCompatibility = javaVersion + java.sourceCompatibility = javaVersion + + if (!runningGradle5) { + configurations.all { + resolutionStrategy.capabilitiesResolution { + withCapability("com.google.collections:google-collections") { + candidates + .find { + val idField = + it.javaClass.getDeclaredMethod( + "getId" + ) // reflective access to make this compile with Gradle 5 + (idField.invoke(it) as ModuleComponentIdentifier).module == "guava" + } + ?.apply { select(this) } + } + withCapability("com.google.guava:listenablefuture") { + candidates + .find { + val idField = + it.javaClass.getDeclaredMethod( + "getId" + ) // reflective access to make this compile with Gradle 5 + (idField.invoke(it) as ModuleComponentIdentifier).module == "guava" + } + ?.apply { select(this) } + } + } + } + + if (name.contains("AndroidConstraint")) { + dependencies { + constraints { + "api"("com.google.guava:guava") { + attributes { + // if the Gradle version is 7+, you can use + // TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE + attribute(Attribute.of("org.gradle.jvm.environment", String::class.java), "android") + } + } + } + } + configurations.all { + resolutionStrategy.capabilitiesResolution { + withCapability("com.google.guava:guava") { + candidates + .find { + val variantName = it.javaClass.getDeclaredMethod("getVariantName") + (variantName.invoke(it) as String).contains("android") + } + ?.apply { select(this) } + } + } + } + } + + if (name.contains("JreConstraint")) { + dependencies { + constraints { + "api"("com.google.guava:guava") { + attributes { + // if the Gradle version is 7+, you can use + // TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE + attribute( + Attribute.of("org.gradle.jvm.environment", String::class.java), + "standard-jvm" + ) + } + } + } + } + configurations.all { + resolutionStrategy.capabilitiesResolution { + withCapability("com.google.guava:guava") { + candidates + .find { + val variantName = it.javaClass.getDeclaredMethod("getVariantName") + (variantName.invoke(it) as String).contains("standard-jvm") + } + ?.apply { select(this) } + } + } + } + } + } + + dependencies { + "api"("com.google.collections:google-collections:1.0") + "api"("com.google.guava:listenablefuture:1.0") + "api"("com.google.guava:guava:$guavaVersion") + } + + tasks.register("testClasspath") { + doLast { + val classpathConfiguration = + if (project.name.contains("RuntimeClasspath")) { + if (project.name.endsWith("Java")) configurations["runtimeClasspath"] + else configurations["debugRuntimeClasspath"] + } else if (project.name.contains("CompileClasspath")) { + if (project.name.endsWith("Java")) configurations["compileClasspath"] + else configurations["debugCompileClasspath"] + } else { + error("unexpected classpath type: " + project.name) + } + + val actualClasspath = classpathConfiguration.files.map { it.name }.toSet() + if (actualClasspath != expectedClasspath) { + throw RuntimeException( + """ + Expected: ${expectedClasspath.sorted()} + Actual: ${actualClasspath.sorted()} + """ + .trimIndent() + ) + } + } + } +} diff --git a/integration-tests/gradle/gradle/wrapper/gradle-wrapper.jar b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000000..943f0cbfa754 Binary files /dev/null and b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.jar differ diff --git a/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000000..508322917bdc --- /dev/null +++ b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/gradlew b/integration-tests/gradle/gradlew new file mode 100755 index 000000000000..65dcd68d65c8 --- /dev/null +++ b/integration-tests/gradle/gradlew @@ -0,0 +1,244 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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 +# +# https://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 POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# 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 "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/integration-tests/gradle/gradlew.bat b/integration-tests/gradle/gradlew.bat new file mode 100755 index 000000000000..93e3f59f135d --- /dev/null +++ b/integration-tests/gradle/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@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=. +@rem This is normally unused +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" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +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 execute + +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 + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/integration-tests/gradle/settings.gradle.kts b/integration-tests/gradle/settings.gradle.kts new file mode 100644 index 000000000000..2631637052a0 --- /dev/null +++ b/integration-tests/gradle/settings.gradle.kts @@ -0,0 +1,29 @@ +rootProject.name = "guava-integration-test" + +include("standardJvmCompileClasspathJava") + +include("androidCompileClasspathJava") + +include("standardJvmRuntimeClasspathJava") + +include("androidRuntimeClasspathJava") + +include("standardJvmCompileClasspathAndroid") + +include("androidCompileClasspathAndroid") + +include("standardJvmRuntimeClasspathAndroid") + +include("androidRuntimeClasspathAndroid") + +// Enforce 'android' variant in Java projects via constraint + +include("standardJvmAndroidConstraintCompileClasspathJava") + +include("androidAndroidConstraintCompileClasspathJava") + +// Enforce 'jre' variant in Android projects via constraint + +include("standardJvmJreConstraintCompileClasspathAndroid") + +include("androidJreConstraintCompileClasspathAndroid") diff --git a/pom.xml b/pom.xml index 6491e13d9686..d4056dbe2f95 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,10 @@ 1980-02-01T00:00:00Z UTF-8 + integration + standard-jvm + HEAD-android-SNAPSHOT + android GitHub Issues @@ -256,6 +260,15 @@ maven-enforcer-plugin 3.0.0-M3 + + maven-resources-plugin + 3.3.1 + + + org.codehaus.mojo + build-helper-maven-plugin + 3.4.0 + diff --git a/util/gradle_integration_tests.sh b/util/gradle_integration_tests.sh new file mode 100755 index 000000000000..bf0dc8322db6 --- /dev/null +++ b/util/gradle_integration_tests.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +set -eu + +mvn clean install -DskipTests +mvn clean install -DskipTests -f android + +integration-tests/gradle/gradlew -p integration-tests/gradle wrapper --gradle-version=5.6.4 +integration-tests/gradle/gradlew -p integration-tests/gradle testClasspath +integration-tests/gradle/gradlew -p integration-tests/gradle wrapper --gradle-version=7.0.2 +integration-tests/gradle/gradlew -p integration-tests/gradle testClasspath diff --git a/util/set_version.sh b/util/set_version.sh index 9db8c7ffaba5..6f9abb524bbb 100755 --- a/util/set_version.sh +++ b/util/set_version.sh @@ -8,7 +8,17 @@ if (( $# != 1 )); then fi version="$1" +status="release" +if [[ $version == *"SNAPSHOT"* ]]; then + status="integration" +fi -mvn versions:set versions:commit -DnewVersion="${version}-jre" -mvn versions:set versions:commit -DnewVersion="${version}-android" -f android +mvn versions:set -DnewVersion="${version}-jre" +mvn versions:set -DnewVersion="${version}-android" -f android +mvn versions:set-property -Dproperty=otherVariant.version -DnewVersion="${version}-android" +mvn versions:set-property -Dproperty=otherVariant.version -DnewVersion="${version}-jre" -f android +mvn versions:set-property -Dproperty=module.status -DnewVersion="${status}" +mvn versions:set-property -Dproperty=module.status -DnewVersion="${status}" -f android +mvn versions:commit +mvn versions:commit -f android git commit -am "Set version numbers to ${version}"