Skip to content
This repository has been archived by the owner on Jul 23, 2022. It is now read-only.

X1.2.0 androidx #65

Closed
wants to merge 5 commits into from
Closed

X1.2.0 androidx #65

wants to merge 5 commits into from

Conversation

Buggaboo
Copy link

@Buggaboo Buggaboo commented May 6, 2019

Changes

  • Changed imports to androidx (jetpack)
  • Changed android.app.AlertDialog to androidx's to support theme/styles e.g. material design
  • Upgraded gradle and android plugins

@Guiorgy Guiorgy requested a review from hedzr May 6, 2019 09:41
@hedzr
Copy link
Owner

hedzr commented May 6, 2019

Nice! I do appreciate the work.

x1.2.0 had been held because these reasons:

  1. v1.1.x can work in an androidx project. It seems, several days ago i'd seen/checked.
  2. x1.2.0 has many commits behind of the master/devel branch.
  3. It need more time to delivery another jcenter library and maintain a double-branches series.
  4. I have no plenty of time to write new codes for x1.2.0, and others.

The second pt should be noted here. Therefore, if you completed the works from x1.2.0, it could be not a good start. I'm sure that's my bad. I should have advanced it (x1.2.0) with master/devel branch, that ought to be a better start.

So @Buggaboo, would you like transform to androidx as new-x1.2.0 starting with our newest devel branch? If so, I'll make the branch for your new PR, and, the x1.2.0 can be archived from then on.

@Buggaboo
Copy link
Author

Buggaboo commented May 6, 2019

Sorry, I don't think I understand you completely, you're asking if I want my PR branch to replace x1.2.0?

I can also apply the same changes to the master branch if you like. I require a new release with the androidx and androidx.appcompat.app.AlertDialog changes.

@hedzr
Copy link
Owner

hedzr commented May 6, 2019

well my ado.
shortly, our x1.2.0 is too older than devel. it's not worthy to merge your work. so we can make a new branch named as new-x1.2.0 based on devel, could you please migrate your changes on this new one?

@Buggaboo
Copy link
Author

Buggaboo commented May 6, 2019

Ah, I understand, yes I will send a new PR based on this new new-x1.2.0 branch.

@hedzr
Copy link
Owner

hedzr commented May 6, 2019

💃
There is it: new-x1.2.0.

@Guiorgy
Copy link
Collaborator

Guiorgy commented May 8, 2019

seems we can close this PR as there's #67 instead. Also, @hedzr, how about we remove the old 1.2.0 branch to prevent future confusion? (if theres anything there, we can keep it localy for now)

@Guiorgy Guiorgy closed this May 8, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants