Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Migrate to AndroidX #430

Merged
merged 8 commits into from
Oct 12, 2018
Merged

Migrate to AndroidX #430

merged 8 commits into from
Oct 12, 2018

Conversation

msfjarvis
Copy link
Member

Depends on #429, I've split the PRs in case AndroidX migration is not on the cards for now.

Update gradle and external dependencies
ac3ac18 
- Switch away from deprecated compile directive
- Remove explicit buildToolsVersion, is defined by the gradle plugin now
- Fix build in SelectFolderActivity

Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
@zeapo
Copy link
Contributor

zeapo commented Oct 2, 2018 •
edited
Loading

👍
Would be good to fix the build failure: https://travis-ci.org/zeapo/Android-Password-Store/builds/436031652?utm_source=github_status&utm_medium=notification

@msfjarvis
Copy link
Member Author

On it

Harsh Shandilya added 4 commits October 2, 2018 19:01
Upgrade gradle plugin and wrapper to latest alpha
d9dec81 
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
Don't use alpha gradle plugin
b957830 
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
Migrate to AndroidX
d3c508e 
https://developer.android.com/jetpack/androidx/

Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
Upgrade AndroidX dependencies to stable release
ecdf827 
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
@msfjarvis
Copy link
Member Author

The build failure apparently needs a cache flush over at Travis-CI since I can't reproduce it on a clean VM.

@zeapo
Copy link
Contributor

zeapo commented Oct 12, 2018

@MSF-Jarvis there are some conflicts. I'll take a look at travis later today.

@msfjarvis
Copy link
Member Author

I'll go rebase this

Merge remote-tracking branch 'origin/master' into msf/androidx
77dc673 
* origin/master:
  treewide: Cleanup relevant build warnings (#433)
  Main view: open search view on keyboard press (#432)
  Cancel running DelayShow async tasks (#416) (#431)
  Update gradle and external dependencies (#429)

Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
@msfjarvis
Copy link
Member Author

I also took the liberty to sort some imports in PgpActivity.kt, will be following up with a more comprehensive Kotlin migration PR.

Enable Jetifier
1bd7144 
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
@msfjarvis
Copy link
Member Author

Build should be fixed with this.

SelectFolderFragment: Fix build
648214b 
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
@zeapo
Copy link
Contributor

zeapo commented Oct 12, 2018

Nice! I didn't know about Jetpack, seems that it improves the code readability.

Let @zidhuss know when you're ok with your changes, so that he can test them.

@msfjarvis
Copy link
Member Author

@zeapo I'm done here, no more changes coming into this branch. Further contributuons will be in separate PRs.

@zidhuss
Copy link
Contributor

zidhuss commented Oct 12, 2018

Looks good to me. Thanks for your contribution @MSF-Jarvis !

@zidhuss zidhuss merged commit 483e8d9 into android-password-store:master Oct 12, 2018
@msfjarvis msfjarvis deleted the msf/androidx branch October 12, 2018 14:20
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
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@msfjarvis @zeapo @zidhuss