Skip to content
This repository has been archived by the owner on Feb 26, 2023. It is now read-only.

Re-add Otto annotation handlers #1134

Merged
merged 1 commit into from Sep 20, 2014
Merged

Re-add Otto annotation handlers #1134

merged 1 commit into from Sep 20, 2014

Conversation

WonderCsabo
Copy link
Member

Fixes #1133.

@yDelouis I think we should quickly resolve the branching issue what i already noted. Until that i would not merge any PRs.

@WonderCsabo
Re-add Otto annotation handlers
7d7213f 
We copy all non-AA annotations when we override a method. This can help
Otto, because it does not read annotations from parent classes. But if a
method is only annotated with Otto annotation, so we do not override it,
the annotation will not be read Otto and the methods will not be called.
To help that case, we re-add Otto handlers, which override (and
annotate) Otto annotated methods in the generated subclass.
yDelouis added a commit that referenced this pull request Sep 20, 2014
@yDelouis
Merge pull request #1134 from WonderCsabo/1133_readdOttoIntegration
a5740e6 
Re-add Otto annotation handlers
@yDelouis yDelouis merged commit a5740e6 into androidannotations:develop Sep 20, 2014
@DayS DayS removed the in progress label Sep 20, 2014
@yDelouis
Copy link
Contributor

Thanks.

@yDelouis yDelouis added this to the 3.2 milestone Sep 20, 2014
@WonderCsabo WonderCsabo deleted the 1133_readdOttoIntegration branch September 20, 2014 17:20
@DayS
Copy link
Contributor

DayS commented Sep 21, 2014

Shouldn't we release this in a hotfix ?

@yDelouis
Copy link
Contributor

Ideally we should. Do you have time to make the release ?
If not, users will have to use the version 3.0 until the release of 3.2 in two weeks.

@DayS
Copy link
Contributor

DayS commented Sep 21, 2014

I should have time to do it today.

However, I'll have to cherry-pick this on a hotfix branch in order to not get back others features (as discussed on another thread)

@WonderCsabo
Copy link
Member Author

I think that is fine. The hotfix branch is created only for the purpose of the hotfix release, and we won't merge that back into develop (since the feature is already on develop, and the hotfix version will be lower then 3.2).

@DayS
Copy link
Contributor

DayS commented Sep 21, 2014

As I'm on it, do you think there is something else to hotfix ?

@WonderCsabo
Copy link
Member Author

I do not think so. There are some bugfixes like #1124 and #1075, but they were present since a long time, so we do not have to hotfix them.

BTW, i just realized that the tag commit must be merged back to develop and master.

@DayS
Copy link
Contributor

DayS commented Sep 21, 2014

Ok, I'm working on it.

FYI I just found this cheatsheet which is pretty clear

@WonderCsabo
Copy link
Member Author

Please note that our hotfix is not a "normal" one, since we already added the commit to the develop branch and some other commits on top of it. Normally, the hotfix commit is introduced on the other branch and later merged into develop.
The cheatsheet is great but the design is horrible. :)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.2
Development

Successfully merging this pull request may close these issues.

Incompatibility with otto library since 3.1
3 participants
@WonderCsabo @yDelouis @DayS