Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
cba824f
Create more compose packages
4brunu Nov 2, 2021
f73ea95
Add new words to dictionary
4brunu Nov 2, 2021
7cf714a
Merge branch 'main' into feature/more-compose-stable-packages
4brunu Dec 3, 2021
3b517f9
Create more compose packages
4brunu Dec 5, 2021
25547af
bind Xamarin.AndroidX.Lifecycle.ViewModel.Compose
4brunu Feb 2, 2022
46e73f4
Merge branch 'main' into feature/more-compose-stable-packages
4brunu Feb 2, 2022
f804eda
Merge branch 'main' into feature/more-compose-stable-packages
4brunu Feb 23, 2022
8e3c006
Merge branch 'main' into feature/more-compose-stable-packages
4brunu Mar 3, 2022
b881cfb
napier dependency as template set
moljac Mar 22, 2022
5ac7f62
binderate green setup
moljac Mar 24, 2022
8988886
new accompanist template
moljac Mar 24, 2022
53389d4
TFM
moljac Mar 24, 2022
11d7199
TFM
moljac Mar 24, 2022
6fb1a8c
legal stuff added
moljac Mar 24, 2022
34747b1
removed JavaDocJar
moljac Mar 24, 2022
2f1f87e
legal files
moljac Mar 24, 2022
ea0558a
cleanup (moved to source)
moljac Mar 24, 2022
a127eda
MonoAndroid12.0
moljac Mar 24, 2022
ccba5a0
Merge branch 'main' into feature/more-compose-stable-packages
moljac Mar 25, 2022
f2db70d
MonoAndroid12.0
moljac Mar 25, 2022
927ef11
comma fixed (merge errors)
moljac Mar 25, 2022
ace1490
Merge branch 'feature/more-compose-stable-packages' of https://github…
moljac Mar 25, 2022
2fa4fb1
mappings updates
moljac Mar 25, 2022
10f6ddf
MonoAndroid12.0
moljac Mar 25, 2022
ccfc247
Update Xamarin.AndroidX.Migration.props
moljac Mar 25, 2022
aca60a0
Create Licenses and External dependency info for Accompanist and Napier
4brunu Mar 28, 2022
34e9f92
Merge branch 'main' into feature/more-compose-stable-packages
4brunu Mar 28, 2022
a52bfa3
Merge branch 'main' into feature/more-compose-stable-packages
4brunu Mar 29, 2022
4677122
Revert libs versions downgrades
4brunu Mar 29, 2022
7b0eb54
long TFM net6.0-android31.0
moljac Apr 1, 2022
353ffbc
Merge branch 'feature/more-compose-stable-packages' of https://github…
moljac Apr 1, 2022
741722a
Merge branch 'main' into feature/more-compose-stable-packages
moljac Apr 5, 2022
357319a
version bumps to make binderator happy
moljac Apr 5, 2022
0c72a93
mappings
moljac Apr 5, 2022
c181ce2
Merge branch 'main' into feature/more-compose-stable-packages
moljac Apr 5, 2022
ec68d04
Merge branch 'main' into feature/more-compose-stable-packages
moljac Apr 11, 2022
e55b0a7
Merge branch 'main' into feature/more-compose-stable-packages
4brunu Apr 29, 2022
77ec0d4
Fix external dependency info referencing Tink
4brunu Apr 29, 2022
43e1d62
Merge branch 'main' into feature/more-compose-stable-packages
moljac May 3, 2022
50ddc96
Merge branch 'main' into feature/more-compose-stable-packages
4brunu May 11, 2022
59a2c7b
Merge branch 'main' into feature/more-compose-stable-packages
moljac May 17, 2022
2db252c
Merge branch 'main' into feature/more-compose-stable-packages
4brunu May 25, 2022
2f579d5
Merge branch 'main' into feature/more-compose-stable-packages
4brunu May 29, 2022
be19e55
Update config.json
moljac May 30, 2022
18a99d5
Merge branch 'main' into feature/more-compose-stable-packages
4brunu Jun 20, 2022
c23a262
Merge branch 'main' into feature/more-compose-stable-packages
moljac Jun 29, 2022
1979f26
SDK 6.0.301
moljac Jul 8, 2022
69ff054
.NET SDK 6.0.301
moljac Jul 8, 2022
b4a91a9
downgrade .NET SDK 6.0.301 to 6.0.300
moljac Jul 11, 2022
8b154c7
Update global.json
moljac Jul 12, 2022
aa4f1b6
.NET SDK 6.0.300, xcode 13.2.1 et al
moljac Jul 13, 2022
eb378e3
kotlin 1.7.0 fixes
moljac Jul 15, 2022
ae7e8c8
samples refactored
moljac Jul 15, 2022
c0658e4
dotnet (modern/new) samples
moljac Jul 15, 2022
4ff39ad
Merge branch 'main' into feature/more-compose-stable-packages
moljac Jul 16, 2022
8f8f3e6
Update published-namespaces.txt
moljac Jul 16, 2022
c79a0c7
Merge branch 'feature/more-compose-stable-packages' of https://github…
moljac Jul 16, 2022
3b94fd3
Update build.cake
moljac Jul 22, 2022
7efcb6a
kotlin changes reverted
moljac Jul 22, 2022
763011e
guava changes reverted
moljac Jul 22, 2022
1d4c491
Update NuGet.config
moljac Jul 22, 2022
62703cd
Update Directory.Packages.AX.props
moljac Jul 22, 2022
48f0004
net6 xamarin.forms (android only)
moljac Jul 22, 2022
c3149ae
Merge branch 'main' into feature/more-compose-stable-packages
moljac Jul 22, 2022
e4a66b2
xcode merge cleanup
moljac Jul 22, 2022
e8f7431
Merge branch 'main' into feature/more-compose-stable-packages
moljac Jul 24, 2022
c8df489
remove duplicated Xamarin.AndroidX.Activity.Ktx
4brunu Jul 26, 2022
d99ef0a
Remove duplicated dependencies
4brunu Jul 26, 2022
3ddccd3
Update packages
4brunu Jul 26, 2022
ad84428
XamarinDotNetWorkloadSource updated
moljac Jul 26, 2022
73cf9ac
Create workloads.json
moljac Jul 26, 2022
bb5e9de
samples reworked
moljac Jul 26, 2022
01445a1
Merge branch 'feature/more-compose-stable-packages' of https://github…
moljac Jul 26, 2022
be316f1
Merge branch 'main' into feature/more-compose-stable-packages
moljac Jul 29, 2022
88f6680
Xamarin.Google.Guava.ListenableFuture 9999.0.0
moljac Jul 29, 2022
1a285ad
Update NuGet.config
moljac Aug 1, 2022
a14cbef
Merge branch 'main' into feature/more-compose-stable-packages
moljac Aug 6, 2022
d0510ec
fixes after merge
moljac Aug 6, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
360 changes: 268 additions & 92 deletions config.json

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions published-namespaces.txt
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,18 @@ ReactiveX.Subjects
ReactiveX.Subscribers
System.Runtime.CompilerServices
System.Runtime.Versioning
Xamarin.AAkira.Napier
Xamarin.Android.ReactiveStreams
Xamarin.Google.Accompanist.AppCompat.Theme
Xamarin.Google.Accompanist.DrawablePainter
Xamarin.Google.Accompanist.FlowLayout
Xamarin.Google.Accompanist.Pager
Xamarin.Google.Accompanist.Pager.Indicators
Xamarin.Google.Accompanist.Permissions
Xamarin.Google.Accompanist.Placeholder
Xamarin.Google.Accompanist.Placeholder.Material
Xamarin.Google.Accompanist.SwipeRefresh
Xamarin.Google.Accompanist.SystemUIController
Xamarin.Google.Crypto.Tink
Xamarin.Google.Crypto.Tink.Aead
Xamarin.Google.Crypto.Tink.Aead.Subtle
Expand Down
14 changes: 8 additions & 6 deletions samples/NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<packageSources>
<clear />
<add key="Local Output" value="../output" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<!--
-->
</packageSources>
<!--
<!--
https://docs.microsoft.com/en-us/nuget/consume-packages/package-source-mapping
Define mappings by adding package patterns beneath the target source.
Define mappings by adding package patterns beneath the target source.

packages restored from "Local Output":
Xamarin.AndroidX.*
Expand All @@ -18,10 +18,10 @@
Xamarin.Google.AutoValue.Annotations
GoogleGson
Xamarin.Google.Guava
Xamarin.Google.Guava.*
Xamarin.Google.Guava.*
Xamarin.Google.J2Objc.Annotations
packages restored from nuget.org:
everything else
everything else
-->
<packageSourceMapping>
<!-- key value for <packageSource> should match key values from <packageSources> element -->
Expand All @@ -36,7 +36,9 @@
<package pattern="Xamarin.Google.Guava.*" />
<package pattern="Xamarin.AndroidX.*" />
<package pattern="Xamarin.Google.J2Objc.Annotations" />
<package pattern="Xamarin.CheckerFramework.CheckerQual" />
<package pattern="Xamarin.AAkira.*" />
<package pattern="Xamarin.Google.Accompanist.*" />
<package pattern="Xamarin.Google.Android.Material.*" />
</packageSource>
<packageSource key="nuget.org">
<package pattern="*" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
using System;
Copy link
Contributor

Choose a reason for hiding this comment

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

I realize all the other projects in this repo also suffer from this, but adding empty Additions.cs and .xml transforms files only slow down the build process, as each "empty" file must be read from disk and parsed before the tooling knows it can ignore it.

Copy link
Contributor Author

@4brunu 4brunu Apr 29, 2022

Choose a reason for hiding this comment

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

Do you want me to make any change?
Should I deleted the empty Additions.cs and .xml files?
Wouldn't this break CI?

using Android.Views;
using Android.Widget;
using Android.Graphics;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<enum-field-mappings>
</enum-field-mappings>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<enum-method-mappings>
</enum-method-mappings>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<metadata>
</metadata>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<metadata>

<remove-node path="/api/package" />

</metadata>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
using System;
using Android.Views;
using Android.Widget;
using Android.Graphics;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<enum-field-mappings>
</enum-field-mappings>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<enum-method-mappings>
</enum-method-mappings>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<metadata>
</metadata>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<metadata>

<remove-node path="/api/package" />

</metadata>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
using System;
using Android.Views;
using Android.Widget;
using Android.Graphics;
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
Do not translate or localize

Xamarin Components for Accompanist incorporates
third party material from the projects listed below. The original copyright
notice and the license under which Microsoft received such third party
material are set forth below. Microsoft reserves all other rights not
expressly granted, whether by implication, estoppel or otherwise.

########################################
# Accompanist
# https://github.com/google/accompanist/
########################################


Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
**Xamarin is not responsible for, nor does it grant any licenses to, third-party packages. Some packages may require or install dependencies which are governed by additional licenses.**

Note: This component depends on [Tink Android](https://github.com/google/tink), which is subject to the [Apache 2.0](https://github.com/google/tink/blob/master/LICENSE)

### Xamarin Component for Tink Android for Xamarin.Android

**The MIT License (MIT)**

Copyright (c) .NET Foundation Contributors

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<enum-field-mappings>
</enum-field-mappings>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<enum-method-mappings>
</enum-method-mappings>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<metadata>
</metadata>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<metadata>

<remove-node path="/api/package" />

</metadata>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
using System;
using Android.Views;
using Android.Widget;
using Android.Graphics;
Loading