Skip to content

Commit 479ab71

Browse files
author
Vincent Potucek
committed
[rewrite] Apply UpdateMavenWrapper bump maven-wrapper-3.3.4
Signed-off-by: Vincent Potucek <[email protected]>
1 parent 0959db6 commit 479ab71

File tree

7 files changed

+8
-49
lines changed

7 files changed

+8
-49
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ jobs:
5555
- name: 'Test'
5656
shell: bash
5757
run: ./mvnw -B -P!standard-with-extra-repos -Dtoolchain.skip verify -U -Dmaven.javadoc.skip=true -Dsurefire.toolchain.version=${{ matrix.java }} -f $ROOT_POM
58-
- name: 'SanityCheck'
59-
shell: bash
60-
run: ./mvnw -B -P!standard-with-extra-repos -Dtoolchain.skip rewrite:dryRun -U -Dmaven.javadoc.skip=true -Dsurefire.toolchain.version=${{ matrix.java }} -f $ROOT_POM
6158
- name: 'Print Surefire reports'
6259
# Note: Normally a step won't run if the job has failed, but this causes it to
6360
if: ${{ failure() }}

guava-tests/test/com/google/common/collect/StreamsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ public void testStream_optionalDouble() {
275275
}
276276

277277
public void testConcatInfiniteStream() {
278-
assertThat(Stream.concat(Stream.of(1, 2, 3), Stream.generate(() -> 5)).limit(5))
278+
assertThat(Streams.concat(Stream.of(1, 2, 3), Stream.generate(() -> 5)).limit(5))
279279
.containsExactly(1, 2, 3, 5, 5)
280280
.inOrder();
281281
}

guava-tests/test/com/google/common/io/CharSinkTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.io.StringReader;
2929
import java.io.Writer;
3030
import java.util.EnumSet;
31-
import java.util.stream.Stream;
3231
import org.jspecify.annotations.NullUnmarked;
3332

3433
/**
@@ -95,13 +94,13 @@ public void testWriteLines_withDefaultSeparator() throws IOException {
9594
}
9695

9796
public void testWriteLines_stream() throws IOException {
98-
sink.writeLines(Stream.of("foo", "bar", "baz"));
97+
sink.writeLines(ImmutableList.of("foo", "bar", "baz").stream());
9998
String separator = LINE_SEPARATOR.value();
10099
assertEquals("foo" + separator + "bar" + separator + "baz" + separator, sink.getString());
101100
}
102101

103102
public void testWriteLines_stream_separator() throws IOException {
104-
sink.writeLines(Stream.of("foo", "bar", "baz"), "!");
103+
sink.writeLines(ImmutableList.of("foo", "bar", "baz").stream(), "!");
105104
assertEquals("foo!bar!baz!", sink.getString());
106105
}
107106

guava/src/com/google/common/base/Splitter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import static com.google.common.base.Preconditions.checkArgument;
1818
import static com.google.common.base.Preconditions.checkNotNull;
19-
import static com.google.common.collect.Streams.stream;
2019

2120
import com.google.common.annotations.GwtCompatible;
2221
import com.google.common.annotations.GwtIncompatible;
@@ -28,6 +27,7 @@
2827
import java.util.Map;
2928
import java.util.regex.Pattern;
3029
import java.util.stream.Stream;
30+
import java.util.stream.StreamSupport;
3131
import org.jspecify.annotations.Nullable;
3232

3333
/**
@@ -419,7 +419,8 @@ public List<String> splitToList(CharSequence sequence) {
419419
* @since 28.2 (but only since 33.4.0 in the Android flavor)
420420
*/
421421
public Stream<String> splitToStream(CharSequence sequence) {
422-
return stream(split(sequence));
422+
// Can't use Streams.stream() from base
423+
return StreamSupport.stream(split(sequence).spliterator(), false);
423424
}
424425

425426
/**

guava/src/com/google/common/collect/Streams.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public final class Streams {
6666
public static <T extends @Nullable Object> Stream<T> stream(Iterable<T> iterable) {
6767
return (iterable instanceof Collection)
6868
? ((Collection<T>) iterable).stream()
69-
: Streams.stream(iterable);
69+
: StreamSupport.stream(iterable.spliterator(), false);
7070
}
7171

7272
/**

pom.xml

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -184,38 +184,10 @@
184184
<version>${central-publishing-maven-plugin.version}</version>
185185
<extensions>true</extensions>
186186
</plugin>
187-
<plugin>
188-
<groupId>org.openrewrite.maven</groupId>
189-
<artifactId>rewrite-maven-plugin</artifactId>
190-
</plugin>
191187
</plugins>
192188
<pluginManagement>
193189
<plugins>
194-
<plugin>
195-
<groupId>org.openrewrite.maven</groupId>
196-
<artifactId>rewrite-maven-plugin</artifactId>
197-
<version>6.23.0</version>
198-
<configuration>
199-
<activeRecipes>
200-
<recipe>com.google.openrewrite.SanityCheck</recipe>
201-
</activeRecipes>
202-
<exportDatatables>true</exportDatatables>
203-
<failOnDryRunResults>true</failOnDryRunResults>
204-
</configuration>
205-
<dependencies>
206-
<dependency>
207-
<groupId>org.openrewrite.recipe</groupId>
208-
<artifactId>rewrite-migrate-java</artifactId>
209-
<version>3.21.2</version>
210-
</dependency>
211-
<!-- <dependency>-->
212-
<!-- <groupId>org.openrewrite.recipe</groupId>-->
213-
<!-- <artifactId>rewrite-rewrite</artifactId>-->
214-
<!-- <version>0.15.0</version>-->
215-
<!-- </dependency>-->
216-
</dependencies>
217-
</plugin>
218-
<plugin>
190+
<plugin>
219191
<artifactId>maven-antrun-plugin</artifactId>
220192
<version>${maven-antrun-plugin.version}</version>
221193
</plugin>

rewrite.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)