Skip to content

Commit

Permalink
Merge branch 'main' into FixIPLayerListener
Browse files Browse the repository at this point in the history
  • Loading branch information
moljac committed Sep 4, 2024
2 parents 5819be8 + e12f2f0 commit 454c543
Show file tree
Hide file tree
Showing 9 changed files with 261 additions and 19 deletions.
5 changes: 5 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
must be used before `com.google.`
-->
<AndroidNamespaceReplacement Include='com.google.common.flogger' Replacement='Xamarin.Google.Flogger' />
<AndroidNamespaceReplacement Include='com.google.inject' Replacement='Xamarin.Google.Inject' />
<AndroidNamespaceReplacement Include='com.google.errorprone' Replacement='Xamarin.Google.ErrorProne' />

<!-- Company namespace changes -->
<AndroidNamespaceReplacement Include='androidx.' Replacement='AndroidX' />
Expand All @@ -75,6 +77,9 @@
<AndroidNamespaceReplacement Include='io.reactivex.' Replacement='ReactiveX' />
<AndroidNamespaceReplacement Include='kotlinx' Replacement='KotlinX' />
<AndroidNamespaceReplacement Include='support_lib_boundary' Replacement='ChromiumLibBoundary' />
<AndroidNamespaceReplacement Include='org.aopalliance.' Replacement='Xamarin.AopAlliance' />
<AndroidNamespaceReplacement Include='org.objectweb.' Replacement='Xamarin.ObjectWeb' />
<AndroidNamespaceReplacement Include='javax.inject' Replacement='JavaX.Inject' />

<!-- Remove some redundant words -->
<AndroidNamespaceReplacement Include='androidx.dynamicanimation.animation' Replacement='AndroidX.DynamicAnimation' />
Expand Down
121 changes: 105 additions & 16 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2296,6 +2296,16 @@
"nugetId": "Xamarin.AndroidX.Work.Work.Runtime.Ktx",
"dependencyOnly": false
},
{
"groupId": "aopalliance",
"artifactId": "aopalliance",
"version": "1.0",
"nugetVersion": "1.0.0.3",
"nugetId": "Xamarin.AopAlliance",
"dependencyOnly": false,
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral"
},
{
"groupId": "com.android.installreferrer",
"artifactId": "installreferrer",
Expand Down Expand Up @@ -2407,6 +2417,16 @@
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral"
},
{
"groupId": "com.google.android",
"artifactId": "annotations",
"version": "4.1.1.4",
"nugetVersion": "4.1.1.17",
"nugetId": "Xamarin.GoogleAndroid.Annotations",
"dependencyOnly": false,
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral"
},
{
"groupId": "com.google.android.material",
"artifactId": "compose-theme-adapter",
Expand Down Expand Up @@ -2467,6 +2487,17 @@
],
"comments": "License is specified in parent POM"
},
{
"groupId": "com.google.code.findbugs",
"artifactId": "jsr305",
"version": "3.0.2",
"nugetVersion": "3.0.2.15",
"nugetId": "Xamarin.Google.Code.FindBugs.JSR305",
"dependencyOnly": false,
"assemblyName": "Jsr305Binding",
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral"
},
{
"groupId": "com.google.code.gson",
"artifactId": "gson",
Expand All @@ -2487,6 +2518,26 @@
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral"
},
{
"groupId": "com.google.dagger",
"artifactId": "dagger",
"version": "2.52",
"nugetVersion": "2.52.0",
"nugetId": "Xamarin.Google.Dagger",
"dependencyOnly": false,
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral"
},
{
"groupId": "com.google.errorprone",
"artifactId": "error_prone_annotations",
"version": "2.29.2",
"nugetVersion": "2.29.2",
"nugetId": "Xamarin.Google.ErrorProne.Annotations",
"dependencyOnly": false,
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral"
},
{
"groupId": "com.google.flogger",
"artifactId": "flogger",
Expand Down Expand Up @@ -2547,6 +2598,20 @@
],
"comments": "License is specified in parent POM"
},
{
"groupId": "com.google.inject",
"artifactId": "guice",
"version": "7.0.0",
"nugetVersion": "7.0.0.1",
"nugetId": "Xamarin.Google.Inject.Guice",
"dependencyOnly": false,
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral",
"overrideLicenses": [
"The Apache Software License, Version 2.0|http://www.apache.org/licenses/LICENSE-2.0.txt"
],
"comments": "License is specified in parent POM"
},
{
"groupId": "com.google.j2objc",
"artifactId": "j2objc-annotations",
Expand Down Expand Up @@ -2647,6 +2712,26 @@
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral"
},
{
"groupId": "jakarta.inject",
"artifactId": "jakarta.inject-api",
"version": "2.0.1",
"nugetVersion": "2.0.1.1",
"nugetId": "Xamarin.Jakarta.Inject.InjectApi",
"dependencyOnly": false,
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral"
},
{
"groupId": "javax.inject",
"artifactId": "javax.inject",
"version": "1",
"nugetVersion": "1.0.0.15",
"nugetId": "Xamarin.JavaX.Inject",
"dependencyOnly": false,
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral"
},
{
"groupId": "org.checkerframework",
"artifactId": "checker-compat-qual",
Expand Down Expand Up @@ -2884,6 +2969,16 @@
"dependencyOnly": false,
"templateSet": "kotlinx"
},
{
"groupId": "org.ow2.asm",
"artifactId": "asm",
"version": "9.7",
"nugetVersion": "9.7.0.1",
"nugetId": "Xamarin.OW2.ASM",
"dependencyOnly": false,
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral"
},
{
"groupId": "org.reactivestreams",
"artifactId": "reactive-streams",
Expand Down Expand Up @@ -3022,22 +3117,6 @@
"nugetId": "Xamarin.GoogleAndroid.Libraries.Identity.GoogleId",
"dependencyOnly": true
},
{
"groupId": "com.google.code.findbugs",
"artifactId": "jsr305",
"version": "3.0.2",
"nugetVersion": "3.0.2.15",
"nugetId": "Xamarin.Google.Code.FindBugs.JSR305",
"dependencyOnly": true
},
{
"groupId": "com.google.errorprone",
"artifactId": "error_prone_annotations",
"version": "2.29.2",
"nugetVersion": "2.29.2",
"nugetId": "Xamarin.Google.ErrorProne.Annotations",
"dependencyOnly": true
},
{
"groupId": "com.squareup.okio",
"artifactId": "okio",
Expand Down Expand Up @@ -3094,11 +3173,21 @@
"file": "templates/licenses/bsd.txt",
"spdx": "BSD-3-Clause"
},
{
"name": "BSD-3-Clause",
"file": "templates/licenses/bsd.txt",
"spdx": "BSD-3-Clause"
},
{
"name": "MIT-0",
"file": "templates/licenses/mit-0.txt",
"spdx": "MIT-0"
},
{
"name": "Public Domain",
"file": "templates/licenses/public-domain.txt",
"comments": "There is no spdx for generic 'Public Domain' as it isn't actually a license"
},
{
"name": "SIL Open Font License, Version 1.1",
"file": "templates/licenses/sil-1.1.txt",
Expand Down
2 changes: 1 addition & 1 deletion nuget-diff.cake
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if (!nupkgs.Any()) {
} else {
Parallel.ForEach (nupkgs, nupkg => {
// See https://github.com/xamarin/AndroidX/issues/916
if (nupkg.FullPath.Contains ("Xamarin.AndroidX.Car.App.App"))
if (nupkg.FullPath.Contains ("Xamarin.AndroidX.Car.App.App") || nupkg.FullPath.Contains ("Xamarin.AndroidX.Fragment") || nupkg.FullPath.Contains ("Xamarin.AndroidX.Lifecycle.LiveData.Core"))
return;
var version = "--latest";
var versionFile = nupkg.FullPath + ".baseversion";
Expand Down
25 changes: 25 additions & 0 deletions published-namespaces.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
_COROUTINE
Android.Annotation
Android.Support.CustomTabs
Android.Support.Customtabs.Trusted
Android.Support.V4.App
Expand Down Expand Up @@ -493,6 +494,10 @@ AndroidX.Work.Impl.Utils.Futures
AndroidX.Work.Impl.Utils.TaskExecutor
AndroidX.Work.Impl.Workers
AndroidX.Work.MultiProcess
Dagger
Dagger.Assisted
Dagger.Internal
Dagger.Multibindings
Google.Android.Libraries.AppActions.Service
Google.Android.Material.Animation
Google.Android.Material.AppBar
Expand Down Expand Up @@ -564,7 +569,12 @@ GoogleGson.Annotations
GoogleGson.Reflect
GoogleGson.Stream
IntelliJ.Lang.Annotations
Jakarta.Inject
Java.Interop
Javax.Annotation
Javax.Annotation.Concurrent
Javax.Annotation.Meta
JavaX.Inject
JetBrains.Annotations
Kotlin
Kotlin.Annotation
Expand Down Expand Up @@ -694,6 +704,8 @@ ReactiveX.Subjects
ReactiveX.Subscribers
Xamarin.Android.InstallReferrer.Api
Xamarin.Android.InstallReferrer.Commons
Xamarin.AopAlliance.Aop
Xamarin.AopAlliance.Intercept
Xamarin.Dev.ChrisBanes.Snapper
Xamarin.Google.Android.Finsky.ExternalReferrer
Xamarin.Google.Crypto.Tink
Expand Down Expand Up @@ -728,13 +740,24 @@ Xamarin.Google.Crypto.Tink.Subtle.Prf
Xamarin.Google.Crypto.Tink.Tinkkey
Xamarin.Google.Crypto.Tink.Tinkkey.Internal
Xamarin.Google.Crypto.Tink.Util
Xamarin.Google.ErrorProne.Annotations
Xamarin.Google.ErrorProne.Annotations.Concurrent
Xamarin.Google.Flogger
Xamarin.Google.Flogger.Backend
Xamarin.Google.Flogger.Backend.System
Xamarin.Google.Flogger.Context
Xamarin.Google.Flogger.Parameter
Xamarin.Google.Flogger.Parser
Xamarin.Google.Flogger.Util
Xamarin.Google.Inject
Xamarin.Google.Inject.Binder
Xamarin.Google.Inject.Internal.Aop
Xamarin.Google.Inject.Internal.Util
Xamarin.Google.Inject.Matcher
Xamarin.Google.Inject.Multibindings
Xamarin.Google.Inject.Name
Xamarin.Google.Inject.Spi
Xamarin.Google.Inject.Util
Xamarin.IO.AntMedia.Rtmp.Client
Xamarin.KotlinX.Coroutines
Xamarin.KotlinX.Coroutines.Channels
Expand All @@ -752,3 +775,5 @@ Xamarin.KotlinX.Coroutines.Stream
Xamarin.KotlinX.Coroutines.Sync
Xamarin.KotlinX.Coroutines.Tasks
Xamarin.KotlinX.Coroutines.Time
Xamarin.ObjectWeb.Asm
Xamarin.ObjectWeb.Asm.Signature
30 changes: 30 additions & 0 deletions source/com.google.dagger/dagger/Additions/Additions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using System;
using Android.Runtime;
using Java.Interop;

namespace Dagger.Internal
{
partial class MapFactory
{
public unsafe global::Java.Lang.Object Get()
{
return Dictionary as Java.Lang.Object;
}
}

partial class SetFactory
{
public unsafe global::Java.Lang.Object Get()
{
return Collection as Java.Lang.Object;
}
}

partial class ProviderOfLazy
{
public unsafe global::Java.Lang.Object Get()
{
return Lazy as Java.Lang.Object;
}
}
}
44 changes: 44 additions & 0 deletions source/com.google.dagger/dagger/Transforms/Metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<attr path="/api/package[@name='dagger.internal']/class[@name='MapFactory']/method[@name='get' and count(parameter)=0]" name="managedName">GetDictionary</attr>
<attr path="/api/package[@name='dagger.internal']/class[@name='MapProviderFactory']/method[@name='get' and count(parameter)=0]" name="managedName">GetDictionary</attr>
<attr path="/api/package[@name='dagger.internal']/class[@name='SetFactory']/method[@name='get' and count(parameter)=0]" name="managedName">GetCollection</attr>
<attr path="/api/package[@name='dagger.internal']/class[@name='ProviderOfLazy']/method[@name='get' and count(parameter)=0]" name="managedName">GetLazy</attr>


<!--
<remove-node path="/api/package[@name='dagger.internal']/class[@name='MapProviderFactory']/implements" />
<remove-node
path="/api/package[@name='dagger.internal']/class[@name='DoubleCheck']"
/>
<remove-node
path="/api/package[@name='dagger.internal']/class[@name='SingleCheck']"
/>
<remove-node
path="/api/package[@name='dagger.internal']/class[@name='LazyClassKeyMap']"
/>
-->
<remove-node
path="/api/package[@name='dagger.internal']/class[@name='DoubleCheck']"
/>
<remove-node
path="/api/package[@name='dagger.internal']/class[@name='SingleCheck']"
/>
<attr
path="/api/package[@name='dagger.internal']/class[@name='LazyClassKeyMap']/method[@name='entrySet' and count(parameter)=0]"
name="managedReturn"
>
System.Collections.ICollection
</attr>
<remove-node
path="/api/package[@name='dagger.internal']/class[@name='LazyClassKeyMap']"
/>
<remove-node
path="/api/package[@name='dagger.internal']/class[@name='MapProviderFactory']"
/>
<remove-node
path="/api/package[@name='dagger.internal']/interface[@name='Provider']"
/>

</metadata>
Loading

0 comments on commit 454c543

Please sign in to comment.