Skip to content
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

MOE Sync 2020-01-28 #1726

Merged
merged 7 commits into from
Jan 28, 2020
Merged

MOE Sync 2020-01-28 #1726

merged 7 commits into from
Jan 28, 2020

Conversation

cpovirk
Copy link
Member

@cpovirk cpovirk commented Jan 28, 2020

This code has been reviewed and submitted internally. Feel free to discuss on
the PR, and we can submit follow-up changes as necessary.

Commits:

Dagger AndroidX Migration

Update imports and dependencies to use AndroidX APIs.
For backwards compatibility, produce two new artifacts,
"dagger-android-legacy" and "dagger-android-support-legacy" that are
dejetified artifacts of the AndroidX versions.

Resolves #1652
Resolves #1619
Resolves #1489
Resolves #1444
Resolves #1313
Resolves #1271
Resolves #1248
Resolves #1264

Co-authored-by: Zac Sweers zsweers@slack-corp.com

RELNOTES=Migrate dagger-android to AndroidX.

f3f437a


Move identifiernamestring to proguard config.

This moves the identifiernamestring directly to the shipped proguard
config. R8 is the default now, so this should be safe to enable by
default at this point but the flag is not yet updated in this change.

This change is important also because the current implementation was not
compatible with incremental annotation processing, and would force full
rebuilds if stringKeys() was enabled. This was because it did not report
originating elements. Since it's also a hardcoded construct and not
attached to a particular element, it would have nothing to originate
from even if we did wanted to add them.

Closes #1720

RELNOTES=Generate 'identifiernamestring' r8 rule by default.

1ec249e


Automated g4 rollback of changelist 291056440.

*** Original change description ***

Move identifiernamestring to proguard config.

This moves the identifiernamestring directly to the shipped proguard
config. R8 is the default now, so this should be safe to enable by
default at this point but the flag is not yet updated in this change.

This change is important also because the current implementation was not
compatible with incremental annotation processing, and would force full
rebuilds if stringKeys() was enabled. This was because it did not report
originating elements. Sinc...


df8622f


Add dependencies for internal-only change.

RELNOTES=N/A

51764b5


Use guava "-android" artifacts for "guava_jdk5" deps.

Previously, we were replacing "//third_party/java/android_libs/guava_jdk5" with the non-android artifact, which can cause build issues for android libraries. This CL switches over to use the "guava:*-android" artifact for guava used with android_libraries.

RELNOTES=N/A

d025b20


Shuffling from internal-only change.

RELNOTES=N/A

b75e8ad


Roll forward of 291056440.

Automated g4 rollback of changelist 291398481.

*** Original change description ***

Automated g4 rollback of changelist 291056440.

*** Original change description ***

Move identifiernamestring to proguard config.

This moves the identifiernamestring directly to the shipped proguard
config. R8 is the default now, so this should be safe to enable by
default at this point but the flag is not yet updated in this change.

This change is important also because the current implementation was not
compatible with incremen...


d9a5119

danysantiago and others added 7 commits January 28, 2020 17:27
Update imports and dependencies to use AndroidX APIs.
For backwards compatibility, produce two new artifacts,
"dagger-android-legacy" and "dagger-android-support-legacy" that are
dejetified artifacts of the AndroidX versions.

Resolves #1652
Resolves #1619
Resolves #1489
Resolves #1444
Resolves #1313
Resolves #1271
Resolves #1248
Resolves #1264

Co-authored-by: Zac Sweers <zsweers@slack-corp.com>

RELNOTES=Migrate dagger-android to AndroidX.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=291051989
This moves the `identifiernamestring` directly to the shipped proguard
config. R8 is the default now, so this should be safe to enable by
default at this point but the flag is not yet updated in this change.

This change is important also because the current implementation was not
compatible with incremental annotation processing, and would force full
rebuilds if stringKeys() was enabled. This was because it did not report
originating elements. Since it's also a hardcoded construct and not
attached to a particular element, it would have nothing to originate
from even if we did wanted to add them.

Closes #1720

RELNOTES=Generate 'identifiernamestring' r8 rule by default.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=291056440
*** Original change description ***

Move identifiernamestring to proguard config.

This moves the `identifiernamestring` directly to the shipped proguard
config. R8 is the default now, so this should be safe to enable by
default at this point but the flag is not yet updated in this change.

This change is important also because the current implementation was not
compatible with incremental annotation processing, and would force full
rebuilds if stringKeys() was enabled. This was because it did not report
originating elements. Sinc...

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=291398481
RELNOTES=N/A

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=291456493
Previously, we were replacing "//third_party/java/android_libs/guava_jdk5" with the non-android artifact, which can cause build issues for android libraries.  This CL switches over to use the "guava:*-android" artifact for guava used with android_libraries.

RELNOTES=N/A

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=291759173
RELNOTES=N/A

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=291796562
Automated g4 rollback of changelist 291398481.

*** Original change description ***

Automated g4 rollback of changelist 291056440.

*** Original change description ***

Move identifiernamestring to proguard config.

This moves the `identifiernamestring` directly to the shipped proguard
config. R8 is the default now, so this should be safe to enable by
default at this point but the flag is not yet updated in this change.

This change is important also because the current implementation was not
compatible with incremen...

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=291955453
@googlebot
Copy link
Collaborator

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

@googlebot
Copy link
Collaborator

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

ℹ️ Googlers: Go here for more info.

@danysantiago danysantiago merged commit fa432da into master Jan 28, 2020
@cpovirk cpovirk deleted the sync-master-2020/01/28 branch January 28, 2020 23:01
@tasomaniac
Copy link

Does this really close #1271? That's not about AndroidX migration but more about support out of the box injection of ViewModel.

@danysantiago
Copy link
Member

Ups, this does not close #1271, thanks for pointing it out.

@Drjacky
Copy link

Drjacky commented Feb 1, 2020

@danysantiago Please edit the description of this PR then.

Resolves #1271

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment