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

Commit

Permalink
Move first batch of GPS package-specific templates to AndroidX defaul…
Browse files Browse the repository at this point in the history 
…t template. (#905)

Remove the packages that use the following package-specific templates from this repository as they have moved to AndroidX repository:

- annotations
- aopalliance
- dagger
- errorprone
- findbugs
- inject-guice
- jakarta
- javax-inject
- ow2-asm

Companion PR that adds them to AndroidX: dotnet/android-libraries#947
  • Loading branch information
@jpobst
jpobst authored Sep 4, 2024
1 parent 72d37a8 commit 35ad5e2
Show file tree
Hide file tree
Showing 56 changed files with 42 additions and 3,357 deletions.
283 changes: 40 additions & 243 deletions config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1830,15 +1830,6 @@
"dependencyOnly": false,
"templateSet": "glide"
},
{
"groupId": "com.google.android",
"artifactId": "annotations",
"version": "4.1.1.4",
"nugetVersion": "4.1.1.17",
"nugetId": "Xamarin.GoogleAndroid.Annotations",
"dependencyOnly": false,
"templateSet": "annotations"
},
{
"groupId": "com.google.android.datatransport",
"artifactId": "transport-api",
Expand Down Expand Up @@ -1875,33 +1866,6 @@
"dependencyOnly": false,
"templateSet": "user-messaging-platform"
},
{
"groupId": "com.google.code.findbugs",
"artifactId": "jsr305",
"version": "3.0.2",
"nugetVersion": "3.0.2.15",
"nugetId": "Xamarin.Google.Code.FindBugs.JSR305",
"dependencyOnly": false,
"templateSet": "findbugs"
},
{
"groupId": "com.google.dagger",
"artifactId": "dagger",
"version": "2.52",
"nugetVersion": "2.52.0",
"nugetId": "Xamarin.Google.Dagger",
"dependencyOnly": false,
"templateSet": "dagger"
},
{
"groupId": "com.google.errorprone",
"artifactId": "error_prone_annotations",
"version": "2.29.2",
"nugetVersion": "2.29.2",
"nugetId": "Xamarin.Google.ErrorProne.Annotations",
"dependencyOnly": false,
"templateSet": "errorprone"
},
{
"groupId": "com.google.zxing",
"artifactId": "core",
Expand Down Expand Up @@ -2177,15 +2141,6 @@
"dependencyOnly": false,
"templateSet": "perfmark"
},
{
"groupId": "javax.inject",
"artifactId": "javax.inject",
"version": "1",
"nugetVersion": "1.0.0.15",
"nugetId": "Xamarin.JavaX.Inject",
"dependencyOnly": false,
"templateSet": "javax-inject"
},
{
"groupId": "org.chromium.net",
"artifactId": "cronet-api",
Expand Down Expand Up @@ -2376,33 +2331,6 @@
"dependencyOnly": false,
"templateSet": "tensorflow-lite"
},
{
"groupId": "com.google.inject",
"artifactId": "guice",
"version": "7.0.0",
"nugetVersion": "7.0.0.1",
"nugetId": "Xamarin.Google.Inject.Guice",
"dependencyOnly": false,
"templateSet": "inject-guice"
},
{
"groupId": "aopalliance",
"artifactId": "aopalliance",
"version": "1.0",
"nugetVersion": "1.0.0.3",
"nugetId": "Xamarin.AopAlliance",
"dependencyOnly": false,
"templateSet": "aopalliance"
},
{
"groupId": "org.ow2.asm",
"artifactId": "asm",
"version": "9.7",
"nugetVersion": "9.7.0.1",
"nugetId": "Xamarin.OW2.ASM",
"dependencyOnly": false,
"templateSet": "ow2-asm"
},
{
"groupId": "org.brotli",
"artifactId": "dec",
Expand All @@ -2420,15 +2348,6 @@
"nugetId": "Xamarin.Google.Ads.InteractiveMedia.V3.InteractiveMedia",
"dependencyOnly": false
},
{
"groupId": "jakarta.inject",
"artifactId": "jakarta.inject-api",
"version": "2.0.1",
"nugetVersion": "2.0.1.1",
"nugetId": "Xamarin.Jakarta.Inject.InjectApi",
"dependencyOnly": false,
"templateSet": "jakarta"
},
//=======================================================================
// nuget dependencies
// AndroidX
Expand Down Expand Up @@ -2887,6 +2806,46 @@
"nugetVersion": "1.0.4.9",
"nugetId": "Xamarin.Android.ReactiveStreams",
"dependencyOnly": true
},
{
"groupId": "javax.inject",
"artifactId": "javax.inject",
"version": "1",
"nugetVersion": "1.0.0.15",
"nugetId": "Xamarin.JavaX.Inject",
"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.google.dagger",
"artifactId": "dagger",
"version": "2.52",
"nugetVersion": "2.52.0",
"nugetId": "Xamarin.Google.Dagger",
"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.android",
"artifactId": "annotations",
"version": "4.1.1.4",
"nugetVersion": "4.1.1.17",
"nugetId": "Xamarin.GoogleAndroid.Annotations",
"dependencyOnly": true,
}
],
"templateSets": [
Expand All @@ -2908,24 +2867,6 @@
}
]
},
{
"name": "findbugs",
"mavenRepositoryType": "MavenCentral",
"templates": [
{
"templateFile": "templates/findbugs/Project.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.csproj"
},
{
"templateFile": "templates/NuGetReadMe.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/readme.md"
},
{
"templateFile": "source/GooglePlayServicesSolutionFilter.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.slnf"
}
]
},
{
"name": "chromium-cronet",
"mavenRepositoryType": "Google",
Expand Down Expand Up @@ -2962,42 +2903,6 @@
}
]
},
{
"name": "dagger",
"mavenRepositoryType": "MavenCentral",
"templates": [
{
"templateFile": "templates/dagger/Project.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.csproj"
},
{
"templateFile": "templates/NuGetReadMe.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/readme.md"
},
{
"templateFile": "source/GooglePlayServicesSolutionFilter.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.slnf"
}
]
},
{
"name": "javax-inject",
"mavenRepositoryType": "MavenCentral",
"templates": [
{
"templateFile": "templates/javax-inject/Project.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.csproj"
},
{
"templateFile": "templates/NuGetReadMe.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/readme.md"
},
{
"templateFile": "source/GooglePlayServicesSolutionFilter.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.slnf"
}
]
},
{
"name": "protobuf-lite",
"mavenRepositoryType": "MavenCentral",
Expand Down Expand Up @@ -3052,42 +2957,6 @@
}
]
},
{
"name": "errorprone",
"mavenRepositoryType": "MavenCentral",
"templates": [
{
"templateFile": "templates/errorprone/Project.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.csproj"
},
{
"templateFile": "templates/NuGetReadMe.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/readme.md"
},
{
"templateFile": "source/GooglePlayServicesSolutionFilter.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.slnf"
}
]
},
{
"name": "annotations",
"mavenRepositoryType": "MavenCentral",
"templates": [
{
"templateFile": "templates/annotations/Project.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.csproj"
},
{
"templateFile": "templates/NuGetReadMe.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/readme.md"
},
{
"templateFile": "source/GooglePlayServicesSolutionFilter.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.slnf"
}
]
},
{
"name": "opencensus",
"mavenRepositoryType": "MavenCentral",
Expand Down Expand Up @@ -3322,78 +3191,6 @@
}
]
},
{
"name": "inject-guice",
"mavenRepositoryType": "MavenCentral",
"templates": [
{
"templateFile": "templates/inject-guice/Project.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.csproj"
},
{
"templateFile": "templates/NuGetReadMe.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/readme.md"
},
{
"templateFile": "source/GooglePlayServicesSolutionFilter.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.slnf"
}
]
},
{
"name": "jakarta",
"mavenRepositoryType": "MavenCentral",
"templates": [
{
"templateFile": "templates/jakarta/Project.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.csproj"
},
{
"templateFile": "templates/NuGetReadMe.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/readme.md"
},
{
"templateFile": "source/GooglePlayServicesSolutionFilter.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.slnf"
}
]
},
{
"name": "aopalliance",
"mavenRepositoryType": "MavenCentral",
"templates": [
{
"templateFile": "templates/aopalliance/Project.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.csproj"
},
{
"templateFile": "templates/NuGetReadMe.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/readme.md"
},
{
"templateFile": "source/GooglePlayServicesSolutionFilter.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.slnf"
}
]
},
{
"name": "ow2-asm",
"mavenRepositoryType": "MavenCentral",
"templates": [
{
"templateFile": "templates/ow2-asm/Project.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.csproj"
},
{
"templateFile": "templates/NuGetReadMe.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/readme.md"
},
{
"templateFile": "source/GooglePlayServicesSolutionFilter.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.slnf"
}
]
},
{
"name": "brotli",
"mavenRepositoryType": "MavenCentral",
Expand Down
Loading

0 comments on commit 35ad5e2

Please sign in to comment.