Skip to content

Update everything, remove deprecated stuff from updates, make Travis builds less flaky, and update storage sample #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 31, 2017

Conversation

SUPERCILEX
Copy link
Collaborator

@samtstern Please don't merge yet, I want to do a wee bit of testing with Facebook.

@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@SUPERCILEX SUPERCILEX changed the base branch from master to version-1.2.0-dev January 31, 2017 00:59
@googlebot
Copy link

CLAs look good, thanks!

@@ -347,9 +346,7 @@ public Void then(@NonNull Task<GoogleApiClient> task) throws Exception {
});

// Facebook sign out
if (FacebookSdk.isInitialized()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did something change the Facebook SDK that we no longer need to deal with initialization?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@samtstern Since you noticed, I might as well explain it now instead of in my review. The easiest would be to read Facebook's release notes: https://developers.facebook.com/docs/android/change-log-4x#4_19_0 and the upgrade guide https://developers.facebook.com/docs/android/upgrading-4x#4180to4190.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM

@SUPERCILEX SUPERCILEX changed the title Update everything, remove deprecated stuff from updates, and make Travis builds less flaky Update everything, remove deprecated stuff from updates, make Travis builds less flaky, and update storage sample Jan 31, 2017
@SUPERCILEX
Copy link
Collaborator Author

@samtstern If everything looks good to you, both Facebook login and the storage permission stuff work great so this should be good to merge once the Travis build passes.

@SUPERCILEX
Copy link
Collaborator Author

@samtstern Urgh. It should be fixed in f501d20 though!

@@ -19,6 +19,10 @@
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_application_id"/>

<meta-data
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SUPERCILEX Could we be inadvertently disabling something in developer's apps? What if they have a conflicting value in their AndroidManifest?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@samtstern cc4b64b is the best solution I can come up with. Since we are upgrading the Facebook sdk for people, they will expect the Facebook upgrade guide (remove the initializeApp) to work. With this latest commit, that will still work, but people will have to override our manifest if they want to disable it:

<meta-data
    android:name="com.facebook.sdk.AutoLogAppEventsEnabled"
    android:value="false"
    tools:replace="android:value"/>

minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}

debug {
manifestPlaceholders = [enableFbLogging: false]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine, just add a comment here saying this is only for testing. Since in the real world library modules are always compiled in their 'release' variant. So our end users will see enableFbLogging=true always

@samtstern
Copy link
Contributor

@SUPERCILEX the manifest placeholders may not be working in the Robolectric tests, the tests are unhappy again.

@SUPERCILEX
Copy link
Collaborator Author

@samtstern Yeah, I noticed. I thought tests ran in debug mode, but I guess not. I think I'll just have to copy the manifest for the tests.

@SUPERCILEX
Copy link
Collaborator Author

@samtstern I figured it out: ./gradlew check runs testReleaseUnitTest. Now I just have to remove that task from check and we should be good.

@SUPERCILEX
Copy link
Collaborator Author

@samtstern It's working locally, will push and we should be good to go hopefully.

Signed-off-by: Alex Saveau <[email protected]>
@samtstern
Copy link
Contributor

Merging. In the future we should see if we can get release tests running.

@samtstern samtstern merged commit 11280c7 into firebase:version-1.2.0-dev Jan 31, 2017
@SUPERCILEX SUPERCILEX deleted the update branch January 31, 2017 23:09
@SUPERCILEX
Copy link
Collaborator Author

@samtstern Totally agree with you, created facebook/facebook-android-sdk#494 to address this issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants