diff options
author | Ang Li <ihcinihsdk@google.com> | 2024-03-13 06:03:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-13 06:03:18 +0000 |
commit | d11d7103b0e026bb94dba9052bf0a4360c640312 (patch) | |
tree | 875290a093be9f4f724c05fc57f712bda8fb360d | |
parent | d002a5412349b7d75d2d77fded93a6e72ae58b56 (diff) | |
parent | 56a3af2bb2051ac2a56aaa86cf985dd9a7f683a0 (diff) | |
download | tools-d11d7103b0e026bb94dba9052bf0a4360c640312.tar.gz |
Merge "Imported truth1.4.0 for Robolectric tests update" into main
15 files changed, 692 insertions, 0 deletions
diff --git a/common/m2/Android.bp b/common/m2/Android.bp index 8285c6405..64ee068ab 100644 --- a/common/m2/Android.bp +++ b/common/m2/Android.bp @@ -234,6 +234,12 @@ java_import { sdk_version: "current", } +java_import_host { + name: "truth-1.4.0-prebuilt", + jars: ["repository/com/google/truth/truth/1.4.0/truth-1.4.0.jar"], + sdk_version: "current", +} + java_import { name: "rxjava", jars: [ diff --git a/common/m2/repository/com/google/truth/truth-parent/1.4.0/truth-parent-1.4.0.pom b/common/m2/repository/com/google/truth/truth-parent/1.4.0/truth-parent-1.4.0.pom new file mode 100644 index 000000000..4fd8af0c5 --- /dev/null +++ b/common/m2/repository/com/google/truth/truth-parent/1.4.0/truth-parent-1.4.0.pom @@ -0,0 +1,409 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>com.google.truth</groupId> + <artifactId>truth-parent</artifactId> + <version>1.4.0</version> + <packaging>pom</packaging> + <name>Truth (Parent)</name> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + + <!-- Properties for multiple-artifact deps. --> + <auto-value.version>1.10.4</auto-value.version> + <!-- + We have a separate property for each flavor of Guava (instead of a shared + version without the -android and -jre suffixes) because that lets + Dependabot update our Guava versions. + --> + <guava.android.version>33.0.0-android</guava.android.version> + <!-- + Also, we have this comment in between the 2 flavors of Guava. That's + also to smooth the Dependabot update process: Dependabot generates a + separate PR for each flavor. Even if we approve both at the same + time, one gets submitted before the other, and + the other ends up with a merge conflict. That requires reapprovals. + --> + <guava.jre.version>33.0.0-jre</guava.jre.version> + <gwt.version>2.10.0</gwt.version> + <protobuf.version>3.25.2</protobuf.version> + <!-- Property for protobuf-lite protocArtifact, which isn't a "normal" Maven dep. --> + <!-- TODO(cpovirk): Use protobuf.version instead. But that requires finding the new way to request the Lite runtime. --> + <protobuf-lite.protoc.version>3.1.0</protobuf-lite.protoc.version> + + <!-- Property for an extension, since Maven doesn't have extensionManagement. --> + <os-maven-plugin.version>1.7.1</os-maven-plugin.version> + + <!-- Default to no additional options (for Java 8). Overridden by a profile. --> + <conditionalJavadoc9PlusOptions></conditionalJavadoc9PlusOptions> + </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>com.google.truth</groupId> + <artifactId>truth</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.google.truth.extensions</groupId> + <artifactId>truth-liteproto-extension</artifactId> + <version>${project.version}</version> + </dependency> + <!-- + We could add the other modules of Truth, but there's no need because no + modules depend on them yet. + --> + <dependency> + <!-- + In addition to setting the version of Guava that's used when Truth + depends directly on com.google.common:guava, this section also + overrides the version that's pulled in transitively by guava-gwt + (which is a test-scope dependency of core Truth). The Guava APIs + "missing" in guava-android might cause us problems down the line if we + actually started to run nontrivial GWT tests; I'm not sure. + --> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.android.version}</version> + </dependency> + <dependency> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + <version>3.42.0</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.13.2</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + </dependency> + <dependency> + <groupId>com.google.auto.value</groupId> + <artifactId>auto-value-annotations</artifactId> + <version>${auto-value.version}</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava-gwt</artifactId> + <version>${guava.jre.version}</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava-testlib</artifactId> + <version>${guava.android.version}</version> + </dependency> + <dependency> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_annotations</artifactId> + <version>2.24.1</version> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protobuf.version}</version> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-lite</artifactId> + <version>3.0.1</version> + </dependency> + <dependency> + <groupId>com.google.re2j</groupId> + <artifactId>re2j</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>9.6</version> + </dependency> + <dependency> + <groupId>com.google.jsinterop</groupId> + <artifactId>jsinterop-annotations</artifactId> + <version>2.0.0</version> + </dependency> + </dependencies> + </dependencyManagement> + <description> + Parent metadata for Truth, a Java assertion framework. + </description> + <modules> + <module>core</module> + <module>extensions</module> + </modules> + <prerequisites><maven>3.1.1</maven></prerequisites> + <developers> + <developer> + <id>cgruber</id> + <name>Christian Gruber</name> + <email>christianedwardgruber@gmail.com</email> + <url>http://www.geekinasuit.com/</url> + <roles> + <role>creator</role> + <role>developer</role> + </roles> + <timezone>-8</timezone> + </developer> + <developer> + <id>kak</id> + <name>Kurt Alfred Kluever</name> + <roles> + <role>evolver</role> + <role>developer</role> + </roles> + <timezone>-5</timezone> + </developer> + <developer> + <id>dsaff</id> + <name>David Saff</name> + <roles> + <role>creator</role> + <role>developer</role> + </roles> + <timezone>-5</timezone> + </developer> + <developer> + <id>hagbard</id> + <name>David B</name> + <roles> + <role>creator</role> + <role>developer</role> + </roles> + <timezone>+2</timezone> + </developer> + </developers> + <url>http://github.com/google/truth</url> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <issueManagement> + <system>Github</system> + <url>https://github.com/google/truth/issues</url> + </issueManagement> + <ciManagement> + <system>Jenkins</system> + <url>https://travis-ci.org/google/truth</url> + </ciManagement> + <scm> + <connection>scm:git:git@github.com:google/truth.git</connection> + <url>scm:git:git@github.com:google/truth.git</url> + </scm> + <distributionManagement> + <snapshotRepository> + <id>sonatype-nexus-snapshots</id> + <name>Sonatype Nexus Snapshots</name> + <url>https://oss.sonatype.org/content/repositories/snapshots/</url> + </snapshotRepository> + <repository> + <id>sonatype-nexus-staging</id> + <name>Nexus Release Repository</name> + <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> + </repository> + </distributionManagement> + <build> + <pluginManagement> + <plugins> + <!-- https://stackoverflow.com/a/51093732/28465 --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.12.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>3.5.0</version> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>3.6.3</version> + <configuration> + <additionalOptions> + <additionalOption>-Xdoclint:-html ${conditionalJavadoc9PlusOptions}</additionalOption> + </additionalOptions> + <doctitle>Truth ${project.version}</doctitle> + <windowtitle>Truth ${project.version}</windowtitle> + <quiet>true</quiet> + <notimestamp>true</notimestamp> + <encoding>UTF-8</encoding> + <docencoding>UTF-8</docencoding> + <charset>UTF-8</charset> + <overview>overview.html</overview> + <detectJavaApiLink>false</detectJavaApiLink> + <links> + <!-- TODO(cpovirk): Link to the version that we depend on? --> + <link>https://guava.dev/releases/snapshot-jre/api/docs</link> + <link>https://protobuf.dev/reference/java/api-docs/</link> + <link>https://junit.org/junit4/javadoc/latest/</link> + <link>https://docs.oracle.com/javase/7/docs/api/</link> + </links> + <sourceFileExcludes> + <sourceFileExclude>**/super/**/*.java</sourceFileExclude> + </sourceFileExcludes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>3.3.0</version> <!-- work around ubuntu bug --> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <version>1.23</version> + <configuration> + <annotations>com.google.common.truth.IgnoreJRERequirement</annotations> + <signature> + <groupId>com.toasttab.android</groupId> + <artifactId>gummy-bears-api-19</artifactId> + <version>0.6.1</version> + <!-- TODO(cpovirk): In principle, it would make sense to *also* test compatibility with JDK 1.8, since Truth also has JRE users. --> + </signature> + </configuration> + <executions> + <execution> + <id>check-java-version-compatibility</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.12.1</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + <parameters>true</parameters> + </configuration> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>3.3.0</version> + </plugin> + <plugin> + <artifactId>maven-gpg-plugin</artifactId> + <version>3.1.0</version> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>3.2.5</version> + </plugin> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.4.1</version> + <executions> + <execution> + <id>enforce</id> + <configuration> + <rules> + <requireUpperBoundDeps> + <excludes> + <!-- We have some deps on guava-android and others on guava-jre. --> + <exclude>com.google.guava:guava</exclude> + </excludes> + </requireUpperBoundDeps> + <!-- + Note that this rule would not catch a conflict between, say, + java8 and liteproto, since no Truth module depends on both + of those. If we wanted, we could create such a module. + --> + </rules> + </configuration> + <goals> + <goal>enforce</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>${gwt.version}</version> + </plugin> + <plugin> + <groupId>org.xolstice.maven.plugins</groupId> + <artifactId>protobuf-maven-plugin</artifactId> + <version>0.6.1</version> + </plugin> + </plugins> + </pluginManagement> + </build> + <profiles> + <profile> + <id>sonatype-oss-release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-gpg-plugin</artifactId> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals><goal>sign</goal></goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals><goal>jar</goal></goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-docs</id> + <goals><goal>jar</goal></goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <!-- + Passes JDK 11-12-specific `no-module-directories` flag to Javadoc tool, + which is required to make symbol search work correctly in the generated + pages. + + This flag does not exist on 9-10 and 13+ (https://bugs.openjdk.java.net/browse/JDK-8215582). + + Consider removing it once our release and test scripts are migrated to a recent JDK (17+). + --> + <id>javadocs-jdk11-12</id> + <activation> + <jdk>[11,13)</jdk> + </activation> + <properties> + <maven-javadoc-plugin.additionalJOptions>--no-module-directories</maven-javadoc-plugin.additionalJOptions> + </properties> + </profile> + <profile> + <id>javadocs-jdk9plus</id> + <activation> + <jdk>[9,)</jdk> + </activation> + <properties> + <conditionalJavadocOptions>--frames</conditionalJavadocOptions> + </properties> + </profile> + </profiles> +</project> diff --git a/common/m2/repository/com/google/truth/truth-parent/1.4.0/truth-parent-1.4.0.pom.md5 b/common/m2/repository/com/google/truth/truth-parent/1.4.0/truth-parent-1.4.0.pom.md5 new file mode 100644 index 000000000..58bc84370 --- /dev/null +++ b/common/m2/repository/com/google/truth/truth-parent/1.4.0/truth-parent-1.4.0.pom.md5 @@ -0,0 +1 @@ +57edf7b7fbb5161a494104bd8f756e01
\ No newline at end of file diff --git a/common/m2/repository/com/google/truth/truth-parent/1.4.0/truth-parent-1.4.0.pom.sha1 b/common/m2/repository/com/google/truth/truth-parent/1.4.0/truth-parent-1.4.0.pom.sha1 new file mode 100644 index 000000000..7cf71b4a1 --- /dev/null +++ b/common/m2/repository/com/google/truth/truth-parent/1.4.0/truth-parent-1.4.0.pom.sha1 @@ -0,0 +1 @@ +08b3f870d82e4e34caa1aa94ca03c29d9b40d3d2
\ No newline at end of file diff --git a/common/m2/repository/com/google/truth/truth-parent/maven-metadata.xml b/common/m2/repository/com/google/truth/truth-parent/maven-metadata.xml new file mode 100644 index 000000000..fc41ad48f --- /dev/null +++ b/common/m2/repository/com/google/truth/truth-parent/maven-metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata> + <groupId>com.google.truth</groupId> + <artifactId>truth-parent</artifactId> + <versioning> + <release>1.4.0</release> + <versions> + <version>1.4.0</version> + </versions> + <lastUpdated>20240223211549</lastUpdated> + </versioning> +</metadata> diff --git a/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0-sources.jar b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0-sources.jar Binary files differnew file mode 100644 index 000000000..a6180b701 --- /dev/null +++ b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0-sources.jar diff --git a/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0-sources.jar.md5 b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0-sources.jar.md5 new file mode 100644 index 000000000..e9ae714ab --- /dev/null +++ b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0-sources.jar.md5 @@ -0,0 +1 @@ +6564aaae567edebbdb48512940ca8b95
\ No newline at end of file diff --git a/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0-sources.jar.sha1 b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0-sources.jar.sha1 new file mode 100644 index 000000000..5c21fdcce --- /dev/null +++ b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0-sources.jar.sha1 @@ -0,0 +1 @@ +682be359276a988aa5dabb4d1eb0085ef72ace52
\ No newline at end of file diff --git a/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.jar b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.jar Binary files differnew file mode 100644 index 000000000..a317eef24 --- /dev/null +++ b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.jar diff --git a/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.jar.md5 b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.jar.md5 new file mode 100644 index 000000000..bbe88c826 --- /dev/null +++ b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.jar.md5 @@ -0,0 +1 @@ +92b9c39d552a41eacad2a024c7560de0
\ No newline at end of file diff --git a/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.jar.sha1 b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.jar.sha1 new file mode 100644 index 000000000..86305a117 --- /dev/null +++ b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.jar.sha1 @@ -0,0 +1 @@ +2a9475ed8cf2081b859fda8f9c860d5c449cd9ed
\ No newline at end of file diff --git a/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.pom b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.pom new file mode 100644 index 000000000..4d4481476 --- /dev/null +++ b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.pom @@ -0,0 +1,245 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.google.truth</groupId> + <artifactId>truth-parent</artifactId> + <version>1.4.0</version> + </parent> + <artifactId>truth</artifactId> + <name>Truth Core</name> + <dependencies> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <!-- Required only to test the -gwt sub-artifact. --> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.auto.value</groupId> + <artifactId>auto-value-annotations</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava-gwt</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava-testlib</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_annotations</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <!-- Truth works fine without ASM: It just produces slightly less useful failure messages. Thus, users can exclude ASM if they prefer to reduce dependencies. (For example, ASM will not benefit anyone whose tests run in an Android VM.) Still, we have made it a dependency by default (non-<optional>), both because it provides useful functionality and because we have heard of problems with R8 when it is absent. --> + </dependency> + </dependencies> + <build> + <resources> + <resource> + <directory>src/main/java</directory> + <excludes> + <exclude>**/*.java</exclude> + <exclude>**/*.gwt.xml</exclude> + </excludes> + </resource> + <resource> + <directory>..</directory> + <includes> + <include>LICENSE</include> + </includes> + <targetPath>META-INF</targetPath> + </resource> + </resources> + <testResources> + <testResource><directory>src/test/java</directory></testResource> + </testResources> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/super/**/*.java</exclude> + </excludes> + <testExcludes> + <testExclude>**/super/**/*.java</testExclude> + </testExcludes> + <annotationProcessorPaths> + <path> + <groupId>com.google.auto.value</groupId> + <artifactId>auto-value</artifactId> + <version>${auto-value.version}</version> + </path> + </annotationProcessorPaths> + </configuration> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/super/**</exclude> + <exclude>**/*.gwt.xml</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-gwt-sources</id> + <phase>post-integration-test</phase> + <goals><goal>jar</goal></goals> + <configuration> + <classifier>gwt</classifier> + <classesDirectory>${project.build.directory}/gwt-sources</classesDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/*GwtTest.java</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <executions> + <execution> + <id>gwt-test</id> + <goals><goal>test</goal></goals> + <configuration> + <mode>htmlunit</mode> + <htmlunit>FF</htmlunit> + <productionMode>true</productionMode> + <!-- Fix OutOfMemoryError in Travis. --> + <extraJvmArgs>-Xms3500m -Xmx3500m -Xss1024k</extraJvmArgs> + <sourceLevel>auto</sourceLevel> + <userAgents>gecko1_8</userAgents> + <includes>**/*GwtTest.java</includes> + <!-- Keep these timeouts very large because, if we hit the timeout, the tests silently pass :( --> + <testTimeOut>86400 <!-- seconds --></testTimeOut> + <testMethodTimeout>1440 <!-- minutes --></testMethodTimeout> + </configuration> + </execution> + </executions> + </plugin> + <!-- We need to strip "@Nullable" from the sources that we hand to GWT: + b/183648616. To do that, we have to make a copy of the original + source directory and add that directory as a Maven source root. But + the added root comes *after* the original root, so, in order to make + GWT choose those sources in preference to the originals, we need to + put them in a `super` directory. + + TODO(b/183648616): Once we can use @Nullable from GWT, generate the + GWT jar from the original sources instead of these sources that we + strip @Nullable from. --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>3.5.0</version> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>${project.build.directory}/gwt-sources</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>copy-gwt-files</id> + <phase>generate-sources</phase> + <goals><goal>run</goal></goals> + <configuration> + <target name="copy-gwt-resources"> + <copy toDir="${project.build.directory}/gwt-sources"> + <fileset dir="${project.basedir}/src/main/java"> + <include name="**/super/**/*.java"/> + <include name="**/*.gwt.xml"/> + </fileset> + </copy> + <copy toDir="${project.build.directory}/gwt-sources/com/google/common/truth/super"> + <fileset dir="${project.basedir}/src/main/java"> + <!-- Don't put files under .../super/.../super/... --> + <exclude name="**/super/**/*.java"/> + <!-- Don't put the .gwt.xml under super --> + <exclude name="**/*.gwt.xml"/> + </fileset> + </copy> + <replace token="@Nullable" value=""> + <fileset dir="${project.build.directory}/gwt-sources"> + <include name="**/super/**/*.java"/> + </fileset> + </replace> + <replace token="@NonNull" value=""> + <fileset dir="${project.build.directory}/gwt-sources"> + <include name="**/super/**/*.java"/> + </fileset> + </replace> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>3.5.0</version> + </plugin> + </plugins> + </reporting> + <profiles> + <profile> + <id>java8</id> + <activation> + <jdk>[1.8,)</jdk> + </activation> + <properties> + <javadoc.param>-Xdoclint:none</javadoc.param> + </properties> + </profile> + </profiles> +</project> diff --git a/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.pom.md5 b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.pom.md5 new file mode 100644 index 000000000..73fad6371 --- /dev/null +++ b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.pom.md5 @@ -0,0 +1 @@ +1427eef1796989130e76b0270f211f7d
\ No newline at end of file diff --git a/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.pom.sha1 b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.pom.sha1 new file mode 100644 index 000000000..be42ae179 --- /dev/null +++ b/common/m2/repository/com/google/truth/truth/1.4.0/truth-1.4.0.pom.sha1 @@ -0,0 +1 @@ +6ff4bdfe8a3758a755b52ad894b7d983c88e4850
\ No newline at end of file diff --git a/common/m2/repository/com/google/truth/truth/maven-metadata.xml b/common/m2/repository/com/google/truth/truth/maven-metadata.xml new file mode 100644 index 000000000..db1ac97c7 --- /dev/null +++ b/common/m2/repository/com/google/truth/truth/maven-metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata> + <groupId>com.google.truth</groupId> + <artifactId>truth</artifactId> + <versioning> + <release>1.4.0</release> + <versions> + <version>1.4.0</version> + </versions> + <lastUpdated>20240223211554</lastUpdated> + </versioning> +</metadata> |