Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

The great Androidx IF Def'ing of 2019 #8898

Merged
merged 11 commits into from
Jan 10, 2020
Merged

The great Androidx IF Def'ing of 2019 #8898

merged 11 commits into from
Jan 10, 2020

Conversation

PureWeen
Copy link
Contributor

@PureWeen PureWeen commented Dec 15, 2019 •
edited
Loading

Description of Change

Change all the namespaces to AndroidX if you're compiling with Android10
Sets up a multi build so that AndroidX binaries are built on vs2019 and the rest are built on vs2017

This PR is safe to merge and maintain VS 2017 compatibility

Breaking Changes

  • This should have no runtime breaking changes. If you have a project that references 3rd parties libraries that aren't built against AndroidX that shouldn't matter.
  • If you are using custom renderers and start building a MonoAndroid10.0 target then you will get compile time exceptions and be required to change your namepaces to Android X namespaces

Testing Procedure

  • pull down the nuget, set your project to Andorid10, install nuget, report results
  • If users are referencing 3rd party libraries that aren't compiled against AndroidX at all this

PR Checklist

  • Targets the correct branch
  • Tests are passing (or failures are unrelated)

@PureWeen PureWeen changed the title Androidx material The great Androidx IF Def'ing of 2019 Dec 15, 2019
@PureWeen PureWeen force-pushed the androidx_material branch 2 times, most recently from d33ab8e to bda7c92 Compare December 17, 2019 03:58
@jfversluis
Copy link
Member

So close!

##[error]The nuget command failed with exit code(1) and error(Could not find a part of the path 'd:\agent\1\s\Xamarin.Forms.Platform.Android.AppLinks\bin\Debug\MonoAndroid10.0'.)

@PureWeen PureWeen force-pushed the androidx_material branch 2 times, most recently from 897893b to 448f5fe Compare December 18, 2019 00:45
@PureWeen PureWeen changed the base branch from master to android_q December 18, 2019 00:46
PureWeen
PureWeen commented Dec 27, 2019
View reviewed changes
azure-pipelines.yml Outdated Show resolved Hide resolved
@PureWeen PureWeen marked this pull request as ready for review December 27, 2019 19:45
@PureWeen PureWeen added the DO-NOT-MERGE-!!! 🛑 This is in progress and needs to be updated before it can be merged. label Dec 27, 2019
@jfversluis
Copy link
Member

Did a File > New > Blank XF project, added this NuGet, changed target to 10.0 but I can't seem to get passed this build error

/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Android/Xamarin.Android.Common.targets(3,3): Error: java.lang.IllegalArgumentException: already added : Landroid/support/customtabs/ICustomTabsCallback; (AndroidXTest.Android)

Anything I am doing wrong?

jfversluis
jfversluis approved these changes Jan 9, 2020
View reviewed changes
Copy link
Member

@jfversluis jfversluis left a comment

Choose a reason for hiding this comment

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

Tried the new NuGet package with a couple of sample projects and they seem to work just fine

@samhouts samhouts added the approved Has two approvals, no pending reviews, and no changes requested label Jan 9, 2020
@PureWeen
Copy link
Contributor Author

All UI tests for this are green

When ran as DEBUG and when ran as release/r8/d8

@PureWeen PureWeen merged commit 5f4f4dd into 4.5.0 Jan 10, 2020
@PureWeen PureWeen deleted the androidx_material branch January 10, 2020 20:35
tuyen-vuduc pushed a commit to NAXAM/Xamarin.Forms that referenced this pull request Jan 14, 2020
Merge branch 'master' of github.com:xamarin/Xamarin.Forms
09eae59 
* 'master' of github.com:xamarin/Xamarin.Forms: (330 commits)
  [Android] Fix color filter usage on API29 (xamarin#9180)
  Add null check to GetIconColor (xamarin#9172)
  Apply cecil fixes to make packages 2017 compatible (xamarin#9145)
  [UWP] Attempt to resolve entry on UWP not correctly calculating the correct height when in a scroll view (xamarin#8214)
  Fixes 7992 Changes UWP DatePicker to show the picker flyout on DatePickerFocus() (xamarin#8056)
  Update bug_report.md (xamarin#8688)
  [android/ios] improve perf when not using Application.Properties (xamarin#8887)
  The great Androidx IF Def'ing of 2019 (xamarin#8898)
  Added IconColor property for managing navigation icon color (xamarin#5185)
  Add UWP display prompt (xamarin#8720)
  fix bad merge
  Fix 8743 - now using specific style in SearchBar [UWP] (xamarin#8773)
  Added the SwipeView tag to the Core Gallery samples (xamarin#8819)
  [Tizen] Shell: FlyoutBackgroundImage, FlyoutBackgroundImageAspect (xamarin#8905)
  [Core] remove array covariant cast for UWP (xamarin#9135)
  [android] remove Anticipator.cs for now (xamarin#8858)
  Update the CarouselView Position setting the CurrentItem (xamarin#7946) fixes xamarin#7924
  send remove events (xamarin#9124)
  [platform] improve perf of PropertyChangedEventArgsExtensions (xamarin#9084)
  Fix SeachBarRenderer CreateNativeControl issue (xamarin#8946)
  ...

# Conflicts:
#	Xamarin.Forms.Core/FontImageSource.cs
@samhouts samhouts added this to the 4.5.0 milestone Jan 22, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@hartez hartez hartez approved these changes

@jfversluis jfversluis jfversluis approved these changes

@Redth Redth Awaiting requested review from Redth

@mattleibow mattleibow Awaiting requested review from mattleibow

@StephaneDelcroix StephaneDelcroix Awaiting requested review from StephaneDelcroix

Assignees

@hartez hartez

@jfversluis jfversluis

Labels
a/carouselview a/collectionview a/shell 🐚 a/visual approved Has two approvals, no pending reviews, and no changes requested ControlGallery p/Android p/UWP
Projects
None yet
Milestone
4.5.0
Development

Successfully merging this pull request may close these issues.
5 participants
@PureWeen @jfversluis @hartez @mattleibow @samhouts