search

google / google-authenticator-android

Open source fork of the Google Authenticator Android app
https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2
Apache License 2.0
1.59k stars 471 forks source link

Update Android Gradle plugin to 3.2.0 #84

Closed MrPickles closed 5 years ago

MrPickles commented 6 years ago

This PR change the build files to work with the latest of the Gradle tools that came out with Android Studio 3.2

ThomasHabets commented 6 years ago

There appears to be a merge conflict with this pull request (says github). Could you please fix?

MrPickles commented 6 years ago

Hmm strange. It shows no merge conflict from my perspective.

no merge conflict

ThomasHabets commented 6 years ago

Strange. I get "This branch cannot be rebased due to conflicts Rebasing the commits of this branch on top of the base branch cannot be performed automatically due to conflicts encountered while reapplying the individual commits from the head branch".

I'm on the road but will take care of this in a few days.

MrPickles commented 6 years ago

Sure, no rush. Additionally, I think we should get me write access to this repo. I'll chat with you internally about this.