Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit 5ef7587

Browse files
RedthRedth
committed
Fix wear naming
Google moved from wearable in 26.0.0-alpha1 to wear in newer versions.
1 parent ceeebd1 commit 5ef7587

File tree

9 files changed

+26
-22
lines changed

9 files changed

+26
-22
lines changed

‎AndroidSupport.sln‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicAnimation", "support
5959
EndProject
6060
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InstantVideo", "instantvideo\source\InstantVideo.csproj", "{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}"
6161
EndProject
62-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wearable", "wearable\source\Wearable.csproj", "{F5E0D83F-81A8-40A9-9EFF-7605213AC743}"
63-
EndProject
6462
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TV-Provider", "support-tv-provider\source\TV-Provider.csproj", "{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}"
6563
EndProject
6664
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji-Bundled", "support-emoji-bundled\source\Emoji-Bundled.csproj", "{44CC369D-0196-4C80-88D1-C2016998263F}"
@@ -69,6 +67,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji-AppCompat", "support-
6967
EndProject
7068
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji", "support-emoji\source\Emoji.csproj", "{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}"
7169
EndProject
70+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wear", "wear\source\Wear.csproj", "{F5E0D83F-81A8-40A9-9EFF-7605213AC743}"
71+
EndProject
7272
Global
7373
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7474
Debug|Any CPU = Debug|Any CPU
@@ -191,10 +191,6 @@ Global
191191
{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Debug|Any CPU.Build.0 = Debug|Any CPU
192192
{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Release|Any CPU.ActiveCfg = Release|Any CPU
193193
{137DABCD-BAC3-4CA6-B55B-A0ED565DC20E}.Release|Any CPU.Build.0 = Release|Any CPU
194-
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
195-
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Debug|Any CPU.Build.0 = Debug|Any CPU
196-
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Release|Any CPU.ActiveCfg = Release|Any CPU
197-
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Release|Any CPU.Build.0 = Release|Any CPU
198194
{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
199195
{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
200196
{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -211,5 +207,9 @@ Global
211207
{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
212208
{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
213209
{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Release|Any CPU.Build.0 = Release|Any CPU
210+
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
211+
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Debug|Any CPU.Build.0 = Debug|Any CPU
212+
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Release|Any CPU.ActiveCfg = Release|Any CPU
213+
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Release|Any CPU.Build.0 = Release|Any CPU
214214
EndGlobalSection
215215
EndGlobal

‎build.cake‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,14 @@ LogSystemInfo ();
1717
var TARGET = Argument ("t", Argument ("target", "Default"));
1818
var BUILD_CONFIG = Argument ("config", "Release");
1919

20-
var NUGET_VERSION = "26.0.0-beta1";
21-
var COMPONENT_VERSION = "26.0.0.0";
22-
var AAR_VERSION = "26.0.0";
20+
// Lists all the artifacts and their versions for com.android.support.*
21+
// https://dl.google.com/dl/android/maven2/com/android/support/group-index.xml
22+
// Master list of all the packages in the repo:
23+
// https://dl.google.com/dl/android/maven2/master-index.xml
24+
25+
var NUGET_VERSION = "26.0.1-beta1";
26+
var COMPONENT_VERSION = "26.0.1.0";
27+
var AAR_VERSION = "26.0.1";
2328
var DOC_VERSION = "2017-08-22";
2429

2530
var SUPPORT_PKG_NAME = "com.android.support";
@@ -69,7 +74,7 @@ var ARTIFACTS = new [] {
6974
new ArtifactInfo (SUPPORT_PKG_NAME, "support-tv-provider", "Xamarin.Android.Support.TV.Provider", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
7075
new ArtifactInfo (SUPPORT_PKG_NAME, "transition", "Xamarin.Android.Support.Transition", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
7176
new ArtifactInfo (SUPPORT_PKG_NAME, "exifinterface", "Xamarin.Android.Support.Exif", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
72-
new ArtifactInfo (SUPPORT_PKG_NAME, "wearable", "Xamarin.Android.Support.Wearable", "26.0.0-alpha1", "26.0.0-alpha1", COMPONENT_VERSION),
77+
new ArtifactInfo (SUPPORT_PKG_NAME, "wear", "Xamarin.Android.Support.Wear", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
7378
new ArtifactInfo (SUPPORT_PKG_NAME, "support-annotations", "Xamarin.Android.Support.Annotations", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION, true),
7479
new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji", "Xamarin.Android.Support.Emoji", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
7580
new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji-appcompat", "Xamarin.Android.Support.Emoji.AppCompat", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
@@ -558,7 +563,6 @@ Task ("droiddocs").Does(() =>
558563
}
559564
});
560565

561-
562566
SetupXamarinBuildTasks (buildSpec, Tasks, Task);
563567

564568
RunTarget (TARGET);

wearable/nuget/template.nuspec renamed to wear/nuget/template.nuspec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0"?>
22
<package>
33
<metadata>
4-
<id>Xamarin.Android.Support.Wearable</id>
5-
<title>Xamarin Android Support Library - Wearable</title>
4+
<id>Xamarin.Android.Support.Wear</id>
5+
<title>Xamarin Android Support Library - Wear</title>
66
<version>$version$</version>
77
<authors>Xamarin Inc.</authors>
88
<owners>Xamarin Inc.</owners>
99
<requireLicenseAcceptance>true</requireLicenseAcceptance>
10-
<description>Wearable Android Support Library C# bindings for Xamarin</description>
10+
<description>Wear Android Support Library C# bindings for Xamarin</description>
1111
<copyright>Copyright © Microsoft Corporation</copyright>
1212
<projectUrl>https://github.com/xamarin/AndroidSupportComponents/</projectUrl>
1313
<licenseUrl>https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md</licenseUrl>
14-
<iconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/wearable_128x128.png</iconUrl>
14+
<iconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/wear_128x128.png</iconUrl>
1515
<dependencies>
1616
<group targetFramework="MonoAndroid70">
1717
<dependency id="Xamarin.Android.Support.Core.UI" version="[$version$]" />
@@ -20,9 +20,9 @@
2020
</dependencies>
2121
</metadata>
2222
<files>
23-
<file src="wearable/nuget/Xamarin.Android.Support.Wearable.targets" target="build/MonoAndroid70" />
23+
<file src="wear/nuget/Xamarin.Android.Support.Wear.targets" target="build/MonoAndroid70" />
2424

25-
<file src="output/Xamarin.Android.Support.Wearable.dll" target="lib/MonoAndroid70" />
25+
<file src="output/Xamarin.Android.Support.Wear.dll" target="lib/MonoAndroid70" />
2626

2727
<file src="External-Dependency-Info.txt" target="THIRD-PARTY-NOTICES.txt" />
2828
</files>

wearable/source/Properties/AssemblyInfo.cs renamed to wear/source/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Information about this assembly is defined by the following attributes.
66
// Change them to the values specific to your project.
77

8-
[assembly: AssemblyTitle("Xamarin.Android.Support.Wearable")]
8+
[assembly: AssemblyTitle("Xamarin.Android.Support.Wear")]
99
[assembly: AssemblyDescription("")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany ("Microsoft Corporation")]

wearable/source/Transforms/EnumFields.xml renamed to wear/source/Transforms/EnumFields.xml

File renamed without changes.

wearable/source/Transforms/EnumMethods.xml renamed to wear/source/Transforms/EnumMethods.xml

File renamed without changes.

wearable/source/Transforms/Metadata.xml renamed to wear/source/Transforms/Metadata.xml

File renamed without changes.

wearable/source/Wearable.csproj renamed to wear/source/Wear.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<ProjectGuid>{F5E0D83F-81A8-40A9-9EFF-7605213AC743}</ProjectGuid>
88
<ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
99
<OutputType>Library</OutputType>
10-
<RootNamespace>Android.Support.Wearable</RootNamespace>
10+
<RootNamespace>Android.Support.Wear</RootNamespace>
1111
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1212
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
13-
<AssemblyName>Xamarin.Android.Support.Wearable</AssemblyName>
13+
<AssemblyName>Xamarin.Android.Support.Wear</AssemblyName>
1414
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
1515
<!-- <SignAssembly>true</SignAssembly>
1616
<DelaySign>true</DelaySign>
@@ -67,8 +67,8 @@
6767
<None Include="packages.config" />
6868
</ItemGroup>
6969
<ItemGroup>
70-
<LibraryProjectZip Include="..\..\externals\wearable.aar">
71-
<Link>wearable.aar</Link>
70+
<LibraryProjectZip Include="..\..\externals\wear.aar">
71+
<Link>wear.aar</Link>
7272
</LibraryProjectZip>
7373
</ItemGroup>
7474
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />

wearable/source/packages.config renamed to wear/source/packages.config

File renamed without changes.

0 commit comments

Comments
 (0)