Skip to content

Commit fb23e02

Browse files
committed
prepping 2.0.0
1 parent dcd6879 commit fb23e02

File tree

3 files changed

+13
-28
lines changed

3 files changed

+13
-28
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
#### Version: 2.0.0-SNAPSHOT
55

66

7+
#### Version: 2.0.0 - 2016-08-15
8+
same as RC6
9+
710
#### Version: 2.0.0-RC6 - 2016-08-09
811
- **Fix**: `IntBag::get(index)`, ArrayIndexOutOfBoundsException reported size of backing array, not logical size.
912
- **Fix**: Possible IOOB exception when registering more than 64 systems.

README.md

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Artemis-odb
1+
-## Artemis-odb
22

33
[![Join the chat at https://gitter.im/junkdog/artemis-odb](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/junkdog/artemis-odb?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
44
[![Build Status](https://travis-ci.org/junkdog/artemis-odb.svg)](https://travis-ci.org/junkdog/artemis-odb)
@@ -12,7 +12,7 @@ It is mature, actively maintained, and a continuation of the popular [Artemis](h
1212

1313
- Full Android, [HTML5](https://github.com/junkdog/artemis-odb/wiki/GWT), iOS support.
1414
- High performance, GC-friendly, [less boilerplate](https://github.com/junkdog/artemis-odb/wiki/@Wire)!
15-
- Optionally [auto-pooled](https://github.com/junkdog/artemis-odb/wiki/@PooledWeaver) components, and [hotspot optimization](https://github.com/junkdog/artemis-odb/wiki/Hotspot-Optimization) via compile-time [bytecode instrumentation](https://github.com/junkdog/artemis-odb/wiki/Bytecode weaving).
15+
- Optionally [auto-pooled](https://github.com/junkdog/artemis-odb/wiki/@PooledWeaver) components and [hotspot optimization](https://github.com/junkdog/artemis-odb/wiki/Hotspot-Optimization) via compile-time [bytecode instrumentation](https://github.com/junkdog/artemis-odb/wiki/Bytecode weaving).
1616
- Serialize to either [json](https://github.com/junkdog/artemis-odb/wiki/Json Serialization) or [binary](https://github.com/junkdog/artemis-odb/wiki/Kryo-Serialization).
1717
- Easy migration from Artemis clones.
1818

@@ -67,29 +67,14 @@ Share your thoughts and questions with us!
6767

6868
- **[Gitter web chat](https://gitter.im/junkdog/artemis-odb)**
6969
- **[issues](https://github.com/junkdog/artemis-odb/issues)**
70-
- [Google groups](https://groups.google.com/forum/#!forum/artemis-odb)
71-
- [Slick forums](http://slick.ninjacave.com/forum/viewforum.php?f=28)
7270

7371
#### Maven
7472

75-
76-
Anticipating 2.0.0: minor API changes may still occur
77-
7873
```xml
7974
<dependency>
8075
<groupId>net.onedaybeard.artemis</groupId>
8176
<artifactId>artemis-odb</artifactId>
82-
<version>2.0.0-RC6</version>
83-
</dependency>
84-
```
85-
86-
Or, the safe route:
87-
88-
```xml
89-
<dependency>
90-
<groupId>net.onedaybeard.artemis</groupId>
91-
<artifactId>artemis-odb</artifactId>
92-
<version>1.4.0</version>
77+
<version>2.0.0</version>
9378
</dependency>
9479
```
9580

@@ -98,16 +83,11 @@ See [weave automation](https://github.com/junkdog/artemis-odb/wiki/Weave-Automat
9883
#### Gradle
9984

10085
```groovy
101-
dependencies { compile "net.onedaybeard.artemis:artemis-odb:2.0.0-RC6" }
102-
```
103-
or
104-
105-
```groovy
106-
dependencies { compile "net.onedaybeard.artemis:artemis-odb:1.4.0" }
86+
dependencies { compile "net.onedaybeard.artemis:artemis-odb:2.0.0" }
10787
```
10888

10989
#### Manual Download
11090

111-
- [Main library](http://repo1.maven.org/maven2/net/onedaybeard/artemis/artemis-odb/2.0.0-RC6/)
112-
- [Command-line tool](http://repo1.maven.org/maven2/net/onedaybeard/artemis/artemis-odb-cli/2.0.0-RC6/)
91+
- [Main library](http://repo1.maven.org/maven2/net/onedaybeard/artemis/artemis-odb/2.0.0/)
92+
- [Command-line tool](http://repo1.maven.org/maven2/net/onedaybeard/artemis/artemis-odb-cli/2.0.0/)
11393

artemis/src/main/java/com/artemis/utils/BitVector.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,10 @@ public IntBag toIntBag(IntBag out) {
353353
int[] data = out.getData();
354354
for (int i = 0, index = 0; count > index; i++) {
355355
long bitset = words[i];
356+
int wordBits = i << 6;
356357
while (bitset != 0) {
357358
long t = bitset & -bitset;
358-
data[index] = (i << 6) + Long.bitCount(t - 1);
359+
data[index] = wordBits + Long.bitCount(t - 1);
359360
bitset ^= t;
360361

361362
index++;
@@ -385,9 +386,10 @@ public IntBag toIntBagIdCid(ComponentManager cm, IntBag out) {
385386
int[] data = out.getData();
386387
for (int i = 0, index = 0; count > index; i++) {
387388
long bitset = words[i];
389+
int wordBits = i << 6;
388390
while (bitset != 0) {
389391
long t = bitset & -bitset;
390-
int id = (i << 6) + Long.bitCount(t - 1);
392+
int id = wordBits + Long.bitCount(t - 1);
391393
data[index] = id;
392394
data[index + 1] = cm.getIdentity(id);
393395
index += 2;

0 commit comments

Comments
 (0)