Skip to content

Commit

Permalink
Merge branch 'annotations'
Browse files Browse the repository at this point in the history
  • Loading branch information
greenrobot committed Feb 4, 2016
2 parents 2976f48 + 875f4aa commit bd4ee57
Show file tree
Hide file tree
Showing 120 changed files with 3,350 additions and 1,336 deletions.
70 changes: 0 additions & 70 deletions CHANGELOG.md

This file was deleted.

16 changes: 10 additions & 6 deletions COMPARISON.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ Otto is another event bus library for Android; actually it's a fork of Guava's E
</tr>
<tr>
<th>Declare event handling methods</th>
<td>Name conventions</td>
<td>Annotations (since 3.0, can be precompiled for best performance)</td>
<td>Annotations</td>
</tr>
</tr>
<tr>
<th>Event inheritance</th>
<td>Yes</td>
<td>Yes</td>
</tr>
</tr>
<tr>
<th>Subscriber inheritance</th>
<td>Yes</td>
Expand All @@ -39,26 +39,30 @@ Otto is another event bus library for Android; actually it's a fork of Guava's E
<th>Event delivery in posting thread</th>
<td>Yes (Default)</td>
<td>Yes</td>
</tr>
</tr>
<tr>
<th>Event delivery in main thread</th>
<td>Yes</td>
<td>No</td>
</tr>
</tr>
<tr>
<th>Event delivery in background thread</th>
<td>Yes</td>
<td>No</td>
</tr>
</tr>
<tr>
<th>Asynchronous event delivery</th>
<td>Yes</td>
<td>No</td>
</tr>
</table>

_**Note:** the following information is outdated, preprocessed annotations are much faster than EventBus 2.x, on which the following table is based._

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.

TODO: Update for EventBus 3 with and without index.

Benchmark results indicate that EventBus is significantly faster in almost every scenario:
<table>
<tr>
Expand Down
9 changes: 0 additions & 9 deletions EventBus/.classpath

This file was deleted.

33 changes: 0 additions & 33 deletions EventBus/.project

This file was deleted.

12 changes: 0 additions & 12 deletions EventBus/AndroidManifest.xml

This file was deleted.

13 changes: 6 additions & 7 deletions EventBus/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'signing'

group = 'de.greenrobot'
version = '2.4.2-SNAPSHOT'
archivesBaseName = 'eventbus'
group = 'org.greenrobot'
version = '3.0.0'
sourceCompatibility = 1.7

def isSnapshot = version.endsWith('-SNAPSHOT')
Expand Down Expand Up @@ -48,7 +49,7 @@ javadoc {
failOnError = false
classpath += configurations.provided
title = "EventBus ${version} API"
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>'
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>'
}

task javadocJar(type: Jar, dependsOn: javadoc) {
Expand Down Expand Up @@ -93,13 +94,11 @@ uploadArchives {
} else {
println "Settings sonatypeUsername/sonatypePassword missing/incomplete for ${project.name}"
}

pom.artifactId = 'eventbus'
pom.project {
name 'EventBus'
packaging 'jar'
description 'EventBus is a publish/subscribe event bus optimized for Android .'
url 'https://github.com/greenrobot/EventBus'
url 'http://greenrobot.org/eventbus/'

scm {
url 'https://github.com/greenrobot/EventBus'
Expand Down Expand Up @@ -129,7 +128,7 @@ uploadArchives {

organization {
name 'greenrobot'
url 'http://greenrobot.de'
url 'http://greenrobot.org'
}
}
}
Expand Down
Binary file removed EventBus/libs/android-support-v4.jar
Binary file not shown.
13 changes: 0 additions & 13 deletions EventBus/mybuild.xml

This file was deleted.

15 changes: 0 additions & 15 deletions EventBus/project.properties

This file was deleted.

2 changes: 0 additions & 2 deletions EventBus/res/values/strings.xml

This file was deleted.

Loading

0 comments on commit bd4ee57

Please sign in to comment.