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..4def9dd56f9d --- /dev/null +++ b/integration-tests/gradle/build.gradle.kts @@ -0,0 +1,210 @@ +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..5c2d1cf016b3 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..0f80bbf516ce --- /dev/null +++ b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +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..83f2acfdc319 --- /dev/null +++ b/integration-tests/gradle/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 +# +# 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 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 or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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/integration-tests/gradle/gradlew.bat b/integration-tests/gradle/gradlew.bat new file mode 100644 index 000000000000..9618d8d9607c --- /dev/null +++ b/integration-tests/gradle/gradlew.bat @@ -0,0 +1,100 @@ +@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=. +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="-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%" == "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 diff --git a/integration-tests/gradle/settings.gradle.kts b/integration-tests/gradle/settings.gradle.kts new file mode 100644 index 000000000000..7d8eafbcf096 --- /dev/null +++ b/integration-tests/gradle/settings.gradle.kts @@ -0,0 +1,19 @@ +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}"