Skip to content

Commit bd4ee57

Browse files
committed
Merge branch 'annotations'
2 parents 2976f48 + 875f4aa commit bd4ee57

File tree

120 files changed

+3350
-1336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+3350
-1336
lines changed

CHANGELOG.md

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

COMPARISON.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ Otto is another event bus library for Android; actually it's a fork of Guava's E
1212
</tr>
1313
<tr>
1414
<th>Declare event handling methods</th>
15-
<td>Name conventions</td>
15+
<td>Annotations (since 3.0, can be precompiled for best performance)</td>
1616
<td>Annotations</td>
17-
</tr>
17+
</tr>
1818
<tr>
1919
<th>Event inheritance</th>
2020
<td>Yes</td>
2121
<td>Yes</td>
22-
</tr>
22+
</tr>
2323
<tr>
2424
<th>Subscriber inheritance</th>
2525
<td>Yes</td>
@@ -39,26 +39,30 @@ Otto is another event bus library for Android; actually it's a fork of Guava's E
3939
<th>Event delivery in posting thread</th>
4040
<td>Yes (Default)</td>
4141
<td>Yes</td>
42-
</tr>
42+
</tr>
4343
<tr>
4444
<th>Event delivery in main thread</th>
4545
<td>Yes</td>
4646
<td>No</td>
47-
</tr>
47+
</tr>
4848
<tr>
4949
<th>Event delivery in background thread</th>
5050
<td>Yes</td>
5151
<td>No</td>
52-
</tr>
52+
</tr>
5353
<tr>
5454
<th>Asynchronous event delivery</th>
5555
<td>Yes</td>
5656
<td>No</td>
5757
</tr>
5858
</table>
5959

60+
_**Note:** the following information is outdated, preprocessed annotations are much faster than EventBus 2.x, on which the following table is based._
61+
6062
Besides features, performance is another differentiator. To compare performance, we created an Android application, which is also part of this repository (EventBusPerformance). You can also run the app on your phone to benchmark different scenarios.
6163

64+
TODO: Update for EventBus 3 with and without index.
65+
6266
Benchmark results indicate that EventBus is significantly faster in almost every scenario:
6367
<table>
6468
<tr>

EventBus/.classpath

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

EventBus/.project

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

EventBus/AndroidManifest.xml

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

EventBus/build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ apply plugin: 'java'
22
apply plugin: 'maven'
33
apply plugin: 'signing'
44

5-
group = 'de.greenrobot'
6-
version = '2.4.2-SNAPSHOT'
5+
archivesBaseName = 'eventbus'
6+
group = 'org.greenrobot'
7+
version = '3.0.0'
78
sourceCompatibility = 1.7
89

910
def isSnapshot = version.endsWith('-SNAPSHOT')
@@ -48,7 +49,7 @@ javadoc {
4849
failOnError = false
4950
classpath += configurations.provided
5051
title = "EventBus ${version} API"
51-
options.bottom = 'Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2012-2015 <a href="http://greenrobot.de/">greenrobot.de</a>. All Rights Reserved.</i>'
52+
options.bottom = 'Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2012-2016 <a href="http://greenrobot.org">greenrobot.org</a>. All Rights Reserved.</i>'
5253
}
5354

5455
task javadocJar(type: Jar, dependsOn: javadoc) {
@@ -93,13 +94,11 @@ uploadArchives {
9394
} else {
9495
println "Settings sonatypeUsername/sonatypePassword missing/incomplete for ${project.name}"
9596
}
96-
97-
pom.artifactId = 'eventbus'
9897
pom.project {
9998
name 'EventBus'
10099
packaging 'jar'
101100
description 'EventBus is a publish/subscribe event bus optimized for Android .'
102-
url 'https://github.com/greenrobot/EventBus'
101+
url 'http://greenrobot.org/eventbus/'
103102

104103
scm {
105104
url 'https://github.com/greenrobot/EventBus'
@@ -129,7 +128,7 @@ uploadArchives {
129128

130129
organization {
131130
name 'greenrobot'
132-
url 'http://greenrobot.de'
131+
url 'http://greenrobot.org'
133132
}
134133
}
135134
}
-377 KB
Binary file not shown.

EventBus/mybuild.xml

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

EventBus/project.properties

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

EventBus/res/values/strings.xml

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

0 commit comments

Comments
 (0)