Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump tycho-version from 1.7.0 to 2.7.0 #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump tycho-version from 1.7.0 to 2.7.0 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85878ca
Remove dependencies on primitive collection implementations
johnjstuart Mar 15, 2022
0b67717
Bump tycho-version from 1.7.0 to 2.7.0
dependabot[bot] Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions ...ctions/src/main/java/org/eclipse/collections/impl/bag/immutable/AbstractImmutableBag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Goldman Sachs and others.
* Copyright (c) 2022 Goldman Sachs and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* and Eclipse Distribution License v. 1.0 which accompany this distribution.
Expand Down Expand Up @@ -40,20 +40,20 @@
import org.eclipse.collections.api.collection.MutableCollection;
import org.eclipse.collections.api.factory.Bags;
import org.eclipse.collections.api.factory.Lists;
import org.eclipse.collections.api.factory.primitive.BooleanBags;
import org.eclipse.collections.api.factory.primitive.ByteBags;
import org.eclipse.collections.api.factory.primitive.CharBags;
import org.eclipse.collections.api.factory.primitive.DoubleBags;
import org.eclipse.collections.api.factory.primitive.FloatBags;
import org.eclipse.collections.api.factory.primitive.IntBags;
import org.eclipse.collections.api.factory.primitive.LongBags;
import org.eclipse.collections.api.factory.primitive.ShortBags;
import org.eclipse.collections.api.list.ImmutableList;
import org.eclipse.collections.api.list.MutableList;
import org.eclipse.collections.api.map.ImmutableMap;
import org.eclipse.collections.api.partition.bag.PartitionImmutableBag;
import org.eclipse.collections.api.partition.bag.PartitionMutableBag;
import org.eclipse.collections.api.tuple.primitive.ObjectIntPair;
import org.eclipse.collections.impl.bag.mutable.primitive.BooleanHashBag;
import org.eclipse.collections.impl.bag.mutable.primitive.ByteHashBag;
import org.eclipse.collections.impl.bag.mutable.primitive.CharHashBag;
import org.eclipse.collections.impl.bag.mutable.primitive.DoubleHashBag;
import org.eclipse.collections.impl.bag.mutable.primitive.FloatHashBag;
import org.eclipse.collections.impl.bag.mutable.primitive.IntHashBag;
import org.eclipse.collections.impl.bag.mutable.primitive.LongHashBag;
import org.eclipse.collections.impl.bag.mutable.primitive.ShortHashBag;
import org.eclipse.collections.impl.block.factory.Functions;
import org.eclipse.collections.impl.block.factory.Predicates;
import org.eclipse.collections.impl.map.mutable.UnifiedMap;
Expand Down Expand Up @@ -165,49 +165,49 @@ public <P, V> ImmutableBag<V> collectWith(Function2<? super T, ? super P, ? exte
@Override
public ImmutableBooleanBag collectBoolean(BooleanFunction<? super T> booleanFunction)
{
return this.collectBoolean(booleanFunction, new BooleanHashBag()).toImmutable();
return this.collectBoolean(booleanFunction, BooleanBags.mutable.empty()).toImmutable();
}

@Override
public ImmutableByteBag collectByte(ByteFunction<? super T> byteFunction)
{
return this.collectByte(byteFunction, new ByteHashBag()).toImmutable();
return this.collectByte(byteFunction, ByteBags.mutable.empty()).toImmutable();
}

@Override
public ImmutableCharBag collectChar(CharFunction<? super T> charFunction)
{
return this.collectChar(charFunction, new CharHashBag()).toImmutable();
return this.collectChar(charFunction, CharBags.mutable.empty()).toImmutable();
}

@Override
public ImmutableDoubleBag collectDouble(DoubleFunction<? super T> doubleFunction)
{
return this.collectDouble(doubleFunction, new DoubleHashBag()).toImmutable();
return this.collectDouble(doubleFunction, DoubleBags.mutable.empty()).toImmutable();
}

@Override
public ImmutableFloatBag collectFloat(FloatFunction<? super T> floatFunction)
{
return this.collectFloat(floatFunction, new FloatHashBag()).toImmutable();
return this.collectFloat(floatFunction, FloatBags.mutable.empty()).toImmutable();
}

@Override
public ImmutableIntBag collectInt(IntFunction<? super T> intFunction)
{
return this.collectInt(intFunction, new IntHashBag()).toImmutable();
return this.collectInt(intFunction, IntBags.mutable.empty()).toImmutable();
}

@Override
public ImmutableLongBag collectLong(LongFunction<? super T> longFunction)
{
return this.collectLong(longFunction, new LongHashBag()).toImmutable();
return this.collectLong(longFunction, LongBags.mutable.empty()).toImmutable();
}

@Override
public ImmutableShortBag collectShort(ShortFunction<? super T> shortFunction)
{
return this.collectShort(shortFunction, new ShortHashBag()).toImmutable();
return this.collectShort(shortFunction, ShortBags.mutable.empty()).toImmutable();
}

@Override
Expand Down
16 changes: 8 additions & 8 deletions ...llections/src/main/java/org/eclipse/collections/impl/bag/immutable/ImmutableEmptyBag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@
import org.eclipse.collections.api.factory.Lists;
import org.eclipse.collections.api.factory.Maps;
import org.eclipse.collections.api.factory.Sets;
import org.eclipse.collections.api.factory.primitive.BooleanBags;
import org.eclipse.collections.api.factory.primitive.ByteBags;
import org.eclipse.collections.api.factory.primitive.CharBags;
import org.eclipse.collections.api.factory.primitive.DoubleBags;
import org.eclipse.collections.api.factory.primitive.FloatBags;
import org.eclipse.collections.api.factory.primitive.IntBags;
import org.eclipse.collections.api.factory.primitive.LongBags;
import org.eclipse.collections.api.factory.primitive.ShortBags;
import org.eclipse.collections.api.list.MutableList;
import org.eclipse.collections.api.map.ImmutableMap;
import org.eclipse.collections.api.map.MutableMap;
Expand All @@ -71,14 +79,6 @@
import org.eclipse.collections.impl.bag.mutable.HashBag;
import org.eclipse.collections.impl.bag.sorted.mutable.TreeBag;
import org.eclipse.collections.impl.block.factory.Comparators;
import org.eclipse.collections.impl.factory.primitive.BooleanBags;
import org.eclipse.collections.impl.factory.primitive.ByteBags;
import org.eclipse.collections.impl.factory.primitive.CharBags;
import org.eclipse.collections.impl.factory.primitive.DoubleBags;
import org.eclipse.collections.impl.factory.primitive.FloatBags;
import org.eclipse.collections.impl.factory.primitive.IntBags;
import org.eclipse.collections.impl.factory.primitive.LongBags;
import org.eclipse.collections.impl.factory.primitive.ShortBags;
import org.eclipse.collections.impl.map.mutable.UnifiedMap;
import org.eclipse.collections.impl.map.sorted.mutable.TreeSortedMap;
import org.eclipse.collections.impl.multimap.bag.HashBagMultimap;
Expand Down
2 changes: 1 addition & 1 deletion p2-repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- versions used for plug-ins below -->
<tycho-version>1.7.0</tycho-version>
<tycho-version>2.7.0</tycho-version>

<!-- versions of the EBR plug-in to use -->
<ebr-version>1.3.0</ebr-version>
Expand Down